LP1816475: Add grid settings to db

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
index 0e20a91..1cb7e68 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
@@ -35,10 +35,10 @@
       </div>
       <div *ngIf="patronId">
         <h2 class="text-center" i18n>Ready for return</h2>
-        <eg-reservations-grid #resourceReady [resource]="patronId" status="returnReady" persistSuffix="return.patron.picked_up"></eg-reservations-grid>
+        <eg-reservations-grid #resourceReady [resource]="patronId" status="returnReady" persistSuffix="return.resource.picked_up"></eg-reservations-grid>
 
         <h2 class="text-center" i18n>Returned today</h2>
-        <eg-reservations-grid #resourceReturned [patron]="patronId" status="returnedToday" persistSuffix="return.patron.returned"></eg-reservations-grid>
+        <eg-reservations-grid #resourceReturned [patron]="patronId" status="returnedToday" persistSuffix="return.resource.returned"></eg-reservations-grid>
       </div>
     </ng-template>
   </ngb-tab>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 147fa93..8c011ea 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19903,6 +19903,12 @@ VALUES (
         'Grid Config: Booking Manage Reservations',
         'cwst', 'label')
 ), (
+    'eg.grid.booking.pickup.ready', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.pickup.ready',
+        'Grid Config: Booking Ready to pick up grid',
+        'cwst', 'label')
+), (
     'eg.grid.booking.pickup.picked_up', 'gui', 'object',
     oils_i18n_gettext(
         'booking.pickup.picked_up',
@@ -19915,6 +19921,24 @@ VALUES (
         'Grid Config: Booking Return Patron tab Already Picked Up grid',
         'cwst', 'label')
 ), (
+    'eg.grid.booking.return.patron.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.patron.returned',
+        'Grid Config: Booking Return Patron tab Returned Today grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.picked_up', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resourcce.picked_up',
+        'Grid Config: Booking Return Resource tab Already Picked Up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resource.returned',
+        'Grid Config: Booking Return Resource tab Returned Today grid',
+        'cwst', 'label')
+), (
     'eg.booking.manage.filter', 'gui', 'string',
     oils_i18n_gettext(
         'booking.manage.filter',

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql
index 47555f4..e47486e 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql
@@ -8,6 +8,12 @@ VALUES (
         'Grid Config: Booking Manage Reservations',
         'cwst', 'label')
 ), (
+    'eg.grid.booking.pickup.ready', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.pickup.ready',
+        'Grid Config: Booking Ready to pick up grid',
+        'cwst', 'label')
+), (
     'eg.grid.booking.pickup.picked_up', 'gui', 'object',
     oils_i18n_gettext(
         'booking.pickup.picked_up',
@@ -20,6 +26,24 @@ VALUES (
         'Grid Config: Booking Return Patron tab Already Picked Up grid',
         'cwst', 'label')
 ), (
+    'eg.grid.booking.return.patron.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.patron.returned',
+        'Grid Config: Booking Return Patron tab Returned Today grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.picked_up', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resourcce.picked_up',
+        'Grid Config: Booking Return Resource tab Already Picked Up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resource.returned',
+        'Grid Config: Booking Return Resource tab Returned Today grid',
+        'cwst', 'label')
+), (
     'eg.booking.manage.filter', 'gui', 'string',
     oils_i18n_gettext(
         'booking.manage.filter',
@@ -39,5 +63,4 @@ VALUES (
         'cwst', 'label')
 );
 
-
 COMMIT;