diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
new file mode 100644
index 0000000000..e22810ae8b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
@@ -0,0 +1,30 @@
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
new file mode 100644
index 0000000000..268eefe777
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
@@ -0,0 +1,435 @@
+$(document).ready(function() {
+ // Handle the select all/none links for checkouts table columns
+ $("#CheckAllRenewals").on("click",function(){
+ $("#UncheckAllCheckins").click();
+ $(".renew:visible").attr("checked", "checked" );
+ return false;
+ });
+ $("#UncheckAllRenewals").on("click",function(){
+ $(".renew:visible").removeAttr("checked");
+ return false;
+ });
+
+ $("#CheckAllCheckins").on("click",function(){
+ $("#UncheckAllRenewals").click();
+ $(".checkin:visible").attr("checked", "checked" );
+ return false;
+ });
+ $("#UncheckAllCheckins").on("click",function(){
+ $(".checkin:visible").removeAttr("checked");
+ return false;
+ });
+
+ // Don't allow both return and renew checkboxes to be checked
+ $(document).on("change", '.renew', function(){
+ if ( $(this).is(":checked") ) {
+ $( "#checkin_" + $(this).val() ).removeAttr("checked");
+ }
+ });
+ $(document).on("change", '.checkin', function(){
+ if ( $(this).is(":checked") ) {
+ $( "#renew_" + $(this).val() ).removeAttr("checked");
+ }
+ });
+
+ // Clicking the table cell checks the checkbox inside it
+ $(document).on("click", 'td', function(e){
+ if(e.target.tagName.toLowerCase() == 'td'){
+ $(this).find("input:checkbox:visible").each( function() {
+ $(this).click();
+ });
+ }
+ });
+
+ // Handle renewals and returns
+ $("#RenewCheckinChecked").on("click",function(){
+ $(".checkin:checked:visible").each(function() {
+ itemnumber = $(this).val();
+
+ $(this).replaceWith("![](" + interface + "/" + theme + "/img/loading-small.gif)
");
+
+ params = {
+ itemnumber: itemnumber,
+ borrowernumber: borrowernumber,
+ branchcode: branchcode,
+ exempt_fine: $("#exemptfine").is(':checked')
+ };
+
+ $.post( "/cgi-bin/koha/svc/checkin.pl", params, function( data ) {
+ id = "#checkin_" + data.itemnumber;
+
+ content = "";
+ if ( data.returned ) {
+ content = CIRCULATION_RETURNED;
+ } else {
+ content = CIRCULATION_NOT_RETURNED;
+ }
+
+ $(id).replaceWith( content );
+ }, "json")
+ });
+
+ $(".renew:checked:visible").each(function() {
+ var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
+
+ var itemnumber = $(this).val();
+
+ $(this).parent().parent().replaceWith("");
+
+ var params = {
+ itemnumber: itemnumber,
+ borrowernumber: borrowernumber,
+ branchcode: branchcode,
+ override_limit: override_limit,
+ date_due: $("#newduedate").val()
+ };
+
+ $.post( "/cgi-bin/koha/svc/renew.pl", params, function( data ) {
+ var id = "#renew_" + data.itemnumber;
+
+ var content = "";
+ if ( data.renew_okay ) {
+ content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
+ } else {
+ content = CIRCULATION_RENEW_FAILED + " ";
+ if ( data.error == "no_checkout" ) {
+ content += NOT_CHECKED_OUT;
+ } else if ( data.error == "too_many" ) {
+ content += TOO_MANY_RENEWALS;
+ } else if ( data.error == "on_reserve" ) {
+ content += ON_RESERVE;
+ } else if ( data.error ) {
+ content += data.error;
+ } else {
+ content += REASON_UNKNOWN;
+ }
+ }
+
+ $(id).replaceWith( content );
+ }, "json")
+ });
+
+ // Prevent form submit
+ return false;
+ });
+
+ $("#RenewAll").on("click",function(){
+ $("#CheckAllRenewals").click();
+ $("#UncheckAllCheckins").click();
+ $("#RenewCheckinChecked").click();
+
+ // Prevent form submit
+ return false;
+ });
+
+ var ymd = $.datepicker.formatDate('yy-mm-dd', new Date());
+
+ var issuesTable;
+ var drawn = 0;
+ issuesTable = $("#issues-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aaSorting": [[ 0, "desc" ]],
+ "aoColumns": [
+ {
+ "mDataProp": function( oObj ) {
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ return "" + TODAYS_CHECKOUTS + "";
+ } else {
+ return "" + PREVIOUS_CHECKOUTS + "";
+ }
+ }
+ },
+ {
+ "mDataProp": "date_due",
+ "bVisible": false,
+ },
+ {
+ "iDataSort": 1, // Sort on hidden unformatted date due column
+ "mDataProp": function( oObj ) {
+ var today = new Date();
+ var due = new Date( oObj.date_due );
+ if ( today > due ) {
+ return "" + oObj.date_due_formatted + "";
+ } else {
+ return oObj.date_due_formatted;
+ }
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ { "mDataProp": "itemtype" },
+ { "mDataProp": "issuedate" },
+ { "mDataProp": "branchname" },
+ { "mDataProp": "itemcallnumber" },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ return parseFloat(oObj.charge).toFixed(2);
+ }
+ },
+ {
+ "bSortable": false,
+ "mDataProp": "price" },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ var content = "";
+ var span_style = "";
+ var span_class = "";
+
+ content += "";
+ content += "" + oObj.renewals_count + "";
+
+ if ( oObj.can_renew ) {
+ // Do nothing
+ } else if ( oObj.can_renew_error == "on_reserve" ) {
+ content += ""
+ + "" + ON_HOLD + ""
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ } else if ( oObj.can_renew_error == "too_many" ) {
+ content += ""
+ + NOT_RENEWABLE
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ } else {
+ content += ""
+ + oObj.can_renew_error
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ }
+
+ content += ""
+ + ""
+ + "";
+
+ if ( oObj.renewals_remaining ) {
+ content += "("
+ + oObj.renewals_remaining
+ + " " + OF + " "
+ + oObj.renewals_allowed + " "
+ + RENEWALS_REMAINING + ")";
+ }
+
+ content += "";
+
+
+ return content;
+ }
+ },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ if ( oObj.can_renew_error == "on_reserve" ) {
+ return "" + ON_HOLD + "";
+ } else {
+ return "";
+ }
+ }
+ },
+ {
+ "bVisible": exports_enabled ? true : false,
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ return "";
+ }
+ }
+ ],
+ "fnFooterCallback": function ( nRow, aaData, iStart, iEnd, aiDisplay ) {
+ var total_charge = 0;
+ var total_price = 0;
+ for ( var i=0; i < aaData.length; i++ ) {
+ total_charge += aaData[i]['charge'] * 1;
+ total_price += aaData[i]['price'] * 1;
+ }
+ var nCells = nRow.getElementsByTagName('td');
+ nCells[1].innerHTML = total_charge.toFixed(2);
+ nCells[2].innerHTML = total_price.toFixed(2);
+ },
+ "bPaginate": false,
+ "bProcessing": true,
+ "bServerSide": false,
+ "sAjaxSource": '/cgi-bin/koha/svc/checkouts.pl',
+ "fnServerData": function ( sSource, aoData, fnCallback ) {
+ aoData.push( { "name": "borrowernumber", "value": borrowernumber } );
+
+ $.getJSON( sSource, aoData, function (json) {
+ fnCallback(json)
+ } );
+ },
+ "fnInitComplete": function(oSettings) {
+ // Disable rowGrouping plugin after first use
+ // so any sorting on the table doesn't use it
+ var oSettings = issuesTable.fnSettings();
+
+ for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
+ if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
+ oSettings.aoDrawCallback.splice(f, 1);
+ break;
+ }
+ }
+
+ oSettings.aaSortingFixed = null;
+ },
+ }).rowGrouping(
+ {
+ iGroupingOrderByColumnIndex: 0,
+ sGroupingColumnSortDirection: "desc"
+ }
+ );
+
+ if ( $("#issues-table").length ) {
+ $("#issues-table_processing").position({
+ of: $( "#issues-table" ),
+ collision: "none"
+ });
+ }
+
+ // Don't load relatives' issues table unless it is clicked on
+ var relativesIssuesTable;
+ $("#relatives-issues-tab").click( function() {
+ if ( ! relativesIssuesTable ) {
+ relativesIssuesTable = $("#relatives-issues-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aaSorting": [],
+ "aoColumns": [
+ {
+ "mDataProp": function( oObj ) {
+ var today = new Date();
+ var due = new Date( oObj.date_due );
+ if ( today > due ) {
+ return "" + oObj.date_due_formatted + "";
+ } else {
+ return oObj.date_due_formatted;
+ }
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ { "mDataProp": "itemtype" },
+ { "mDataProp": "issuedate" },
+ { "mDataProp": "branchname" },
+ { "mDataProp": "itemcallnumber" },
+ { "mDataProp": "charge" },
+ { "mDataProp": "price" },
+ {
+ "mDataProp": function( oObj ) {
+ return ""
+ + oObj.borrower.firstname + " " + oObj.borrower.surname + " (" + oObj.borrower.cardnumber + ")"
+ }
+ },
+ ],
+ "bPaginate": false,
+ "bProcessing": true,
+ "bServerSide": true,
+ "sAjaxSource": '/cgi-bin/koha/svc/checkouts.pl',
+ "fnServerData": function ( sSource, aoData, fnCallback ) {
+ $.each(relatives_borrowernumbers, function( index, value ) {
+ aoData.push( { "name": "borrowernumber", "value": value } );
+ });
+
+ $.getJSON( sSource, aoData, function (json) {
+ fnCallback(json)
+ } );
+ },
+ });
+ }
+ });
+
+ if ( $("#relatives-issues-table").length ) {
+ $("#relatives-issues-table_processing").position({
+ of: $( "#relatives-issues-table" ),
+ collision: "none"
+ });
+ }
+
+ if ( AllowRenewalLimitOverride ) {
+ $( '#override_limit' ).click( function () {
+ if ( this.checked ) {
+ $( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
+ } else {
+ $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
+ }
+ } ).attr( 'checked', false );
+ }
+ });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
new file mode 100644
index 0000000000..76dfee55fc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
@@ -0,0 +1,133 @@
+$(document).ready(function() {
+ // Don't load holds table unless it is clicked on
+ var holdsTable;
+ $("#holds-tab").click( function() {
+ if ( ! holdsTable ) {
+ holdsTable = $("#holds-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aoColumns": [
+ {
+ "mDataProp": "reservedate_formatted"
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ {
+ "mDataProp": function( oObj ) {
+ return oObj.itemcallnumber || "";
+ }
+ },
+ {
+ "mDataProp": function( oObj ) {
+ var data = "";
+
+ if ( oObj.suspend == 1 ) {
+ data += "
NOTE: Enabling this function may slow down circulation time for patrons with many checkouts." - - pref: soundon choices: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 75e05b390d..9951030b3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -13,90 +13,46 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] -[% IF ( UseTablesortForCirc ) %] -[% INCLUDE 'datatables.inc' %][% END %] + + +[% INCLUDE 'datatables.inc' %] +[% INCLUDE 'strings.inc' %] [% INCLUDE 'timepicker.inc' %] + + + @@ -527,7 +483,7 @@ No patron matched [% message %] [% ELSE %] [% END %] - + [% IF ( SpecifyDueDate ) %]
[% END %]
@@ -698,399 +654,111 @@ No patron matched [% message %]
-
-
-[% IF ( displayrelissues ) %]
-
");
+
+ params = {
+ itemnumber: itemnumber,
+ borrowernumber: borrowernumber,
+ branchcode: branchcode,
+ exempt_fine: $("#exemptfine").is(':checked')
+ };
+
+ $.post( "/cgi-bin/koha/svc/checkin.pl", params, function( data ) {
+ id = "#checkin_" + data.itemnumber;
+
+ content = "";
+ if ( data.returned ) {
+ content = CIRCULATION_RETURNED;
+ } else {
+ content = CIRCULATION_NOT_RETURNED;
+ }
+
+ $(id).replaceWith( content );
+ }, "json")
+ });
+
+ $(".renew:checked:visible").each(function() {
+ var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
+
+ var itemnumber = $(this).val();
+
+ $(this).parent().parent().replaceWith("");
+
+ var params = {
+ itemnumber: itemnumber,
+ borrowernumber: borrowernumber,
+ branchcode: branchcode,
+ override_limit: override_limit,
+ date_due: $("#newduedate").val()
+ };
+
+ $.post( "/cgi-bin/koha/svc/renew.pl", params, function( data ) {
+ var id = "#renew_" + data.itemnumber;
+
+ var content = "";
+ if ( data.renew_okay ) {
+ content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
+ } else {
+ content = CIRCULATION_RENEW_FAILED + " ";
+ if ( data.error == "no_checkout" ) {
+ content += NOT_CHECKED_OUT;
+ } else if ( data.error == "too_many" ) {
+ content += TOO_MANY_RENEWALS;
+ } else if ( data.error == "on_reserve" ) {
+ content += ON_RESERVE;
+ } else if ( data.error ) {
+ content += data.error;
+ } else {
+ content += REASON_UNKNOWN;
+ }
+ }
+
+ $(id).replaceWith( content );
+ }, "json")
+ });
+
+ // Prevent form submit
+ return false;
+ });
+
+ $("#RenewAll").on("click",function(){
+ $("#CheckAllRenewals").click();
+ $("#UncheckAllCheckins").click();
+ $("#RenewCheckinChecked").click();
+
+ // Prevent form submit
+ return false;
+ });
+
+ var ymd = $.datepicker.formatDate('yy-mm-dd', new Date());
+
+ var issuesTable;
+ var drawn = 0;
+ issuesTable = $("#issues-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aaSorting": [[ 0, "desc" ]],
+ "aoColumns": [
+ {
+ "mDataProp": function( oObj ) {
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ return "" + TODAYS_CHECKOUTS + "";
+ } else {
+ return "" + PREVIOUS_CHECKOUTS + "";
+ }
+ }
+ },
+ {
+ "mDataProp": "date_due",
+ "bVisible": false,
+ },
+ {
+ "iDataSort": 1, // Sort on hidden unformatted date due column
+ "mDataProp": function( oObj ) {
+ var today = new Date();
+ var due = new Date( oObj.date_due );
+ if ( today > due ) {
+ return "" + oObj.date_due_formatted + "";
+ } else {
+ return oObj.date_due_formatted;
+ }
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ { "mDataProp": "itemtype" },
+ { "mDataProp": "issuedate" },
+ { "mDataProp": "branchname" },
+ { "mDataProp": "itemcallnumber" },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ return parseFloat(oObj.charge).toFixed(2);
+ }
+ },
+ {
+ "bSortable": false,
+ "mDataProp": "price" },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ var content = "";
+ var span_style = "";
+ var span_class = "";
+
+ content += "";
+ content += "" + oObj.renewals_count + "";
+
+ if ( oObj.can_renew ) {
+ // Do nothing
+ } else if ( oObj.can_renew_error == "on_reserve" ) {
+ content += ""
+ + "" + ON_HOLD + ""
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ } else if ( oObj.can_renew_error == "too_many" ) {
+ content += ""
+ + NOT_RENEWABLE
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ } else {
+ content += ""
+ + oObj.can_renew_error
+ + "";
+
+ span_style = "display: none";
+ span_class = "renewals-allowed";
+ }
+
+ content += ""
+ + ""
+ + "";
+
+ if ( oObj.renewals_remaining ) {
+ content += "("
+ + oObj.renewals_remaining
+ + " " + OF + " "
+ + oObj.renewals_allowed + " "
+ + RENEWALS_REMAINING + ")";
+ }
+
+ content += "";
+
+
+ return content;
+ }
+ },
+ {
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ if ( oObj.can_renew_error == "on_reserve" ) {
+ return "" + ON_HOLD + "";
+ } else {
+ return "";
+ }
+ }
+ },
+ {
+ "bVisible": exports_enabled ? true : false,
+ "bSortable": false,
+ "mDataProp": function ( oObj ) {
+ return "";
+ }
+ }
+ ],
+ "fnFooterCallback": function ( nRow, aaData, iStart, iEnd, aiDisplay ) {
+ var total_charge = 0;
+ var total_price = 0;
+ for ( var i=0; i < aaData.length; i++ ) {
+ total_charge += aaData[i]['charge'] * 1;
+ total_price += aaData[i]['price'] * 1;
+ }
+ var nCells = nRow.getElementsByTagName('td');
+ nCells[1].innerHTML = total_charge.toFixed(2);
+ nCells[2].innerHTML = total_price.toFixed(2);
+ },
+ "bPaginate": false,
+ "bProcessing": true,
+ "bServerSide": false,
+ "sAjaxSource": '/cgi-bin/koha/svc/checkouts.pl',
+ "fnServerData": function ( sSource, aoData, fnCallback ) {
+ aoData.push( { "name": "borrowernumber", "value": borrowernumber } );
+
+ $.getJSON( sSource, aoData, function (json) {
+ fnCallback(json)
+ } );
+ },
+ "fnInitComplete": function(oSettings) {
+ // Disable rowGrouping plugin after first use
+ // so any sorting on the table doesn't use it
+ var oSettings = issuesTable.fnSettings();
+
+ for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
+ if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
+ oSettings.aoDrawCallback.splice(f, 1);
+ break;
+ }
+ }
+
+ oSettings.aaSortingFixed = null;
+ },
+ }).rowGrouping(
+ {
+ iGroupingOrderByColumnIndex: 0,
+ sGroupingColumnSortDirection: "desc"
+ }
+ );
+
+ if ( $("#issues-table").length ) {
+ $("#issues-table_processing").position({
+ of: $( "#issues-table" ),
+ collision: "none"
+ });
+ }
+
+ // Don't load relatives' issues table unless it is clicked on
+ var relativesIssuesTable;
+ $("#relatives-issues-tab").click( function() {
+ if ( ! relativesIssuesTable ) {
+ relativesIssuesTable = $("#relatives-issues-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aaSorting": [],
+ "aoColumns": [
+ {
+ "mDataProp": function( oObj ) {
+ var today = new Date();
+ var due = new Date( oObj.date_due );
+ if ( today > due ) {
+ return "" + oObj.date_due_formatted + "";
+ } else {
+ return oObj.date_due_formatted;
+ }
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ { "mDataProp": "itemtype" },
+ { "mDataProp": "issuedate" },
+ { "mDataProp": "branchname" },
+ { "mDataProp": "itemcallnumber" },
+ { "mDataProp": "charge" },
+ { "mDataProp": "price" },
+ {
+ "mDataProp": function( oObj ) {
+ return ""
+ + oObj.borrower.firstname + " " + oObj.borrower.surname + " (" + oObj.borrower.cardnumber + ")"
+ }
+ },
+ ],
+ "bPaginate": false,
+ "bProcessing": true,
+ "bServerSide": true,
+ "sAjaxSource": '/cgi-bin/koha/svc/checkouts.pl',
+ "fnServerData": function ( sSource, aoData, fnCallback ) {
+ $.each(relatives_borrowernumbers, function( index, value ) {
+ aoData.push( { "name": "borrowernumber", "value": value } );
+ });
+
+ $.getJSON( sSource, aoData, function (json) {
+ fnCallback(json)
+ } );
+ },
+ });
+ }
+ });
+
+ if ( $("#relatives-issues-table").length ) {
+ $("#relatives-issues-table_processing").position({
+ of: $( "#relatives-issues-table" ),
+ collision: "none"
+ });
+ }
+
+ if ( AllowRenewalLimitOverride ) {
+ $( '#override_limit' ).click( function () {
+ if ( this.checked ) {
+ $( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
+ } else {
+ $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
+ }
+ } ).attr( 'checked', false );
+ }
+ });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
new file mode 100644
index 0000000000..76dfee55fc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
@@ -0,0 +1,133 @@
+$(document).ready(function() {
+ // Don't load holds table unless it is clicked on
+ var holdsTable;
+ $("#holds-tab").click( function() {
+ if ( ! holdsTable ) {
+ holdsTable = $("#holds-table").dataTable({
+ "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+ "aoColumns": [
+ {
+ "mDataProp": "reservedate_formatted"
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ title = ""
+ + oObj.title;
+
+ $.each(oObj.subtitle, function( index, value ) {
+ title += " " + value.subfield;
+ });
+
+ title += "";
+
+ if ( oObj.author ) {
+ title += " " + BY + " " + oObj.author;
+ }
+
+ if ( oObj.itemnotes ) {
+ var span_class = "";
+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
+ span_class = "circ-hlt";
+ }
+ title += " - " + oObj.itemnotes + ""
+ }
+
+ title += " "
+ + ""
+ + oObj.barcode
+ + "";
+
+ return title;
+ }
+ },
+ {
+ "mDataProp": function( oObj ) {
+ return oObj.itemcallnumber || "";
+ }
+ },
+ {
+ "mDataProp": function( oObj ) {
+ var data = "";
+
+ if ( oObj.suspend == 1 ) {
+ data += "" + HOLD_IS + " " + SUSPENDED + " "; + if ( oObj.suspend_until ) { + data += " " + UNTIL + " " + oObj.suspend_until_formatted; + } + data += "
"; + } + + if ( oObj.barcode ) { + data += ""; + if ( oObj.found == "W" ) { + data += ITEM_IS + " " + WAITING + " "; + + if ( ! oObj.waiting_here ) { + data += " " + AT + " " + oObj.waiting_at; + } + } else if ( oObj.transferred ) { + data += ITEM_IS + " " + IN_TRANSIT + " " + FROM + oObj.from_branch; + } else if ( oObj.not_transferred ) { + data += NOT_TRANSFERRED_YET + " " + oObj.not_transferred_by; + } data += ""; + + data += " " + oObj.barcode + ""; + } + + return data; + } + }, + { "mDataProp": "expirationdate_formatted" }, + { + "mDataProp": function( oObj ) { + if ( oObj.priority && parseInt( oObj.priority ) && parseInt( oObj.priority ) > 0 ) { + return oObj.priority; + } else { + return ""; + } + } + }, + { + "mDataProp": function( oObj ) { + return "" + + "" + + "" + + ""; + } + } + ], + "bPaginate": false, + "bProcessing": true, + "bServerSide": true, + "sAjaxSource": '/cgi-bin/koha/svc/holds.pl', + "fnServerData": function ( sSource, aoData, fnCallback ) { + aoData.push( { "name": "borrowernumber", "value": borrowernumber } ); + + $.getJSON( sSource, aoData, function (json) { + fnCallback(json) + } ); + }, + }); + + if ( $("#holds-table").length ) { + $("#holds-table_processing").position({ + of: $( "#holds-table" ), + collision: "none" + }); + } + } + }); + +}); diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js index fe307bf22f..489403f10a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js @@ -1,57 +1,22 @@ $(document).ready(function() { + $("#CheckAllExports").on("click",function(){ + $(".export:visible").attr("checked", "checked" ); + return false; + }); + $("#UncheckAllExports").on("click",function(){ + $(".export:visible").removeAttr("checked"); + return false; + }); + $('#patronlists').tabs(); - var allcheckboxes = $(".checkboxed"); - $("#renew_all").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=items]"); - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); - }); - $("#CheckAllitems").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=items]"); - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false; - }); - $("#CheckNoitems").on("click",function(){ - allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false; - }); - $("#CheckAllreturns").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=barcodes]"); - allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false; - }); - $("#CheckNoreturns" ).on("click",function(){ - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false; - }); - $("#CheckAllexports").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=biblionumbers]"); - return false; - }); - $("#CheckNoexports").on("click",function(){ - allcheckboxes.unCheckCheckboxes(":input[name*=biblionumbers]"); - return false; - }); - - $("#relrenew_all").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=items]"); - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); - }); - $("#relCheckAllitems").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=items]"); - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false; - }); - $("#relCheckNoitems").on("click",function(){ - allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false; - }); - $("#relCheckAllreturns").on("click",function(){ - allcheckboxes.checkCheckboxes(":input[name*=barcodes]"); - allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false; - }); - $("#relCheckNoreturns").on("click",function(){ - allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false; - }); $("#messages ul").after(""+MSG_ADD_MESSAGE+""); + $("#borrower_messages .cancel").on("click",function(){ $("#add_message_form").hide(); $("#addmessage").show(); }); + $("#addmessage").on("click",function(){ $(this).hide(); $("#add_message_form").show(); @@ -76,14 +41,7 @@ $(document).ready(function() { export_checkouts(export_format); return false; }); - // Clicking the table cell checks the checkbox inside it - $("td").on("click",function(e){ - if(e.target.tagName.toLowerCase() == 'td'){ - $(this).find("input:checkbox:visible").each( function() { - $(this).click(); - }); - } - }); + }); function export_checkouts(format) { @@ -107,13 +65,9 @@ function export_checkouts(format) { } else if (format == 'iso2709') { $("#dont_export_item").val(1); } - document.issues.action="/cgi-bin/koha/tools/export.pl"; + document.getElementById("export_format").value = format; document.issues.submit(); - - /* Reset form action to its initial value */ - document.issues.action="/cgi-bin/koha/reserve/renewscript.pl"; - } function validate1(date) { @@ -124,10 +78,3 @@ function validate1(date) { return false; } } - -// prevent adjacent checkboxes from being checked simultaneously -function radioCheckBox(box){ - box.parents("td").siblings().find("input:checkbox.radio").each(function(){ - $(this).removeAttr("checked"); - }); - } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 5a768a6682..55d8a7852e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -39,12 +39,6 @@ Circulation: asc: earliest to latest desc: latest to earliest - due date. - - - - pref: UseTablesortForCirc - choices: - yes: "Enable" - no: "Don't enable" - - "the sorting of current patron checkouts on the circulation screen.NOTE: Enabling this function may slow down circulation time for patrons with many checkouts." - - pref: soundon choices: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 75e05b390d..9951030b3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -13,90 +13,46 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] -[% IF ( UseTablesortForCirc ) %] -[% INCLUDE 'datatables.inc' %][% END %] + + +[% INCLUDE 'datatables.inc' %] +[% INCLUDE 'strings.inc' %] [% INCLUDE 'timepicker.inc' %] + + + @@ -527,7 +483,7 @@ No patron matched [% message %] [% ELSE %] [% END %] - + [% IF ( SpecifyDueDate ) %]
Specify due date [% INCLUDE 'date-format.inc' %]:
@@ -539,7 +495,7 @@ No patron matched [% message %]
[% ELSE %]
[% END %]
-
+
-
-
- [% IF ( issuecount ) %] +
- + [% IF ( issuecount ) %] [% issuecount %] Checkout(s) - [% ELSE %] + [% ELSE %] 0 Checkouts - [% END %] -[% IF ( displayrelissues ) %] -
- Relatives' checkouts -[% END %] -
- [% IF ( countreserv ) %] - [% countreserv %] Hold(s) - [% ELSE %] - 0 Holds - [% END %] -
- [% debarments.size %] Restrictions + [% END %] + + [% IF relatives_issues_count %] +
- Relatives' checkouts + [% END %] + +
- + [% IF ( holds_count ) %] + [% holds_count %] Hold(s) + [% ELSE %] + 0 Holds + [% END %] + + +
- [% debarments.size %] Restrictions
-[% IF ( issuecount ) %]
-
-[% ELSE %]
-
+
+[% IF ( relatives_issues_count ) %]
+ Patron has nothing checked out.
+
+
+
+
+
[% END %]
-| Due date | +Title | +Item type | +Checked out on | +Checked out from | +Call no | +Charge | +Price | +Patron | +
|---|
-
-
-
-
-
-[% END %]
-
[% INCLUDE borrower_debarments.inc %]
| Due date | -Title | -Item type | -Checked out on | -Checked out from | -Call no | -Charge | -Price | -Patron | -||
|---|---|---|---|---|---|---|---|---|---|---|
| [% ELSE %] | [% END %] - [% relissue.dd %] | - - [% IF ( relissue.itemlost ) %] - [% AuthorisedValues.GetByCode( 'LOST', relissue.itemlost ) %] - [% END %] - [% IF ( relissue.damaged ) %] - [% AuthorisedValues.GetByCode( 'DAMAGED', relissue.damaged ) %] - [% END %] - -[% relissue.title |html %][% FOREACH subtitl IN relissue.subtitle %] [% subtitl.subfield %][% END %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %] | -[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %] |
- [% relissue.displaydate %] | -[% relissue.issuingbranchname %] | -[% relissue.itemcallnumber %] | -[% relissue.charge %] | -[% relissue.replacementprice %] | [% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %]) | -|
| Previous checkouts | ||||||||||
| Previous checkouts | ||||||||||
| [% ELSE %] | [% END %] - [% relprevissue.dd %] - | -[% relprevissue.title |html %][% FOREACH subtitl IN relprevissue.subtitle %] [% subtitl.subfield %][% END %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %] | -[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %] |
- [% relprevissue.displaydate %] | -[% relprevissue.issuingbranchname %] | -[% relprevissue.itemcallnumber %] | - [% IF ( relprevissue.multiple_borrowers ) %][% relprevissue.firstname %] [% relprevissue.surname %] | [% END %] -[% relprevissue.charge %] | -[% relprevissue.replacementprice %] | -[% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %]) | - -
-[% IF ( reservloop ) %]
+[% IF ( holds_count ) %]
[% IF SuspendHoldsIntranet %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 345c728d49..3c9b678f84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -9,13 +9,29 @@
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
-
+
[% INCLUDE 'datatables.inc' %]
-
+[% INCLUDE 'strings.inc' %]
+
[% INCLUDE 'timepicker.inc' %]
+
+
+