From c60fecc92f003bac0b7d6f0a087ed9fc947173f3 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Fri, 23 Jan 2015 06:44:44 +1300
Subject: [PATCH] Reverting back to 'v3.16.06' tag, 1c30985

---
 .../prog/en/css/staff-global.css              |  6 --
 .../intranet-tmpl/prog/en/js/checkouts.js     | 71 +++++--------------
 koha-tmpl/intranet-tmpl/prog/en/js/holds.js   |  2 +-
 .../prog/en/modules/circ/circulation.tt       |  1 -
 svc/checkouts                                 | 31 +++-----
 5 files changed, 28 insertions(+), 83 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 5b091c742f..f7678f0804 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -283,12 +283,6 @@ tr.warn td {
 	background-color: #FF9090;
 }
 
-tr.ok td,
-tr.ok:nth-child(odd) td,
-tr.ok:nth-child(even) td {
- background-color: #FFFFCC;
-}
-
 tr.onissue td {
 	background-color: #FFFFCC;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
index 9c5e4b699e..1755d6cdf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
@@ -63,11 +63,8 @@ $(document).ready(function() {
                 content = "";
                 if ( data.returned ) {
                     content = CIRCULATION_RETURNED;
-                    $(id).parent().parent().addClass('ok');
-                    $('#date_due_' + data.itemnumber).html(_("Returned"));
                 } else {
                     content = CIRCULATION_NOT_RETURNED;
-                    $(id).parent().parent().addClass('warn');
                 }
 
                 $(id).replaceWith( content );
@@ -95,7 +92,6 @@ $(document).ready(function() {
                 var content = "";
                 if ( data.renew_okay ) {
                     content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
-                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
                 } else {
                     content = CIRCULATION_RENEW_FAILED + " ";
                     if ( data.error == "no_checkout" ) {
@@ -115,11 +111,6 @@ $(document).ready(function() {
             }, "json")
         });
 
-        // Refocus on barcode field if it exists
-        if ( $("#barcode").length ) {
-            $("#barcode").focus();
-        }
-
         // Prevent form submit
         return false;
     });
@@ -139,17 +130,17 @@ $(document).ready(function() {
     var drawn = 0;
     issuesTable = $("#issues-table").dataTable({
         "oLanguage": {
-            "sProcessing": MSG_DT_LOADING_RECORDS,
+            "sEmptyTable" : MSG_DT_LOADING_RECORDS,
         },
         "bAutoWidth": false,
-        "sDom": "rt",
+        "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
         "aoColumns": [
             {
                 "mDataProp": function( oObj ) {
                     if ( oObj.issued_today ) {
-                        return "1" + oObj.timestamp;
+                        return "0";
                     } else {
-                        return "0" + oObj.date_due;
+                        return "100";
                     }
                 }
             },
@@ -169,23 +160,10 @@ $(document).ready(function() {
             {
                 "iDataSort": 1, // Sort on hidden unformatted date due column
                 "mDataProp": function( oObj ) {
-                        var due = oObj.date_due_formatted;
-
-                        if ( oObj.date_due_overdue ) {
-                            due = "<span class='overdue'>" + due + "</span>";
-                        }
-
-                        if ( oObj.lost ) {
-                            due += "<span class='lost'>" + oObj.lost + "</span>";
-                         }
-
-                        if ( oObj.damaged ) {
-                            due += "<span class='dmg'>" + oObj.damaged + "</span>";
-                        }
-
-                        due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";
-
-                        return due;
+                    if ( oObj.date_due_overdue ) {
+                        return "<span class='overdue'>" + oObj.date_due_formatted + "</span>";
+                    } else {
+                        return oObj.date_due_formatted;
                     }
                 }
             },
@@ -228,7 +206,7 @@ $(document).ready(function() {
                     return title;
                 }
             },
-            { "mDataProp": "itemtype_description" },
+            { "mDataProp": "itemtype" },
             { "mDataProp": "issuedate_formatted" },
             { "mDataProp": "branchname" },
             { "mDataProp": "itemcallnumber" },
@@ -257,7 +235,7 @@ $(document).ready(function() {
                     if ( oObj.can_renew ) {
                         // Do nothing
                     } else if ( oObj.can_renew_error == "on_reserve" ) {
-                        content += "<span class='renewals-disabled-no-override'>"
+                        content += "<span class='renewals-disabled'>"
                                 + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
                                 + "</span>";
 
@@ -290,28 +268,17 @@ $(document).ready(function() {
                             +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
                             +  "</span>";
 
-                        var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" );
-                        var can_renew = ( oObj.renewals_remaining > 0  && !oObj.can_renew_error );
-                        if ( oObj.onsite_checkout == 0 ) {
-                            if ( can_renew || can_force_renew ) {
-                                content += "<span class='" + span_class + "' style='" + span_style + "'>"
-                                        +  "<input type='checkbox' ";
-                                if ( oObj.date_due_overdue && can_renew ) {
-                                    content += "checked='checked' ";
-                                }
-                                content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
-                                        +  "</span>";
+                    if ( oObj.renewals_remaining ) {
+                        content += "<span class='renewals'>("
+                                + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
+                                + ")</span>";
+                    }
 
-                                content += "<span class='renewals'>("
-                                        + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
-                                        + ")</span>";
-                            }
-                        }
+                    content += "</span>";
 
-                        content += "</span>";
 
-                        return content;
-                    }
+                    return content;
+                }
             },
             {
                 "bSortable": false,
@@ -388,7 +355,7 @@ $(document).ready(function() {
         if ( ! relativesIssuesTable ) {
             relativesIssuesTable = $("#relatives-issues-table").dataTable({
                 "bAutoWidth": false,
-                "sDom": "rt",
+                "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
                 "aaSorting": [],
                 "aoColumns": [
                     {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
index 253f3396f6..73807ea9d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
         if ( ! holdsTable ) {
             holdsTable = $("#holds-table").dataTable({
                 "bAutoWidth": false,
-                "sDom": "rt",
+                "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
                 "aoColumns": [
                     {
                         "mDataProp": "reservedate_formatted"
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 b2529850f4..c3b1875053 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -27,7 +27,6 @@
 <script type="text/javascript">
 //<![CDATA[
 /* Set some variable needed in circulation.js */
-var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
 var interface = "[% interface %]";
 var theme = "[% theme %]";
 var borrowernumber = "[% borrowernumber %]";
diff --git a/svc/checkouts b/svc/checkouts
index 540056bac6..f56bdffb83 100755
--- a/svc/checkouts
+++ b/svc/checkouts
@@ -25,8 +25,8 @@ use JSON qw(to_json);
 
 use C4::Auth qw(check_cookie_auth);
 use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
-use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
-use C4::Koha qw(GetAuthorisedValueByCode);
+use C4::Circulation
+  qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
 use C4::Context;
 
 use Koha::DateUtils;
@@ -46,12 +46,9 @@ my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;
 my @borrowernumber   = $input->param('borrowernumber');
 my $offset           = $input->param('iDisplayStart');
 my $results_per_page = $input->param('iDisplayLength') || -1;
-
-my $sorting_column = $input->param('iSortCol_0') || q{};
-$sorting_column = ( $sorting_column && $sort_columns[$sorting_column] ) ? $sort_columns[$sorting_column] : 'issuedate';
-
-my $sorting_direction = $input->param('sSortDir_0') || q{};
-$sorting_direction = $sorting_direction eq 'asc' ? 'asc' : 'desc';
+my $sorting_column   = $sort_columns[ $input->param('iSortCol_0') ]
+  || 'issuedate';
+my $sorting_direction = $input->param('sSortDir_0') eq 'asc' ? 'asc' : 'desc';
 
 $results_per_page = undef if ( $results_per_page == -1 );
 
@@ -64,7 +61,6 @@ my $sql = '
         issuedate,
         date_due,
         date_due < now() as date_due_overdue,
-        issues.timestamp,
 
         biblionumber,
         biblio.title,
@@ -79,19 +75,14 @@ my $sql = '
         issues.branchcode,
         branchname,
 
-        items.itype,
-        itemtype_item.description AS itype_description,
-        biblioitems.itemtype,
-        itemtype_bib.description AS itemtype_description,
+        itype,
+        itemtype,
 
         borrowernumber,
         surname,
         firstname,
         cardnumber,
 
-        itemlost,
-        damaged,
-
         DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
     FROM issues
         LEFT JOIN items USING ( itemnumber )
@@ -99,8 +90,6 @@ my $sql = '
         LEFT JOIN biblioitems USING ( biblionumber )
         LEFT JOIN borrowers USING ( borrowernumber )
         LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
-        LEFT JOIN itemtypes itemtype_bib ON ( biblioitems.itemtype = itemtype_bib.itemtype )
-        LEFT JOIN itemtypes itemtype_item ON ( items.itype = itemtype_item.itemtype )
     WHERE borrowernumber
 ';
 
@@ -128,7 +117,7 @@ while ( my $c = $sth->fetchrow_hashref() ) {
     my ( $can_renew, $can_renew_error ) =
       CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
     my $can_renew_date =
-      $can_renew_error && $can_renew_error eq 'too_soon'
+      $can_renew_error eq 'too_soon'
       ? output_pref(
         {
             dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
@@ -146,7 +135,6 @@ while ( my $c = $sth->fetchrow_hashref() ) {
         author     => $c->{author},
         barcode    => $c->{barcode},
         itemtype   => $item_level_itypes ? $c->{itype} : $c->{itemtype},
-        itemtype_description => $item_level_itypes ? $c->{itype_description} : $c->{itemtype_description},
         itemnotes  => $c->{itemnotes},
         branchcode => $c->{branchcode},
         branchname => $c->{branchname},
@@ -162,7 +150,6 @@ while ( my $c = $sth->fetchrow_hashref() ) {
         issuedate           => $c->{issuedate},
         date_due            => $c->{date_due},
         date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
-        timestamp           => $c->{timestamp},
         renewals_count      => $renewals_count,
         renewals_allowed    => $renewals_allowed,
         renewals_remaining  => $renewals_remaining,
@@ -183,8 +170,6 @@ while ( my $c = $sth->fetchrow_hashref() ) {
             GetMarcBiblio( $c->{biblionumber} ),
             GetFrameworkCode( $c->{biblionumber} )
         ),
-        lost => $c->{itemlost} ? GetAuthorisedValueByCode( 'LOST', $c->{itemlost} ) : undef,
-        damaged => $c->{damaged} ? GetAuthorisedValueByCode( 'DAMAGED', $c->{damaged} ) : undef,
         borrower => {
             surname    => $c->{surname},
             firstname  => $c->{firstname},
-- 
2.39.5