Bug 32030: Add Notes field to erm_eholdings_packages table

- Added API specs for new field 'notes' for erm_holdings_package;
- Added new field 'notes' in DB schema for erm;
- Added new field 'notes' in Vue.js frontend

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/api/v1/swagger/definitions/erm_eholdings_package.yaml b/api/v1/swagger/definitions/erm_eholdings_package.yaml
index 190e751..3289718 100644 (file)
--- a/api/v1/swagger/definitions/erm_eholdings_package.yaml
+++ b/api/v1/swagger/definitions/erm_eholdings_package.yaml
@@ -38,6 +38,11 @@ properties:
     type:
       - string
       - "null"
+  notes:
+    description: notes about the package
+    type:
+      - string
+      - "null"
   created_on:
     description: date of creation
     type:

diff --git a/api/v1/swagger/paths/erm_eholdings_packages.yaml b/api/v1/swagger/paths/erm_eholdings_packages.yaml
index 7064e4a..fd0d58d 100644 (file)
--- a/api/v1/swagger/paths/erm_eholdings_packages.yaml
+++ b/api/v1/swagger/paths/erm_eholdings_packages.yaml
@@ -44,6 +44,11 @@
         name: content_type
         required: false
         type: string
+      - description: Case insensitive search on package notes
+        in: query
+        name: notes
+        required: false
+        type: string
       - description: Case insensitive search on package creation date
         in: query
         name: created_on

diff --git a/installer/data/mysql/atomicupdate/erm.pl b/installer/data/mysql/atomicupdate/erm.pl
index df7d09f..7b781d1 100755 (executable)
--- a/installer/data/mysql/atomicupdate/erm.pl
+++ b/installer/data/mysql/atomicupdate/erm.pl
@@ -197,6 +197,7 @@ return {
                     `provider` ENUM('ebsco') DEFAULT NULL COMMENT 'External provider',
                     `package_type` VARCHAR(80) DEFAULT NULL COMMENT 'type of the package',
                     `content_type` VARCHAR(80) DEFAULT NULL COMMENT 'type of the package',
+                    `notes` mediumtext DEFAULT NULL COMMENT 'notes about this package',
                     `created_on` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'date of creation of the package',
                     CONSTRAINT `erm_packages_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
                     PRIMARY KEY(`package_id`)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8128681..5d78453 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2908,6 +2908,7 @@ CREATE TABLE `erm_eholdings_packages` (
     `provider` ENUM('ebsco') DEFAULT NULL COMMENT 'External provider',
     `package_type` VARCHAR(80) DEFAULT NULL COMMENT 'type of the package',
     `content_type` VARCHAR(80) DEFAULT NULL COMMENT 'type of the package',
+    `notes` mediumtext DEFAULT NULL COMMENT 'notes about this package',
     `created_on` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'date of creation of the package',
     CONSTRAINT `erm_eholdings_packages_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
     PRIMARY KEY(`package_id`)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
index 82b7393..433c3e1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
@@ -55,6 +55,15 @@
                                 :options="av_package_content_types"
                             />
                         </li>
+                        <li>
+                            <label for="package_notes">{{
+                                $t("Notes")
+                            }}:</label>
+                            <textarea
+                                id="package_notes"
+                                v-model="erm_package.notes"
+                            />
+                        </li>
 
                         <EHoldingsPackageAgreements
                             :package_agreements="erm_package.package_agreements"
@@ -108,6 +117,7 @@ export default {
                 external_id: '',
                 package_type: '',
                 content_type: '',
+                notes: '',
                 created_on: null,
                 resources: null,
                 package_agreements: [],

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
index 7771471..3994134 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
@@ -151,6 +151,15 @@ export default {
                         }
                     },
                     {
+                        title: __("Notes"),
+                        data: "notes",
+                        searchable: true,
+                        orderable: true,
+                        render: function (data, type, row, meta) {
+                            return row.notes;
+                        }
+                    },
+                    {
                         title: __("Actions"),
                         data: function (row, type, val, meta) {
                             return '<div class="actions"></div>'

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
index 8e6f92f..45e1ec0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
@@ -53,6 +53,10 @@
                             )
                         }}</span>
                     </li>
+                    <li>
+                        <label>{{ $t("Notes") }}:</label>
+                        <span>{{ erm_package.notes }}</span>
+                    </li>
                     <li v-if="erm_package.created_on">
                         <label>{{ $t("Created on") }}:</label>
                         <span>{{ format_date(erm_package.created_on) }}</span>