View | Details | Raw Unified | Return to bug 11425
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc (-1 / +1 lines)
Lines 19-23 Link Here
19
  <td>[% item.stocknumber %]</td>
19
  <td>[% item.stocknumber %]</td>
20
  <td>[% item.status %]</td>
20
  <td>[% item.status %]</td>
21
  <td>[% item.issues || 0 %]</td>
21
  <td>[% item.issues || 0 %]</td>
22
  <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">Edit</a></td>
22
  <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% item.biblionumber %]&amp;itemnumber=[% item.itemnumber %]">Edit</a></td>
23
</tr>
23
</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc (-6 / +6 lines)
Lines 26-43 Link Here
26
<table>
26
<table>
27
  <thead>
27
  <thead>
28
    <tr>
28
    <tr>
29
      [% INCLUDE itemsearch_header name='title' label='title' text='Bibliographic reference' %]
29
      [% INCLUDE itemsearch_header name='title' label='title' text='Title' %]
30
      [% INCLUDE itemsearch_header name='publicationyear' label='publication date' text='Publication date' %]
30
      [% INCLUDE itemsearch_header name='publicationyear' label='publication date' text='Publication date' %]
31
      [% INCLUDE itemsearch_header name='publishercode' label='publisher' text='Publisher' %]
31
      [% INCLUDE itemsearch_header name='publishercode' label='publisher' text='Publisher' %]
32
      [% INCLUDE itemsearch_header name='collectiontitle' label='collection' text='Collection' %]
32
      [% INCLUDE itemsearch_header name='collectiontitle' label='collection' text='Collection' %]
33
      [% INCLUDE itemsearch_header name='barcode' label='barcode' text='Barcode' %]
33
      [% INCLUDE itemsearch_header name='barcode' label='barcode' text='Barcode' %]
34
      [% INCLUDE itemsearch_header name='itemcallnumber' label='callnumber' text='Callnumber' %]
34
      [% INCLUDE itemsearch_header name='itemcallnumber' label='callnumber' text='Call number' %]
35
      [% INCLUDE itemsearch_header name='homebranch' label='home branch' text='Home branch' %]
35
      [% INCLUDE itemsearch_header name='homebranch' label='home branch' text='Home library' %]
36
      [% INCLUDE itemsearch_header name='holdingbranch' label='holding branch' text='Holding branch' %]
36
      [% INCLUDE itemsearch_header name='holdingbranch' label='holding branch' text='Current location' %]
37
      [% INCLUDE itemsearch_header name='location' label='location' text='Location' %]
37
      [% INCLUDE itemsearch_header name='location' label='location' text='Shelving location' %]
38
      [% INCLUDE itemsearch_header name='stocknumber' label='stock number' text='Stock number' %]
38
      [% INCLUDE itemsearch_header name='stocknumber' label='stock number' text='Stock number' %]
39
      [% INCLUDE itemsearch_header name='notforloan' label='status' text='Status' %]
39
      [% INCLUDE itemsearch_header name='notforloan' label='status' text='Status' %]
40
      [% INCLUDE itemsearch_header name='issues' label='issues' text='Issues' %]
40
      [% INCLUDE itemsearch_header name='issues' label='issues' text='Checkouts' %]
41
      <th></th>
41
      <th></th>
42
    </tr>
42
    </tr>
43
  </thead>
43
  </thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
Bibliographic reference, Publication Date, Publisher, Collection, Barcode, Callnumber, Home branch, Holding branch, Location, Stock number, Status, Issues
1
Title, Publication Date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Stock number, Status, Checkouts
2
[% FOREACH item IN results -%]
2
[% FOREACH item IN results -%]
3
  [%- INCLUDE 'catalogue/itemsearch_item.csv.inc' item = item -%]
3
  [%- INCLUDE 'catalogue/itemsearch_item.csv.inc' item = item -%]
4
[%- END -%]
4
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-37 / +38 lines)
Lines 59-65 Link Here
59
    [% END %]
59
    [% END %]
60
    <select name="f" class="form-field-column">
60
    <select name="f" class="form-field-column">
61
      [% INCLUDE form_field_select_option value='barcode' label='Barcode' %]
61
      [% INCLUDE form_field_select_option value='barcode' label='Barcode' %]
62
      [% INCLUDE form_field_select_option value='itemcallnumber' label='Callnumber' %]
62
      [% INCLUDE form_field_select_option value='itemcallnumber' label='Call number' %]
63
      [% INCLUDE form_field_select_option value='stocknumber' label='Stock number' %]
63
      [% INCLUDE form_field_select_option value='stocknumber' label='Stock number' %]
64
      [% INCLUDE form_field_select_option value='title' label='Title' %]
64
      [% INCLUDE form_field_select_option value='title' label='Title' %]
65
      [% INCLUDE form_field_select_option value='author' label='Author' %]
65
      [% INCLUDE form_field_select_option value='author' label='Author' %]
Lines 117-125 Link Here
117
117
118
[% BLOCK form_field_radio_yes_no %]
118
[% BLOCK form_field_radio_yes_no %]
119
  <div class="form-field">
119
  <div class="form-field">
120
    <label class="form-field-label" for="[% name %]">[% label %]:</label>
120
    <label class="form-field-label">[% label %]:</label>
121
    <input type="radio" name="[% name %]" id="[% name %]_indifferent" value="" checked="checked"/>
121
    <input type="radio" name="[% name %]" id="[% name %]_indifferent" value="" checked="checked"/>
122
    <label for="[% name %]_indifferent">Indifferent</label>
122
    <label for="[% name %]_indifferent">Ignore</label>
123
    <input type="radio" name="[% name %]" id="[% name %]_yes" value="yes" />
123
    <input type="radio" name="[% name %]" id="[% name %]_yes" value="yes" />
124
    <label for="[% name %]_yes">Yes</label>
124
    <label for="[% name %]_yes">Yes</label>
125
    <input type="radio" name="[% name %]" id="[% name %]_no" value="no" />
125
    <input type="radio" name="[% name %]" id="[% name %]_no" value="no" />
Lines 130-140 Link Here
130
[%# Page starts here %]
130
[%# Page starts here %]
131
131
132
[% INCLUDE 'doc-head-open.inc' %]
132
[% INCLUDE 'doc-head-open.inc' %]
133
  <title>Koha &rsaquo; Catalog &rsaquo; Advanced search</title>
133
  <title>Koha &rsaquo; Catalog &rsaquo; Item search</title>
134
  [% INCLUDE 'doc-head-close.inc' %]
134
  [% INCLUDE 'doc-head-close.inc' %]
135
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
135
  [% INCLUDE 'datatables.inc' %]
136
  [% INCLUDE 'datatables.inc' %]
136
  <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
137
  <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
137
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
138
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/itemsearchform.css" />
138
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/itemsearchform.css" />
139
  <script type="text/javascript">
139
  <script type="text/javascript">
140
    //<![CDATA[
140
    //<![CDATA[
Lines 178-195 Link Here
178
    function submitForm($form) {
178
    function submitForm($form) {
179
      var tr = ''
179
      var tr = ''
180
        + '    <tr>'
180
        + '    <tr>'
181
        + '      <th>' + _("Bibliographic reference") + '</th>'
181
        + '      <th>' + _("Title") + '</th>'
182
        + '      <th>' + _("Publication date") + '</th>'
182
        + '      <th>' + _("Publication date") + '</th>'
183
        + '      <th>' + _("Publisher") + '</th>'
183
        + '      <th>' + _("Publisher") + '</th>'
184
        + '      <th>' + _("Collection") + '</th>'
184
        + '      <th>' + _("Collection") + '</th>'
185
        + '      <th>' + _("Barcode") + '</th>'
185
        + '      <th>' + _("Barcode") + '</th>'
186
        + '      <th>' + _("Callnumber") + '</th>'
186
        + '      <th>' + _("Call number") + '</th>'
187
        + '      <th>' + _("Home branch") + '</th>'
187
        + '      <th>' + _("Home library") + '</th>'
188
        + '      <th>' + _("Holding branch") + '</th>'
188
        + '      <th>' + _("Current location") + '</th>'
189
        + '      <th>' + _("Location") + '</th>'
189
        + '      <th>' + _("Shelving location") + '</th>'
190
        + '      <th>' + _("Stock number") + '</th>'
190
        + '      <th>' + _("Stock number") + '</th>'
191
        + '      <th>' + _("Status") + '</th>'
191
        + '      <th>' + _("Status") + '</th>'
192
        + '      <th>' + _("Issues") + '</th>'
192
        + '      <th>' + _("Checkouts") + '</th>'
193
        + '      <th></th>'
193
        + '      <th></th>'
194
        + '    </tr>'
194
        + '    </tr>'
195
      var table = ''
195
      var table = ''
Lines 197-203 Link Here
197
        + '  <thead>' + tr + tr + '</thead>'
197
        + '  <thead>' + tr + tr + '</thead>'
198
        + '  <tbody></tbody>'
198
        + '  <tbody></tbody>'
199
        + '</table>';
199
        + '</table>';
200
      $('#results-wrapper').empty().html(table);
200
      var results_heading = "<h1>" + _("Item search results") + "</h1>";
201
      results_heading += "<p><a href=\"/cgi-bin/koha/catalogue/search.pl\">" + _("Go to advanced search") + "</a></p>";
202
      results_heading += "<p><a class=\"editsearchlink\" href=\"#\">" + _("Edit search") + "</a></p>";
203
      $('#results-wrapper').empty().html(results_heading + table);
201
204
202
      var params = [];
205
      var params = [];
203
      $form.find('select,input[type="text"],input[type="hidden"]').not('[disabled]').each(function () {
206
      $form.find('select,input[type="text"],input[type="hidden"]').not('[disabled]').each(function () {
Lines 254-262 Link Here
254
      });
257
      });
255
    }
258
    }
256
259
257
    function hideForm($form) {
260
    function hideForm() {
258
      $form.hide();
261
      $("#item-search-block").hide();
259
      $('#editsearchlink').show();
262
      $('.editsearchlink').show();
260
    }
263
    }
261
264
262
    $(document).ready(function () {
265
    $(document).ready(function () {
Lines 289-304 Link Here
289
      });
292
      });
290
293
291
      $('#itemsearchform').submit(function() {
294
      $('#itemsearchform').submit(function() {
292
        var format = $(this).find('input[name="format"]:checked').val();
295
        var searchform = $(this);
296
        var format = searchform.find('input[name="format"]:checked').val();
293
        if (format == 'html') {
297
        if (format == 'html') {
294
          submitForm($(this));
298
          submitForm(searchform);
295
          hideForm($(this));
299
          hideForm();
296
          return false;
300
          return false;
297
        }
301
        }
298
      });
302
      });
299
303
300
      $('#editsearchlink').click(function() {
304
      $("body").on("click",".editsearchlink",function(e) {
301
        $('#itemsearchform').show();
305
        e.preventDefault();
306
        $('#item-search-block').show();
302
        $(this).hide();
307
        $(this).hide();
303
        return false;
308
        return false;
304
      });
309
      });
Lines 309-334 Link Here
309
<body id="catalog_itemsearch" class="catalog">
314
<body id="catalog_itemsearch" class="catalog">
310
  [% INCLUDE 'header.inc' %]
315
  [% INCLUDE 'header.inc' %]
311
  <div id="breadcrumbs">
316
  <div id="breadcrumbs">
312
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Item search
317
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Item search
313
  </div>
318
  </div>
314
319
315
  <div id="doc" class="yui-t7">
320
  <div id="doc" class="yui-t7">
316
    <div id="bd">
321
    <div id="item-search-block">
317
      <h1>Item search</h1>
322
      <h1>Item search</h1>
318
      <a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a>
323
      <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
319
      <form action="" method="get" id="itemsearchform">
324
      <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
320
        <fieldset>
321
          <legend>Item search</legend>
322
          <fieldset>
325
          <fieldset>
323
            [% INCLUDE form_field_select
326
            [% INCLUDE form_field_select
324
              name="homebranch"
327
              name="homebranch"
325
              label="Home branch"
328
              label="Home library"
326
              options = branches
329
              options = branches
327
              empty_option = "All branches"
330
              empty_option = "All libraries"
328
            %]
331
            %]
329
            [% INCLUDE form_field_select
332
            [% INCLUDE form_field_select
330
              name="location"
333
              name="location"
331
              label="Location"
334
              label="Shelving location"
332
              options = locations
335
              options = locations
333
              empty_option = "All locations"
336
              empty_option = "All locations"
334
            %]
337
            %]
Lines 375-381 Link Here
375
            [% INCLUDE form_field_radio_yes_no name="damaged" label="Damaged" %]
378
            [% INCLUDE form_field_radio_yes_no name="damaged" label="Damaged" %]
376
            [% INCLUDE form_field_radio_yes_no name="itemlost" label="Lost" %]
379
            [% INCLUDE form_field_radio_yes_no name="itemlost" label="Lost" %]
377
            <div class="form-field">
380
            <div class="form-field">
378
              <label class="form-field-label" for="issues">Issues count:</label>
381
              <label class="form-field-label" for="issues_op">Checkout count:</label>
379
              <select id="issues_op" name="issues_op">
382
              <select id="issues_op" name="issues_op">
380
                <option value=">">&gt;</option>
383
                <option value=">">&gt;</option>
381
                <option value="<">&lt;</option>
384
                <option value="<">&lt;</option>
Lines 385-398 Link Here
385
              <input type="text" name="issues" />
388
              <input type="text" name="issues" />
386
            </div>
389
            </div>
387
            <div class="form-field">
390
            <div class="form-field">
388
              <label class="form-field-label" for="datelastborrowed">Last issue date:</label>
391
              <label class="form-field-label" for="datelastborrowed_op">Last checkout date:</label>
389
              <select id="datelastborrowed_op" name="datelastborrowed_op">
392
              <select id="datelastborrowed_op" name="datelastborrowed_op">
390
                <option value=">">After</option>
393
                <option value=">">After</option>
391
                <option value="<">Before</option>
394
                <option value="<">Before</option>
392
                <option value="=">On</option>
395
                <option value="=">On</option>
393
              </select>
396
              </select>
394
              <input type="text" name="datelastborrowed" />
397
              <input type="text" name="datelastborrowed" />
395
              <span class="hint">ISO Format (AAAA-MM-DD)</span>
398
              <span class="hint">ISO Format (YYYY-MM-DD)</span>
396
            </div>
399
            </div>
397
          </fieldset>
400
          </fieldset>
398
          <fieldset>
401
          <fieldset>
Lines 405-418 Link Here
405
              <input type="submit" value="Search" />
408
              <input type="submit" value="Search" />
406
            </div>
409
            </div>
407
          </fieldset>
410
          </fieldset>
408
        </fieldset>
409
      </form>
411
      </form>
410
412
411
      <p><a id="editsearchlink" href="#" style="display:none">Edit search</a></p>
413
      <p><a id="editsearchlink" href="#" style="display:none">Edit search</a></p>
412
414
    </div>
415
  </div>
416
  <div id="doc3" class="yui-t7">
413
      <div id="results-wrapper">
417
      <div id="results-wrapper">
414
        [% IF search_done %]
418
        [% IF search_done %]
415
416
          [% IF total_rows > 0 %]
419
          [% IF total_rows > 0 %]
417
            <p>Found [% total_rows %] results.</p>
420
            <p>Found [% total_rows %] results.</p>
418
          [% ELSE %]
421
          [% ELSE %]
Lines 429-434 Link Here
429
432
430
        [% END %]
433
        [% END %]
431
      </div>
434
      </div>
432
    </div>
433
435
434
    [% INCLUDE 'intranet-bottom.inc' %]
436
    [% INCLUDE 'intranet-bottom.inc' %]
435
- 

Return to bug 11425