From 0debe12061b37e80c12ecfea792827503df6dbcc Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 20 Feb 2013 09:34:38 -0500 Subject: [PATCH] Bug 9673 - Track when items are marked as lost or withdrawn Add date fields to track when an item was marked as lost or withdrawn. Display those fields on catalogue/moredetail.pl Test Plan: 1) Apply patch 2) Run updatedatabase.pl 3) Pick a record with items, browse to the 'items' tab ( moredetail.pl ) 4) Mark an item as lost, verify the field "Lost on:" displays below the "Lost status" field with todays date. 5) Mark the item as not lost, verify the field no longer displays 6) Repeat steps 4 and 5 with the Withdrawn field. Signed-off-by: Mathieu Saby Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- C4/Items.pm | 27 +++++++++++++++++++ installer/data/mysql/kohastructure.sql | 4 +++ installer/data/mysql/updatedatabase.pl | 10 +++++++ .../prog/en/modules/catalogue/moredetail.tt | 2 ++ 4 files changed, 43 insertions(+) diff --git a/C4/Items.pm b/C4/Items.pm index 80361b9daf..0f2aec4e11 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -31,8 +31,10 @@ use C4::ClassSource; use C4::Log; use List::MoreUtils qw/any/; use YAML qw/Load/; +use DateTime::Format::MySQL; use Data::Dumper; # used as part of logging item record changes, not just for # debugging; so please don't remove this +use Koha::DateUtils qw/dt_from_string/; use vars qw($VERSION @ISA @EXPORT); @@ -540,6 +542,31 @@ sub ModItem { $item->{onloan} = undef if $item->{itemlost}; + my @fields = qw( itemlost withdrawn ); + + # Only call GetItem if we need to set an "on" date field + if ( $item->{itemlost} || $item->{withdrawn} ) { + my $pre_mod_item = GetItem( $item->{'itemnumber'} ); + for my $field (@fields) { + if ( defined( $item->{$field} ) + and not $pre_mod_item->{$field} + and $item->{$field} ) + { + $item->{ $field . '_on' } = + DateTime::Format::MySQL->format_datetime( dt_from_string() ); + } + } + } + + # If the field is defined but empty, we are removing and, + # and thus need to clear out the 'on' field as well + for my $field (@fields) { + if ( defined( $item->{$field} ) && !$item->{$field} ) { + $item->{ $field . '_on' } = undef; + } + } + + _set_derived_columns_for_mod($item); _do_column_fixes_for_mod($item); # FIXME add checks diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e60b61e553..3c5d9b031a 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -891,7 +891,9 @@ CREATE TABLE `deleteditems` ( `notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7) `damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4) `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1) + `itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost `withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0) + `withdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o) `coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f) `issues` smallint(6) default NULL, -- number of times this item has been checked out @@ -1184,7 +1186,9 @@ CREATE TABLE `items` ( -- holdings/item information `notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7) `damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4) `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1) + `itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost `withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0) + `withdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o) `coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f) `issues` smallint(6) default NULL, -- number of times this item has been checked out/issued diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 31205133ee..535cbfee9e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7843,6 +7843,16 @@ if(CheckVersion($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("ALTER TABLE items ADD itemlost_on DATETIME NULL AFTER itemlost"); + $dbh->do("ALTER TABLE items ADD withdrawn_on DATETIME NULL AFTER wthdrawn"); + $dbh->do("ALTER TABLE deleteditems ADD itemlost_on DATETIME NULL AFTER itemlost"); + $dbh->do("ALTER TABLE deleteditems ADD withdrawn_on DATETIME NULL AFTER wthdrawn"); + print "Upgrade to $DBversion done (Bug 9673 - Track when items are marked as lost or withdrawn)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 40798ebf66..d54513dfbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -127,6 +127,7 @@   [% END %] + [% IF ITEM_DAT.itemlost_on %]
  • Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]  
    • [% END %] [% END %] [% IF ( ITEM_DAT.itemdamagedloop ) %]
  • Damaged status: @@ -176,6 +177,7 @@ [% END %]
    • + [% IF ITEM_DAT.withdrawn_on %]
  • Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]  
    • [% END %]

    History

      -- 2.39.5