Attachment #19486 for bug #9673

View | Details | Raw Unified | Return to bug 9673
Collapse All | Expand All





    $item->{onloan} = undef if $item->{itemlost};

    for my $field ( qw( itemlost wthdrawn ) ) {
        if ( defined( $item->{$field} ) ) {
            if ( $item->{$field} ) {
                $item->{$field . '_on'} = DateTime::Format::MySQL->format_datetime( DateTime->now() );
            } else {
                $item->{$field . '_on'} = undef;
            }
        }
    }

    _set_derived_columns_for_mod($item);
    _do_column_fixes_for_mod($item);
    # FIXME add checks

Lines 866-872 CREATE TABLE `deleteditems` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+8 lines)
866	`notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)	866	`notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)
867	`damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)	867	`damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)
868	`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)	868	`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
		869	`itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost
869	`withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)	870	`withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
		871	`wthdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
870	`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)	872	`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
871	`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)	873	`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
872	`issues` smallint(6) default NULL, -- number of times this item has been checked out	874	`issues` smallint(6) default NULL, -- number of times this item has been checked out
Lines 1158-1164 CREATE TABLE `items` ( -- holdings/item information Link Here
1158	`notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)	1160	`notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)
1159	`damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)	1161	`damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)
1160	`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)	1162	`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
		1163	<<<<<<< HEAD
1161	`withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)	1164	`withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
		1165	=======
		1166	`itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost
		1167	`wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
		1168	`wthdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
		1169	>>>>>>> Bug 9673 - Track when items are marked as lost or withdrawn
1162	`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)	1170	`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
1163	`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)	1171	`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
1164	`issues` smallint(6) default NULL, -- number of times this item has been checked out/issued	1172	`issues` smallint(6) default NULL, -- number of times this item has been checked out/issued




    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 wthdrawn_on DATETIME NULL AFTER wthdrawn");
   $dbh->do("ALTER TABLE deleteditems ADD itemlost_on DATETIME NULL AFTER itemlost");
   $dbh->do("ALTER TABLE deleteditems ADD wthdrawn_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)

Lines 116-121 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-1 / +2 lines)
116		116
117	[% END %]	117	[% END %]
118	</li>	118	</li>
		119	[% IF ITEM_DAT.itemlost_on %]<li><span class="label">Lost on:</span>[% ITEM_DAT.itemlost_on \| $KohaDates %]  </li>[% END %]
119	[% END %]	120	[% END %]
120	[% IF ( ITEM_DAT.itemdamagedloop ) %]	121	[% IF ( ITEM_DAT.itemdamagedloop ) %]
121	<li><span class="label">Damaged status:</span>	122	<li><span class="label">Damaged status:</span>
Lines 165-170 Link Here
165	</form>	166	</form>
166	[% END %]	167	[% END %]
167	</li>	168	</li>
		169	[% IF ITEM_DAT.wthdrawn_on %]<li><span class="label">Withdrawn on:</span>[% ITEM_DAT.wthdrawn_on \| $KohaDates %]  </li>[% END %]
168	</ol></div>	170	</ol></div>
169	<div class="listgroup"><h4>History</h4>	171	<div class="listgroup"><h4>History</h4>
170	<ol class="bibliodetails">	172	<ol class="bibliodetails">
171	-

Return to bug 9673

Lines 535-540 sub ModItem { Link Here

(-)a/C4/Items.pm (+10 lines)
535		535
536	$item->{onloan} = undef if $item->{itemlost};	536	$item->{onloan} = undef if $item->{itemlost};
537		537
		538	for my $field ( qw( itemlost wthdrawn ) ) {
		539	if ( defined( $item->{$field} ) ) {
		540	if ( $item->{$field} ) {
		541	$item->{$field . '_on'} = DateTime::Format::MySQL->format_datetime( DateTime->now() );
		542	} else {
		543	$item->{$field . '_on'} = undef;
		544	}
		545	}
		546	}
		547
538	_set_derived_columns_for_mod($item);	548	_set_derived_columns_for_mod($item);
539	_do_column_fixes_for_mod($item);	549	_do_column_fixes_for_mod($item);
540	# FIXME add checks	550	# FIXME add checks

Lines 7042-7047 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
7042	SetVersion($DBversion);	7042	SetVersion($DBversion);
7043	}	7043	}
7044		7044
		7045	$DBversion = "3.13.00.XXX";
		7046	if ( CheckVersion($DBversion) ) {
		7047	$dbh->do("ALTER TABLE items ADD itemlost_on DATETIME NULL AFTER itemlost");
		7048	$dbh->do("ALTER TABLE items ADD wthdrawn_on DATETIME NULL AFTER wthdrawn");
		7049	$dbh->do("ALTER TABLE deleteditems ADD itemlost_on DATETIME NULL AFTER itemlost");
		7050	$dbh->do("ALTER TABLE deleteditems ADD wthdrawn_on DATETIME NULL AFTER wthdrawn");
		7051	print "Upgrade to $DBversion done (Bug 9673 - Track when items are marked as lost or withdrawn)\n";
		7052	SetVersion ($DBversion);
		7053	}
		7054
7045	=head1 FUNCTIONS	7055	=head1 FUNCTIONS
7046		7056
7047	=head2 TableExists($table)	7057	=head2 TableExists($table)