X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Ftools%2Finventory.tmpl;h=d521761a9f52ee9e35f50b9f183dcf1f13cef03a;hb=b35acf5c38370e15a2a7841d378c762da0f7991c;hp=2975b8bb1c7c1e4d5606d89f6bf092cf1e3bb23c;hpb=a60e54b64b7eb10774b19f598d7919c7acefd970;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 2975b8bb1c..d521761a9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -14,6 +14,16 @@ $(document).ready(function(){
 	        $(".checkboxed").unCheckCheckboxes();
 	        return false;
 	    });
+<!-- TMPL_IF NAME="offset" -->$("#markseen").before("<input type=\"submit\" value=\"&lt;&lt; Mark Seen and Continue\" id=\"markback\" />");<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="nextoffset" -->$("#markseen").after("<input type=\"submit\" id=\"marknext\" value=\"Mark Seen and Continue &gt;&gt;\" />");<!-- /TMPL_IF -->
+	$("#markback").click(function(){
+		$(".checkboxed").find("input").filter("[name=offset]").attr("value","<!-- TMPL_VAR NAME="prevoffset" -->");
+		return true;
+	});
+	$("#marknext").click(function(){
+		$(".checkboxed").find("input").filter("[name=offset]").attr("value","<!-- TMPL_VAR NAME="nextoffset" -->");
+		return true;
+	});
 	});
 //]]>
 </script>
@@ -30,38 +40,52 @@ $(document).ready(function(){
 	<div id="yui-main">
 	<div class="yui-b">
     <h1>Inventory/Stocktaking</h1>
+    <!--TMPL_IF Name="Number" --><div class="dialog message"><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></div><!-- /TMPL_IF-->
+    <!--TMPL_IF Name="errorfile" --><div class="dialog alert"><!--TMPL_VAR Name="errorfile"--> can't be opened</div><!-- /TMPL_IF-->
+    <!--TMPL_LOOP Name="errorloop"-->
+        <div class="dialog alert">
+            <!--TMPL_VAR Name="barcode"-->
+            <!--TMPL_IF Name="ERR_BARCODE"-->: barcode not found<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_WTHDRAWN"-->: item withdrawn<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_ONLOAN_RET"-->: item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"-->: item was on loan. couldn't be returned.<!--/TMPL_IF-->
+        </div>
+    <!-- /TMPL_LOOP-->
 	<!-- TMPL_UNLESS name="loop" -->
 	<div class="yui-g">
-	<div class="yui-u first">
-    <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
+    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
+        <fieldset class="rows">
+            <legend>Use a barcode file</legend>
+	 <ol>
+            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
+            <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="<!-- TMPL_VAR name="today" -->" />
+             <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" />
+            <script type="text/javascript">
+            Calendar.setup(
+            {
+            inputField : "setdate",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+            button : "setdate_button"
+            }
+            );
+            </script>
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
+            </li>
+          </ol>
+        </fieldset>
         <fieldset class="rows">
         <legend>Select items you want to check</legend>
         <ol><li>
-        <label for="branchloop">Branch</label><select id="branchloop" name="branchcode">
+        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
             <!-- TMPL_ELSE -->
-                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>
         </li>
-        <li>
-        <label for="itemtype">Item type</label>
-        <select name="itemtype" id="itemtype">
-            <option value="">Any</option>
-        <!-- TMPL_LOOP name="itemtypeloop" -->
-            <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-        </li>
-        <li>
-            <label for="minlocation">Item location between: </label> 
-                <input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> (items.itemcallnumber)  </li>
-           <li><label for="maxlocation">...and: </label> 
-                <input type="text" name="maxlocation" id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
-        </li>
         <!-- TMPL_IF NAME="authorised_values" -->
         <li>
             <label for="locationloop">Item Location (items.location) is</label> 
@@ -69,14 +93,49 @@ $(document).ready(function(){
                 <option value="">Filter location</option>
         <!-- TMPL_LOOP NAME="authorised_values" -->
             <!-- TMPL_IF name="selected" -->
-                <option value="<!-- TMPL_VAR NAME='authorised_value' -->" selected="selected"><!-- TMPL_VAR NAME='lib' --></option>
+                <option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option>
             <!-- TMPL_ELSE -->
-                <option value="<!-- TMPL_VAR NAME='authorised_value' -->"><!-- TMPL_VAR NAME='lib' --></option>
+                <option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>        </li>
         <!-- /TMPL_IF -->
-        <li><label for="datelastseen">Not seen since:</label>
+        <li>
+            <label for="minlocation">Item callnumber between: </label>
+                <input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> (items.itemcallnumber)  </li>
+           <li><label for="maxlocation">...and: </label>
+                <input type="text" name="maxlocation" id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+        </li>
+        <!-- TMPL_IF name="statuses" -->
+	</ol>
+	</fieldset>
+            <fieldset class="rows">
+            <legend>Item statuses:</legend>
+            <div name="statuses" style="display: block;">
+                  <!-- TMPL_LOOP name="statuses" -->
+                      <!-- TMPL_IF name="values" -->
+                          <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
+                              <legend><!-- TMPL_VAR name="fieldname" --></legend>
+                              <ul id="statuses-<!-- TMPL_VAR name="fieldname" -->" style="display: inline;">
+                              <!-- TMPL_LOOP name="values" -->
+                                  <!-- TMPL_IF NAME="lib" --><li>
+                                    <label for="<!-- TMPL_VAR name="id" -->">
+                                      <!-- TMPL_VAR name="lib" -->
+                                    </label>
+                                    <input type="checkbox" name="status-<!-- TMPL_VAR name="fieldname" -->-<!-- TMPL_VAR name="id" -->" id="<!-- TMPL_VAR name="id" -->" />
+                                  </li><!-- /TMPL_IF -->
+                              <!-- /TMPL_LOOP -->
+                              </ul>
+                          </fieldset>
+                      <!-- /TMPL_IF -->
+                  <!-- /TMPL_LOOP -->
+                </div>
+            </fieldset>
+		<fieldset class="rows">
+          <ol>
+        <!-- /TMPL_IF -->
+
+        <li><label for="datelastseen">Inventory date:</label>
             <input type="text" id="datelastseen" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
             <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" />
             <script type="text/javascript">
@@ -88,53 +147,35 @@ $(document).ready(function(){
             }
             );
             </script>
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
         </li>
+        <li><label for="ignoreissued">Skip copies on loan: </label>
+            <!-- TMPL_IF NAME="ignoreissued" -->
+            <input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
+            <!-- TMPL_ELSE -->
+            <input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
+            <!-- /TMPL_IF -->
         <li><label for="pagesize">Show: </label>
             <input type="text" id="pagesize" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5" /> items</li>
           <li><label for="offset">Beginning at offset: </label>
             <input type="text" id="offset" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5" />
-        </li></ol>
+        </li>
+        <li>
+           <label for="CSVexport">Export to csv file</label>
+           <input type="checkbox" name="CSVexport" id="CSVexport" />
+        </li>
+        <li>
+            <label for="compareinv2barcd">Compare barcodes list to results</label>
+            <input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" />
+        </li>
+        </ol>
   </fieldset>
             <input type="hidden" name="op" value="do_it" />
             <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
     </form>
 	</div>
-	
-	<div class="yui-u">
-    <form name="barcodefile" method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
-        <fieldset class="rows">
-            <legend>Use a barcode file</legend>
-			<ol>
-            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
-            <li><label for="setdate">Set date last seen to:</label> <input type="text" id="setdate" name="setdate" />
-             <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" />
-            <script type="text/javascript">
-            Calendar.setup(
-            {
-            inputField : "setdate",
-            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-            button : "setdate_button"
-            }
-            );
-            </script>
-</li></ol>
-        </fieldset>
-            <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
-    </form>
-	</div>
 	</div>
 	<!--/TMPL_UNLESS-->
-    <!--TMPL_IF Name="Number" --><div class="dialog message"><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></div><!-- /TMPL_IF-->
-    <!--TMPL_IF Name="errorfile" --><div class="dialog alert"><!--TMPL_VAR Name="errorfile"--> can't be opened</div><!-- /TMPL_IF-->
-    <!--TMPL_LOOP Name="errorloop"-->
-        <div class="dialog alert">
-            <!--TMPL_VAR Name="barcode"-->
-            <!--TMPL_IF Name="ERR_BARCODE"-->: barcode not found<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_WTHDRAWN"-->: item withdrawn<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_ONLOAN_RET"-->: item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"-->: item was on loan. couldn't be returned.<!--/TMPL_IF-->
-        </div>
-    <!-- /TMPL_LOOP-->
     <!-- TMPL_IF NAME="loop" -->
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
     <input type="hidden" name="markseen" value="1" />
@@ -152,6 +193,7 @@ $(document).ready(function(){
             <th>Barcode</th>
             <th>Title</th>
             <th>Unseen since</th>
+            <th>Problems</th>
         </tr>
     <!-- TMPL_LOOP NAME="loop" -->
         <tr>
@@ -162,17 +204,26 @@ $(document).ready(function(){
                 <!-- TMPL_VAR NAME="barcode" -->
             </td>
             <td>
-                <p><b><!-- TMPL_VAR NAME="itemcallnumber" --></b> - <a href=# onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->','Catalogue -- Biblio <!--TMPL_VAR Name="biblionumber"-->','width=800,height=600,toolbar=false');"><!-- TMPL_VAR NAME="title" --></a></p>
+                <p><b><!-- TMPL_VAR NAME="itemcallnumber" --></b> - <a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->','marcview','width=800,height=600,toolbar=0,scrollbars=1');"><!-- TMPL_VAR NAME="title" escape="html" --></a></p>
                 <p><!-- TMPL_VAR NAME="author" --></p>
             </td>
             <td>
                 <p><!-- TMPL_VAR name="datelastseen" --></p>
             </td>
+            <td>
+                 <!-- TMPL_IF name="notfoundbarcode" -->
+                     <p style="background: red;">Not found among barcodes in barcodes file.</p>
+                 <!-- TMPL_ELSIF name="notfoundkoha" -->
+                     <p style="background: red;">Not found in koha.</p>
+                 <!-- TMPL_ELSE -->
+                     <p style="background: green;">None</p>
+                 <!-- /TMPL_IF -->
+            </td>
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
 	<div style="padding : .3em 0"><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
-    <input type="submit" value="Mark seen" />
+     <input type="submit" id="markseen" value="Mark seen" />
     </form>
     <!-- TMPL_IF NAME="offset" -->
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
@@ -199,12 +250,11 @@ $(document).ready(function(){
         <input type="hidden" name="op" value="do_it" />
         <input type="submit" value="Continue without Marking &gt;&gt;" class="submit" />
     </form>
+    </div>
     <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-
-</div>
 </div>
-<div class="yui-b noprint">
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
 </div>
 </div>