From 0e830876e302b53a9ee8ba75eb645eeddd0965d5 Mon Sep 17 00:00:00 2001
From: root <root@eg36>
Date: Wed, 26 May 2021 15:24:55 -0400
Subject: [PATCH 1/1] add creator and create_date to actor.card & See All

---
 openils/conf/fm_IDL.xml                                           | 3 +++
 openils/var/templates/actor/user/register.tt2                     | 4 ++++
 openils/var/templates/staff/circ/patron/t_patron_cards_dialog.tt2 | 8 ++++++++
 openils/var/templates/staff/css/circ.css.tt2                      | 2 ++
 openils/var/web/reports/fm_IDL.xml                                | 5 ++++-
 perlmods/OpenILS/Application/Actor.pm                             | 1 +
 perlmods/OpenILS/Application/Storage/CDBI/actor.pm                | 2 +-
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/openils/conf/fm_IDL.xml b/openils/conf/fm_IDL.xml
index d6c112f..3153ec4 100644
--- a/openils/conf/fm_IDL.xml
+++ b/openils/conf/fm_IDL.xml
@@ -7201,9 +7201,12 @@ SELECT  usr,
 			<field reporter:label="Barcode" name="barcode" reporter:datatype="text"/>
 			<field reporter:label="Card ID" name="id" reporter:datatype="id" />
 			<field reporter:label="User" name="usr" reporter:datatype="link"/>
+                        <field reporter:label="Creator" name="creator" reporter:datatype="link" />
+                        <field reporter:label="Create Date" name="create_date" reporter:datatype="timestamp"/>
 		</fields>
 		<links>
 			<link field="usr" reltype="has_a" key="id" map="" class="au"/>
+                        <link field="creator" reltype="has_a" key="id" map="" class="au"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 			<actions>
diff --git a/openils/var/templates/actor/user/register.tt2 b/openils/var/templates/actor/user/register.tt2
index 7a02e9f..7fcc04a 100644
--- a/openils/var/templates/actor/user/register.tt2
+++ b/openils/var/templates/actor/user/register.tt2
@@ -62,6 +62,8 @@
                     <th id='uedit-all-cards-barcode'>[% l('Barcode') %]</th>
                     <th id='uedit-all-cards-active'>[% l('Active') %]</th>
                     <th id='uedit-all-cards-primary'>[% l('Primary') %]</th>
+                    <th id='uedit-all-cards-create_date'>[% l('Created') %]</th>
+                    <th id='uedit-all-cards-creator'>[% l('Creator') %]</th>
                 </tr>
             </thead>
             <tbody id='uedit-all-cards-tbody'>
@@ -69,6 +71,8 @@
                     <td><div name='barcode'></div></td>
                     <td><div name='active'></div></td>
                     <td><div name='primary'></div></td>
+                    <td><div name='create_date'></div></td>
+                    <td><div name='creator'></div></td>
                 </tr>
             </tbody>
             <tbody>
diff --git a/openils/var/templates/staff/circ/patron/t_patron_cards_dialog.tt2 b/openils/var/templates/staff/circ/patron/t_patron_cards_dialog.tt2
index b171d71..10c5970 100644
--- a/openils/var/templates/staff/circ/patron/t_patron_cards_dialog.tt2
+++ b/openils/var/templates/staff/circ/patron/t_patron_cards_dialog.tt2
@@ -15,6 +15,12 @@
         <div class="col-md-4">
           <label>[% l('Primary') %]</label>
         </div>
+        <div class="col-md-4">
+          <label>[% l('Created') %]</label>
+        </div>
+        <div class="col-md-4">
+          <label>[% l('Creator') %]</label>
+        </div>
       </div>
       <div class="row" ng-repeat="card in args.cards">
         <div class="col-md-4">{{card.barcode}}</div>
@@ -28,6 +34,8 @@
             ng-value='card.id'
             ng-disabled="!perms.UPDATE_PATRON_PRIMARY_CARD"/>
         </div>
+        <div class="col-md-4">{{card.create_date | limitTo:10}}</div>
+        <div class="col-md-4">{{card.creator}}</div>
       </div>
     </div>
     <div class="modal-footer">
diff --git a/openils/var/templates/staff/css/circ.css.tt2 b/openils/var/templates/staff/css/circ.css.tt2
index 2ac4d9b..afa1fe9 100644
--- a/openils/var/templates/staff/css/circ.css.tt2
+++ b/openils/var/templates/staff/css/circ.css.tt2
@@ -154,6 +154,8 @@ but the ones I'm finding aren't quite cutting it..*/
   font-weight: bold;
 }
 
+.patron-reg-barcodes div .col-md-4 { width: 115px; }
+
 .patron-reg-barcodes > .header {
   font-weight: bold;
 }
diff --git a/openils/var/web/reports/fm_IDL.xml b/openils/var/web/reports/fm_IDL.xml
index a3971ab..14816e2 100644
--- a/openils/var/web/reports/fm_IDL.xml
+++ b/openils/var/web/reports/fm_IDL.xml
@@ -7048,9 +7048,12 @@ SELECT  usr,
 			<field reporter:label='&field.ac.barcode.label;' name='barcode' reporter:datatype='text' />
 			<field reporter:label='&field.ac.id.label;' name='id' reporter:datatype='id' />
 			<field reporter:label='&field.ac.usr.label;' name='usr' reporter:datatype='link' />
+                        <field reporter:label="Creator" name="creator" reporter:datatype="link" />
+                        <field reporter:label="Create Date" name="create_date" reporter:datatype="timestamp"/>
 		</fields>
 		<links>
 			<link field='usr' reltype='has_a' class='au' key='id' map='' />
+                        <link field="creator" reltype="has_a" key="id" map="" class="au"/>
 		</links>
 		<permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
 			<actions>
@@ -13287,4 +13290,4 @@ SELECT  usr,
 	</class>
 
 	
-</IDL>
\ No newline at end of file
+</IDL>
diff --git a/perlmods/OpenILS/Application/Actor.pm b/perlmods/OpenILS/Application/Actor.pm
index 23021c7..5ece9df 100644
--- a/perlmods/OpenILS/Application/Actor.pm
+++ b/perlmods/OpenILS/Application/Actor.pm
@@ -959,6 +959,7 @@ sub _add_update_cards {
 sub _add_card {
     my( $e, $card ) = @_;
     $card->clear_id();
+    $card->creator($e->requestor->id);
 
     $logger->info("Adding new patron card ".$card->barcode);
 
diff --git a/perlmods/OpenILS/Application/Storage/CDBI/actor.pm b/perlmods/OpenILS/Application/Storage/CDBI/actor.pm
index a4047f7..9810a7c 100644
--- a/perlmods/OpenILS/Application/Storage/CDBI/actor.pm
+++ b/perlmods/OpenILS/Application/Storage/CDBI/actor.pm
@@ -150,7 +150,7 @@ use base qw/actor/;
 
 __PACKAGE__->table( 'actor_card' );
 __PACKAGE__->columns( Primary => qw/id/ );
-__PACKAGE__->columns( Essential => qw/usr barcode active/ );
+__PACKAGE__->columns( Essential => qw/usr barcode active creator create_date/ );
 
 #-------------------------------------------------------------------------------
 package actor::user_access_entry;
-- 
2.7.4