diff --git a/README.md b/README.md index a8708e72..ba4e85d1 100644 --- a/README.md +++ b/README.md @@ -155,18 +155,23 @@ Used libraries: ### Prerequisites -You need `node` and `npm` installed: +You need `node` and `npm` and `yarn` installed: - » npm --version - 6.5.0 + » node --version + v18.10.0 » node --version - v11.9.0 + 8.19.2 + + » yarn --version + 1.21.1 + ### Installation of JS Dependencies -Use `npm` (or `yarn`) to install the develoment dependencies: +Use `yarn` (or `npm`) to install the develoment dependencies: + » cd webpack » yarn install This creates a local node_modules directory where all the dependencies are stored. @@ -180,7 +185,8 @@ Print usage (output below is cutted): » node_modules/.bin/webpack --help - webpack-cli 3.2.1 + webpack: 5.69.1 + webpack-cli 4.9.2 Usage: https://webpack.js.org/api/cli/ Usage without config file: webpack [] --output [-o] @@ -205,8 +211,8 @@ The configuration for the used `webpack` command is located in `webpack.config.j Run this command to watch/rebuild the JavaScript for Development: - » npm run watch + » yarn watch Run this command to build the final JavaScript for Production: - » npm run build + » yarn build diff --git a/docs/About.rst b/docs/About.rst index e1ee90e6..722ea616 100644 --- a/docs/About.rst +++ b/docs/About.rst @@ -75,7 +75,7 @@ the egg to the `eggs` list in the `[instance]` section rather than adding it in the `[buildout]` section. Also see this section of the Plone documentation for further details: -https://docs.plone.org/4/en/manage/installing/installing_addons.html +https://docs.plone.org/manage/installing/installing_addons.html **Important** @@ -90,7 +90,7 @@ Installation Requirements The following versions are required for SENAITE.APP.LISTING: -- senaite.lims >= 2.1.0 +- senaite.lims >= 2.3.0 .. _Plone 5: https://docs.plone.org/manage/installing/installation.html diff --git a/docs/Changelog.rst b/docs/Changelog.rst index e377fd26..b527a6cc 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -1,4 +1,4 @@ -2.3.0 (unreleased) +2.3.0 (2022-10-03) ------------------ - #92 Add workflow state of view context to listing config diff --git a/src/senaite/app/listing/controlpanel.py b/src/senaite/app/listing/controlpanel.py index 521bcbdf..159471d4 100644 --- a/src/senaite/app/listing/controlpanel.py +++ b/src/senaite/app/listing/controlpanel.py @@ -1,4 +1,22 @@ # -*- coding: utf-8 -*- +# +# This file is part of SENAITE.APP.LISTING. +# +# SENAITE.APP.LISTING is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Copyright 2018-2022 by it's authors. +# Some rights reserved, see README and LICENSE. from bika.lims import senaiteMessageFactory as _ from plone.supermodel import model diff --git a/src/senaite/app/listing/upgrades/__init__.py b/src/senaite/app/listing/upgrades/__init__.py index 40a96afc..f64901ff 100644 --- a/src/senaite/app/listing/upgrades/__init__.py +++ b/src/senaite/app/listing/upgrades/__init__.py @@ -1 +1,19 @@ # -*- coding: utf-8 -*- +# +# This file is part of SENAITE.APP.LISTING. +# +# SENAITE.APP.LISTING is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Copyright 2018-2022 by it's authors. +# Some rights reserved, see README and LICENSE. diff --git a/src/senaite/app/listing/upgrades/handlers.py b/src/senaite/app/listing/upgrades/handlers.py index d1d0aba6..8fcb7d4d 100644 --- a/src/senaite/app/listing/upgrades/handlers.py +++ b/src/senaite/app/listing/upgrades/handlers.py @@ -1,4 +1,22 @@ # -*- coding: utf-8 -*- +# +# This file is part of SENAITE.APP.LISTING. +# +# SENAITE.APP.LISTING is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Copyright 2018-2022 by it's authors. +# Some rights reserved, see README and LICENSE. from senaite.app.listing import logger diff --git a/static/1_samples_listing.png b/static/1_samples_listing.png index ae3432cb..a1e04e98 100644 Binary files a/static/1_samples_listing.png and b/static/1_samples_listing.png differ diff --git a/static/2_worksheet_classic_listing.png b/static/2_worksheet_classic_listing.png index b98b856e..910cbac3 100644 Binary files a/static/2_worksheet_classic_listing.png and b/static/2_worksheet_classic_listing.png differ diff --git a/static/3_worksheet_transposed_listing.png b/static/3_worksheet_transposed_listing.png index 0e33b2e9..229d4232 100644 Binary files a/static/3_worksheet_transposed_listing.png and b/static/3_worksheet_transposed_listing.png differ diff --git a/static/4_clients_listing.png b/static/4_clients_listing.png index 1cf870c2..402f838c 100644 Binary files a/static/4_clients_listing.png and b/static/4_clients_listing.png differ