@@ -, +, @@ Serial Items. Circ- and member-modules. -1. Find a Borrower/parent with a child/guarantee. -0. Make a Subscription (creating Items when receiving serial numbers) to a Biblio and receive atleast 4 numbers. in their "Holds"-tab in circ/circulation.pl and members/moremember.pl the "Vol info"-tab with their relatives' loans proper enumerations. --- .../prog/en/includes/checkouts-table-footer.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 24 ++++++++++++++++++++ koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 23 +++++++++++++++++++ .../prog/en/modules/circ/circulation.tt | 2 ++ .../prog/en/modules/members/moremember.tt | 2 ++ svc/checkouts | 2 ++ svc/holds | 1 + 8 files changed, 56 insertions(+), 1 deletion(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -1,6 +1,6 @@ - Totals: + Totals: [% totaldue %] [% totalprice %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -14,6 +14,7 @@ Due date Due date Title + Vol info Item type Checked out on Checked out from --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -252,6 +252,7 @@ $(document).ready(function() { return title; } }, + { "mDataProp": "enumchron" }, //bVisible: controlled by the fnInitComplete if enumchron is used in the table { "mDataProp": "itemtype_description" }, { "mDataProp": "issuedate_formatted" }, { "mDataProp": "branchname" }, @@ -399,6 +400,8 @@ $(document).ready(function() { } } + doHideEnumchron( $( oSettings.nTable ).DataTable() , oSettings.fnRecordsTotal() , '.col_enumchron' ); + oSettings.aaSortingFixed = null; }, }).rowGrouping( @@ -487,6 +490,7 @@ $(document).ready(function() { return title; } }, + { "mDataProp": "enumchron" }, { "mDataProp": "itemtype" }, { "mDataProp": "issuedate_formatted" }, { "mDataProp": "branchname" }, @@ -523,6 +527,9 @@ $(document).ready(function() { fnCallback(json) } ); }, + "fnInitComplete": function(oSettings) { + doHideEnumchron( $( oSettings.nTable ).DataTable() , oSettings.fnRecordsTotal() , '.col_enumchron' ); + }, }); } }); @@ -544,3 +551,20 @@ $(document).ready(function() { } ).attr( 'checked', false ); } }); + +function doHideEnumchron (table, rowCount, colDefinition) { + //Get the presence of a enumchron and hide the column if no enumchron present. + var enumchronPresent = 0; + var col_enumchron = table.column( colDefinition ); + var col_enumchron_data = col_enumchron.data(); + + for(var i=0;i[% message %] Due date (unformatted, hidden) Due date Title + Vol info Item type Checked out on Checked out from @@ -815,6 +816,7 @@ No patron matched [% message %] Hold date Title + Vol info Call number Barcode Expiration --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -435,6 +435,7 @@ function validate1(date) { Due date Title + Vol info Item type Checked out on Checked out from @@ -467,6 +468,7 @@ function validate1(date) { Hold date Title + Vol info Call number Barcode Expiration --- a/svc/checkouts +++ a/svc/checkouts @@ -76,6 +76,7 @@ my $sql = ' barcode, itemnotes, itemcallnumber, + items.enumchron, replacementprice, issues.branchcode, @@ -153,6 +154,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { branchcode => $c->{branchcode}, branchname => $c->{branchname}, itemcallnumber => $c->{itemcallnumber} || q{}, + enumchron => $c->{enumchron} || q{}, charge => $charge, price => $c->{replacementprice} || q{}, can_renew => $can_renew, --- a/svc/holds +++ a/svc/holds @@ -115,6 +115,7 @@ while ( my $h = $holds_rs->next() ) { $hold->{barcode} = $item->barcode(); $hold->{itemtype} = $item->effective_itemtype(); $hold->{itemcallnumber} = $item->itemcallnumber() || q{}; + $hold->{enumchron} = $item->enumchron() || q{}; my ( $transferred_when, $transferred_from, $transferred_to ) = GetTransfers( $item->itemnumber() ); --