projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 16145: Regression: Bug 15632 broke display of library name on circulation messages
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / reserveratios.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index dcc9d50..b92ca70 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -1,3 +1,7 @@
+[% USE KohaDates %]
+[% USE AuthorisedValues %]
+[% USE Branches %]
+[% USE ItemTypes %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Circulation &rsaquo; Hold ratios</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -15,21 +19,10 @@
             function () { $(this).toggleClass("ulined") }
         );
         $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
-            "aaSorting": [ [0,'desc'], [3,'asc'] ],
+            "aaSorting": [ [2,'desc'], [3,'asc'] ],
             "aoColumnDefs": [
-                { "aTargets": [ 8 ], "sType": "natural" },
-                { "aTargets": [ 3 ], "sType": "anti-the" }
-            ],
-            "aoColumns": [
-                null,
-                null,
-                null,
-                { "sType": "anti-the" },
-                null,
-                null,
-                null,
-                null,
-                null
+                { "aTargets": [ 0,1,2,8 ], "sType": "natural" },
+                { "aTargets": [ 3 ], "sType": "anti-the" },
             ],
             "sPaginationType": "four_button"
         }));
@@ -40,6 +33,7 @@
     .sql { display: none; }
     .ulined { text-decoration: underline; }
     .ratiolimit { color: blue; cursor: pointer; }
+    #holdst ul li {  list-style: outside url("[% interface %]/[% theme %]/img/item-bullet.gif") disc; }
 </style>
 </head>
 <body id="circ_reserveratios" class="circ">
@@ -53,8 +47,8 @@
     <div id="yui-main">
     <div class="yui-b">
 <h1>Hold ratios to calculate items needed</h1>
-   <h3>Calculated on [% todaysdate %]. From [% from %]
-    to [% to %]</h3>
+   <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
+    to [% to | $KohaDates %]</h3>
 <p>These items have a hold ratio &ge; [% ratio %].</p>
 <div class="sql">[% sql %]</div>
 
@@ -66,6 +60,7 @@
           <th>Items</th>
           <th>Hold ratio</th>
           <th>Title</th>
+          <th>Home libraries</th>
           <th>Holding libraries</th>
           <th>Location</th>
           <th>Itype</th>
@@ -81,10 +76,41 @@
             <td><p class="ratiolimit">[% reserveloo.thisratio %]</p></td>
             <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %]
             </td>
-            <td><p>[% reserveloo.listbranch %]</p></td>
-            <td><p>[% reserveloo.location %]</p></td>
-            <td><p>[% reserveloo.itype %]</p></td>
-            <td><p>[% reserveloo.listcall %]</p></td>
+            <td>
+                  <ul>
+                      [% FOREACH homebranch IN reserveloo.homebranch_list %]
+                          <li>[% Branches.GetName ( homebranch ) %]</li>
+                      [% END %]
+                  </ul>
+            </td>
+            <td>
+                  <ul>
+                      [% FOREACH holdingbranch IN reserveloo.holdingbranch_list %]
+                          <li>[% Branches.GetName ( holdingbranch ) %]</li>
+                      [% END %]
+                  </ul>
+            </td>
+            <td>
+                  <ul>
+                      [% FOREACH location IN reserveloo.location %]
+                          <li>[% AuthorisedValues.GetByCode( 'LOC', location )%]</li>
+                      [% END %]
+                  </ul>
+            </td>
+            <td>
+                  <ul>
+                      [% FOREACH itype IN reserveloo.itype %]
+                          <li>[% ItemTypes.GetDescription( itype ) %]</li>
+                      [% END %]
+                  </ul>
+            </td>
+            <td>
+                  <ul>
+                      [% FOREACH listcall IN reserveloo.listcall %]
+                          <li>[% listcall %]</li>
+                      [% END %]
+                  </ul>
+            </td>
             <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc %]">[% END %]<b>[% reserveloo.ratiocalc %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
             [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders %] pending</b>[% END %]</p>[% END %]</td>
         </tr>
@@ -100,20 +126,31 @@
 <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
 <fieldset class="brief">
 <h4>Refine results:</h4>
-<ol><li><label for="ratio">
-    Hold ratio:
-</label>
-<input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" /></li>
-<li><label for="from">
-    Start date:
-</label>
-<input type="text" size="10" id="from" name="from" value="[% from %]" class="datepickerfrom" />
-</li>
-<li><label for="to">
-    End date:
-</label>
-<input size="10" id="to" name="to" value="[% to %]" type="text" class="datepickerto" />
-</li></ol>
+<ol>
+    <li>
+        <label for="ratio">Hold ratio:</label>
+        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" />
+    <li>
+
+    <li>
+        <label for="include_ordered">Included ordered:</label>
+        [% IF include_ordered %]
+            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
+        [% ELSE %]
+            <input id="include_ordered" name="include_ordered" type="checkbox"/>
+        [% END %]
+    <li>
+
+    <li>
+        <label for="from">Start date:</label>
+        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="datepickerfrom" />
+    </li>
+
+    <li>
+        <label for="to">End date:</label>
+        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="datepickerto" />
+    </li>
+</ol>
 (inclusive)
 
 <fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git