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

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 1144-1150 sub check_api_auth { Link Here
1144
    unless ($query->param('userid')) {
1144
    unless ($query->param('userid')) {
1145
        $sessionID = $query->cookie("CGISESSID");
1145
        $sessionID = $query->cookie("CGISESSID");
1146
    }
1146
    }
1147
    if ($sessionID && not ($cas && $query->param('PT')) ) {
1147
    if ( $sessionID && not ($cas && $query->param('PT')) ) {
1148
        my $session = get_session($sessionID);
1148
        my $session = get_session($sessionID);
1149
        C4::Context->_new_userenv($sessionID);
1149
        C4::Context->_new_userenv($sessionID);
1150
        if ($session) {
1150
        if ($session) {
(-)a/C4/Items.pm (-12 / +29 lines)
Lines 970-978 sub GetLostItems { Link Here
970
970
971
=head2 GetItemsForInventory
971
=head2 GetItemsForInventory
972
972
973
  $itemlist = GetItemsForInventory($minlocation, $maxlocation, 
973
=over 4
974
                 $location, $itemtype $datelastseen, $branch, 
974
975
                 $offset, $size, $statushash);
975
($itemlist, $iTotalRecords)  = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $offset, $size, $statushash);
976
977
=back
976
978
977
Retrieve a list of title/authors/barcode/callnumber, for biblio inventory.
979
Retrieve a list of title/authors/barcode/callnumber, for biblio inventory.
978
980
Lines 985-990 the datelastseen can be used to specify that you want to see items not seen sinc Link Here
985
offset & size can be used to retrieve only a part of the whole listing (defaut behaviour)
987
offset & size can be used to retrieve only a part of the whole listing (defaut behaviour)
986
$statushash requires a hashref that has the authorized values fieldname (intems.notforloan, etc...) as keys, and an arrayref of statuscodes we are searching for as values.
988
$statushash requires a hashref that has the authorized values fieldname (intems.notforloan, etc...) as keys, and an arrayref of statuscodes we are searching for as values.
987
989
990
$iTotalRecords is the number of rows that would have been returned without the $offset, $size limit clause
991
988
=cut
992
=cut
989
993
990
sub GetItemsForInventory {
994
sub GetItemsForInventory {
Lines 993-999 sub GetItemsForInventory { Link Here
993
    my ( @bind_params, @where_strings );
997
    my ( @bind_params, @where_strings );
994
998
995
    my $query = <<'END_SQL';
999
    my $query = <<'END_SQL';
996
SELECT items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, datelastseen
1000
SELECT SQL_CALC_FOUND_ROWS items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber
997
FROM items
1001
FROM items
998
  LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
1002
  LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
999
  LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber
1003
  LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber
Lines 1052-1071 END_SQL Link Here
1052
        $query .= join ' AND ', @where_strings;
1056
        $query .= join ' AND ', @where_strings;
1053
    }
1057
    }
1054
    $query .= ' ORDER BY items.cn_sort, itemcallnumber, title';
1058
    $query .= ' ORDER BY items.cn_sort, itemcallnumber, title';
1059
    $query .= " LIMIT $offset, $size" if ($offset and $size);
1055
    my $sth = $dbh->prepare($query);
1060
    my $sth = $dbh->prepare($query);
1056
    $sth->execute( @bind_params );
1061
    $sth->execute( @bind_params );
1057
1062
1058
    my @results;
1063
    my @results;
1059
    $size--;
1064
    my $tmpresults = $sth->fetchall_arrayref({});
1060
    while ( my $row = $sth->fetchrow_hashref ) {
1065
    $sth = $dbh->prepare("SELECT FOUND_ROWS()");
1061
        $offset-- if ($offset);
1066
    $sth->execute();
1062
        $row->{datelastseen}=format_date($row->{datelastseen});
1067
    my ($iTotalRecords) = $sth->fetchrow_array();
1063
        if ( ( !$offset ) && $size ) {
1068
 
1064
            push @results, $row;
1069
    foreach my $row (@$tmpresults) {
1065
            $size--;
1070
        $row->{datelastseen} = format_date( $row->{datelastseen} );
1071
1072
        # Auth values
1073
        foreach (keys %$row) {
1074
            # If the koha field is mapped to a marc field
1075
            my ($f, $sf) = GetMarcFromKohaField("items.$_", $row->{'frameworkcode'});
1076
            if ($f and $sf) {
1077
                # We replace the code with it's description
1078
                my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $row->{'frameworkcode'});
1079
                $row->{$_} = $authvals->{$row->{$_}} if defined $authvals->{$row->{$_}};
1080
            }
1066
        }
1081
        }
1082
        push @results, $row;
1067
    }
1083
    }
1068
    return \@results;
1084
   
1085
    return (\@results, $iTotalRecords);
1069
}
1086
}
1070
1087
1071
=head2 GetItemsCount
1088
=head2 GetItemsCount
(-)a/C4/Templates.pm (-1 / +1 lines)
Lines 288-294 sub getlanguage { Link Here
288
    my $lang;
288
    my $lang;
289
289
290
    # cookie
290
    # cookie
291
    if ( $query->cookie('KohaOpacLanguage') ) {
291
    if ($query and $query->cookie('KohaOpacLanguage') ) {
292
        $lang = $query->cookie('KohaOpacLanguage');
292
        $lang = $query->cookie('KohaOpacLanguage');
293
        $lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
293
        $lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
294
    }
294
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/columns.def (+1 lines)
Lines 138-140 biblioitems.place Place of publication Link Here
138
biblioitems.lccn	LCCN
138
biblioitems.lccn	LCCN
139
biblioitems.marcxml	MARC blob
139
biblioitems.marcxml	MARC blob
140
biblioitems.url	URL
140
biblioitems.url	URL
141
biblioitems.title	Title
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-81 / +107 lines)
Lines 1-11 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
2
<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
4
[% INCLUDE 'calendar.inc' %]
7
[% INCLUDE 'calendar.inc' %]
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
8
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
6
<script type="text/javascript">
9
<script type="text/javascript">
7
//<![CDATA[
10
//<![CDATA[
8
$(document).ready(function(){
11
$(document).ready(function(){
12
13
        inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {
14
            'sPaginationType': 'full_numbers',
15
            "aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ] 
16
        } ));
17
18
19
	$("#continuewithoutmarkingbutton").click(function(){
20
                inventorydt.fnPageChange( 'next' );
21
	        return false;
22
        });
23
24
        $("#markseenandcontinuebutton").click(function(){
25
            var param = '';
26
            $("input:checked").each(function() {
27
                param += "|" + $(this).attr('name');
28
            });
29
            $.post('/cgi-bin/koha/tools/ajax-inventory.pl', { seen: param });
30
            inventorydt.fnPageChange( 'next' );
31
            return false;
32
        });
33
34
        $("#markseenandquit").click(function(){
35
            var param = '';
36
            $("input:checked").each(function() {
37
                param += "|" + $(this).attr('name');
38
            });
39
            $.ajax({
40
              type: 'POST',
41
              url: '/cgi-bin/koha/tools/ajax-inventory.pl',
42
              data: { seen: param},
43
              async: false
44
            });
45
            document.location.href = '/cgi-bin/koha/tools/inventory.pl';
46
            return false;
47
        });
48
49
50
9
	$(".checkall").click(function(){
51
	$(".checkall").click(function(){
10
	        $(".checkboxed").checkCheckboxes();
52
	        $(".checkboxed").checkCheckboxes();
11
	        return false;
53
	        return false;
Lines 28-38 $(document).ready(function(){ Link Here
28
//]]>
70
//]]>
29
</script>
71
</script>
30
</head>
72
</head>
31
<body id="tools_inventory" class="tools">
73
<body>
32
[% INCLUDE 'header.inc' %]
74
[% INCLUDE 'header.inc' %]
33
[% INCLUDE 'cat-search.inc' %]
75
[% INCLUDE 'cat-search.inc' %]
34
76
35
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( loop ) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>
77
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>
36
78
37
<div id="doc3" class="yui-t2">
79
<div id="doc3" class="yui-t2">
38
   
80
   
Lines 40-65 $(document).ready(function(){ Link Here
40
	<div id="yui-main">
82
	<div id="yui-main">
41
	<div class="yui-b">
83
	<div class="yui-b">
42
    <h1>Inventory/Stocktaking</h1>
84
    <h1>Inventory/Stocktaking</h1>
43
    [% IF ( Number ) %]<div class="dialog message">[% Number %] items modified : datelastseen set to [% date %]</div>[% END %]
85
    [% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date %]</div>[% END %]
44
    [% IF ( errorfile ) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
86
    [% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
45
    [% FOREACH errorloo IN errorloop %]
87
    [% FOREACH error IN errorloop %]
46
        <div class="dialog alert">
88
        <div class="dialog alert">
47
            [% errorloo.barcode %]
89
            [% error.barcode %]
48
            [% IF ( errorloo.ERR_BARCODE ) %]: barcode not found[% END %]
90
            [% IF (error.ERR_BARCODE) %]: barcode not found[% END %]
49
            [% IF ( errorloo.ERR_WTHDRAWN ) %]: item withdrawn[% END %]
91
            [% IF (error.ERR_WTHDRAWN) %]: item withdrawn[% END %]
50
            [% IF ( errorloo.ERR_ONLOAN_RET ) %]: item was on loan. It was returned before marked as seen[% END %]
92
            [% IF (error.ERR_ONLOAN_RET) %]: item was on loan. It was returned before marked as seen[% END %]
51
            [% IF ( errorloo.ERR_ONLOAN_NOT_RET ) %]: item was on loan. couldn't be returned.[% END %]
93
            [% IF (error.ERR_ONLOAN_NOT_RET) %]: item was on loan. couldn't be returned.[% END %]
52
        </div>
94
        </div>
53
    [% END %]
95
    [% END %]
54
	[% UNLESS ( loop ) %]
96
       [% UNLESS op %]
55
	<div class="yui-g">
97
	<div class="yui-g">
56
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
98
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
57
        <fieldset class="rows">
99
        <fieldset class="rows">
58
            <legend>Use a barcode file</legend>
100
            <legend>Use a barcode file</legend>
59
	 <ol>
101
	 <ol>
60
            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
102
            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
61
            <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepicker" />
103
            <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepickerfrom" />
62
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
63
            </li>
104
            </li>
64
          </ol>
105
          </ol>
65
        </fieldset>
106
        </fieldset>
Lines 81-123 $(document).ready(function(){ Link Here
81
        [% END %]
122
        [% END %]
82
        </select>
123
        </select>
83
        </li>
124
        </li>
84
        [% IF ( authorised_values ) %]
125
        [% IF (authorised_values) %]
85
        <li>
126
        <li>
86
            <label for="locationloop">Shelving location (items.location) is: </label>
127
            <label for="locationloop">Shelving location (items.location) is: </label>
87
        <select id="locationloop" name="location">
128
        <select id="locationloop" name="location">
88
                <option value="">Filter location</option>
129
                <option value="">Filter location</option>
89
        [% FOREACH authorised_value IN authorised_values %]
130
        [% FOREACH value IN authorised_values %]
90
            [% IF ( authorised_value.selected ) %]
131
            [% IF (value.selected) %]
91
                <option value="[% authorised_value.authorised_value %]" selected="selected">[% authorised_value.lib %]</option>
132
                <option value="[% value.authorised_value %]" selected="selected">[% value.lib %]</option>
92
            [% ELSE %]
133
            [% ELSE %]
93
                <option value="[% authorised_value.authorised_value %]">[% authorised_value.lib %]</option>
134
                <option value="[% value.authorised_value %]">[% value.lib %]</option>
94
            [% END %]
135
            [% END %]
95
        [% END %]
136
        [% END %]
96
        </select>        </li>
137
        </select>        </li>
97
        [% END %]
138
        [% END %]
98
        <li>
139
        <li>
99
            <label for="minlocation">Item call number between: </label>
140
            <label for="minlocation">Item callnumber between: </label>
100
                <input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber)  </li>
141
                <input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber)  </li>
101
           <li><label for="maxlocation">...and: </label>
142
           <li><label for="maxlocation">...and: </label>
102
                <input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />
143
                <input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />
103
        </li>
144
        </li>
104
        [% IF ( statuses ) %]
145
        [% IF (statuses) %]
105
	</ol>
146
	</ol>
106
	</fieldset>
147
	</fieldset>
107
            <fieldset class="rows">
148
            <fieldset class="rows">
108
            <legend>Item statuses</legend>
149
            <legend>Item statuses</legend>
109
            <div name="statuses" style="display: block;">
150
            <div name="statuses" style="display: block;">
110
                  [% FOREACH statuse IN statuses %]
151
                  [% FOREACH status IN statuses %]
111
                      [% IF ( statuse.values ) %]
152
                      [% IF (status.values) %]
112
                          <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
153
                          <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
113
                              <legend>[% statuse.fieldname %]</legend>
154
                              <legend>[% status.fieldname %]</legend>
114
                              <ul id="statuses-[% statuse.fieldname %]" style="display: inline;">
155
                              <ul id="statuses-[% fieldname %]" style="display: inline;">
115
                              [% FOREACH value IN statuse.values %]
156
                              [% FOREACH value IN status.values %]
116
                                  [% IF ( value.lib ) %]<li>
157
                                  [% IF (value.lib) %]<li>
117
                                    <label for="[% value.id %]">
158
                                    <label for="[% value.id %]">
118
                                      [% value.lib %]
159
                                      [% value.lib %]
119
                                    </label>
160
                                    </label>
120
                                    <input type="checkbox" name="status-[% value.fieldname %]-[% value.id %]" id="[% value.id %]" />
161
                                    <input type="checkbox" name="status-[% status.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
121
                                  </li>[% END %]
162
                                  </li>[% END %]
122
                              [% END %]
163
                              [% END %]
123
                              </ul>
164
                              </ul>
Lines 131-150 $(document).ready(function(){ Link Here
131
        [% END %]
172
        [% END %]
132
173
133
        <li><label for="datelastseen">Inventory date:</label>
174
        <li><label for="datelastseen">Inventory date:</label>
134
            <input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepicker"/>
175
            <input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepickerfrom" />
135
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
136
        </li>
176
        </li>
137
        <li><label for="ignoreissued">Skip copies on loan: </label>
177
        <li><label for="ignoreissued">Skip copies on loan: </label>
138
            [% IF ( ignoreissued ) %]
178
            [% IF (ignoreissued) %]
139
            <input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
179
            <input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
140
            [% ELSE %]
180
            [% ELSE %]
141
            <input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
181
            <input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
142
            [% END %]
182
            [% END %]
143
        <li><label for="pagesize">Show: </label>
144
            <input type="text" id="pagesize" name="pagesize" value="[% pagesize %]" maxlength="5" size="5" /> items</li>
145
          <li><label for="offset">Beginning at offset: </label>
146
            <input type="text" id="offset" name="offset" value="[% offset %]" size="5" maxlength="5" />
147
        </li>
148
        <li>
183
        <li>
149
           <label for="CSVexport">Export to CSV file: </label>
184
           <label for="CSVexport">Export to CSV file: </label>
150
           <input type="checkbox" name="CSVexport" id="CSVexport" />
185
           <input type="checkbox" name="CSVexport" id="CSVexport" />
Lines 161-167 $(document).ready(function(){ Link Here
161
	</div>
196
	</div>
162
	</div>
197
	</div>
163
	[% END %]
198
	[% END %]
164
    [% IF ( loop ) %]
199
    [% IF (op) %]
165
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
200
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
166
    <input type="hidden" name="markseen" value="1" />
201
    <input type="hidden" name="markseen" value="1" />
167
    <input type="hidden" name="minlocation" value="[% minlocation %]" />
202
    <input type="hidden" name="minlocation" value="[% minlocation %]" />
Lines 171-244 $(document).ready(function(){ Link Here
171
    <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
206
    <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
172
    <input type="hidden" name="pagesize" value="[% pagesize %]" />
207
    <input type="hidden" name="pagesize" value="[% pagesize %]" />
173
    <input type="hidden" name="offset" value="[% offset %]" />
208
    <input type="hidden" name="offset" value="[% offset %]" />
174
    <div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
209
	<div><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
175
    <table>
210
    <table id="inventoryt">
211
    <thead>
176
        <tr>
212
        <tr>
177
            <th>Seen</th>
213
            <th>Seen</th>
178
            <th>Barcode</th>
214
            <th>Barcode</th>
215
            <th>Location</th>
179
            <th>Title</th>
216
            <th>Title</th>
217
            <th>Status</th>
218
            <th>Lost</th>
219
            <th>Damaged</th>
180
            <th>Unseen since</th>
220
            <th>Unseen since</th>
181
            <th>Problems</th>
221
            <th>Problems</th>
182
        </tr>
222
        </tr>
183
    [% FOREACH loo IN loop %]
223
    </thead>
224
    <tbody>
225
    [% FOREACH result IN loop %]
184
        <tr>
226
        <tr>
185
            <td>
227
            <td>
186
                <input type="checkbox" name="SEEN-[% loo.itemnumber %]" value="1" />
228
            <input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
229
            </td>
230
            <td>
231
            [% result.barcode | html %]
187
            </td>
232
            </td>
188
            <td>
233
            <td>
189
                [% loo.barcode %]
234
            [% result.homebranch | html %] [% result.location | html %] [[% result.itemcallnumber | html %]]
190
            </td>
235
            </td>
191
            <td>
236
            <td>
192
                <p><b>[% loo.itemcallnumber %]</b> - <a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% loo.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% loo.title |html %]</a></p>
237
            <p><a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% result.title | html %]</a></p><p>[% result.author | html %]</p>
193
                <p>[% loo.author %]</p>
194
            </td>
238
            </td>
195
            <td>
239
            <td>
196
                <p>[% loo.datelastseen %]</p>
240
            [% result.notforloan | html %]
197
            </td>
241
            </td>
198
            <td>
242
            <td>
199
                 [% IF ( loo.notfoundbarcode ) %]
243
            [% result.itemlost | html %]
200
                     <p style="background: red;">Not found among barcodes in barcodes file.</p>
244
            </td>
201
                 [% ELSIF ( loo.notfoundkoha ) %]
245
            <td>
202
                     <p style="background: red;">Not found in Koha.</p>
246
            [% result.damaged | html %]
203
                 [% ELSE %]
247
            </td>
204
                     <p style="background: green;">None</p>
248
            <td>
205
                 [% END %]
249
            [% result.datelastseen | html %]
250
            </td>
251
            <td>
252
            [% IF (result.wrongplace) %]<p>Item should not have been scanned</p>[% ELSIF (result.missingitem) %]<p>Item missing</p>[% ELSIF (result.changestatus) %]<p>Change item status</p>[% END %]
206
            </td>
253
            </td>
207
        </tr>
254
        </tr>
208
    [% END %]
255
    [% END %]
256
    </tbody>
209
    </table>
257
    </table>
210
    <div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
258
    <div class="spacer"></div>
211
     <input type="submit" id="markseen" value="Mark seen" />
259
      <p style="display:block;"><span class="exportSelected"></span></p>
212
    </form>
260
	<div style="padding : .3em 0"><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
213
    [% IF ( offset ) %]
261
     <input type="submit" id="markseenandquit" value="Mark seen and quit" />
214
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
262
     <input type="submit" value="Mark Seen and Continue &gt;&gt;" id="markseenandcontinuebutton" />
215
        <input type="hidden" name="branch" value="[% branch %]" />
263
     <input type="submit" value="Continue without Marking &gt;&gt;" id="continuewithoutmarkingbutton" class="submit" />
216
        <input type="hidden" name="minlocation" value="[% minlocation %]" />
217
        <input type="hidden" name="maxlocation" value="[% maxlocation %]" />
218
        <input type="hidden" name="location" value="[% location %]" />
219
        <input type="hidden" name="branchcode" value="[% branchcode %]" />
220
        <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
221
        <input type="hidden" name="pagesize" value="[% pagesize %]" />
222
        <input type="hidden" name="offset" value="[% prevoffset %]" />
223
        <input type="hidden" name="op" value="do_it" />
224
        <input type="submit" value="&lt;&lt; Continue without marking" class="submit" />
225
    </form>
226
    [% END %]
227
    [% IF ( nextoffset ) %]
228
    <form method="post">
229
        <input type="hidden" name="branch" value="[% branch %]" />
230
        <input type="hidden" name="location" value="[% location %]" />
231
        <input type="hidden" name="branchcode" value="[% branchcode %]" />
232
        <input type="hidden" name="minlocation" value="[% minlocation %]" />
233
        <input type="hidden" name="maxlocation" value="[% maxlocation %]" />
234
        <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
235
        <input type="hidden" name="pagesize" value="[% pagesize %]" />
236
        <input type="hidden" name="offset" value="[% nextoffset %]" />
237
        <input type="hidden" name="op" value="do_it" />
238
        <input type="submit" value="Continue without marking &gt;&gt;" class="submit" />
239
    </form>
264
    </form>
265
240
    </div>
266
    </div>
241
    [% END %]
267
242
    [% END %]
268
    [% END %]
243
</div>
269
</div>
244
<div class="yui-b">
270
<div class="yui-b">
(-)a/tools/ajax-inventory.pl (+43 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
#
3
4
use Modern::Perl;
5
6
use CGI;
7
use JSON;
8
9
use C4::Auth;
10
use C4::Circulation qw/CanBookBeRenewed/;
11
use C4::Context;
12
use C4::Koha qw/getitemtypeimagelocation/;
13
use C4::Reserves qw/CheckReserves/;
14
use C4::Utils::DataTables;
15
use C4::Output;
16
use C4::Biblio;
17
use C4::Items;
18
use C4::Dates qw/format_date format_date_in_iso/;
19
use C4::Koha;
20
use C4::Branch;    # GetBranches
21
use C4::Reports::Guided;    #_get_column_defs
22
use C4::Charset;
23
use List::MoreUtils qw /none/;
24
25
26
my $input = new CGI;
27
28
# Authentication
29
my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($input, { tools => 'inventory' });
30
exit unless ($status eq "ok");
31
32
33
my $seen = $input->param('seen');
34
my @seent = split(/\|/, $seen);
35
36
# mark seen if applicable (ie: coming form mark seen checkboxes)
37
foreach ( @seent ) {
38
    /SEEN-(.+)/ and &ModDateLastSeen($1);
39
}
40
41
42
print $input->header('application/json');
43
(-)a/tools/inventory.pl (-78 / +195 lines)
Lines 35-40 use C4::Dates qw/format_date format_date_in_iso/; Link Here
35
use C4::Koha;
35
use C4::Koha;
36
use C4::Branch; # GetBranches
36
use C4::Branch; # GetBranches
37
use C4::Circulation;
37
use C4::Circulation;
38
use C4::Reports::Guided;    #_get_column_defs
39
use C4::Charset;
40
use List::MoreUtils qw/none/;
41
38
42
39
my $minlocation=$input->param('minlocation') || '';
43
my $minlocation=$input->param('minlocation') || '';
40
my $maxlocation=$input->param('maxlocation');
44
my $maxlocation=$input->param('maxlocation');
Lines 50-68 my $pagesize = $input->param('pagesize'); Link Here
50
$pagesize=50 unless $pagesize;
54
$pagesize=50 unless $pagesize;
51
my $branchcode = $input->param('branchcode') || '';
55
my $branchcode = $input->param('branchcode') || '';
52
my $branch     = $input->param('branch');
56
my $branch     = $input->param('branch');
53
my $op = $input->param('op');
57
my $op         = $input->param('op');
54
my $res;    #contains the results loop
58
my $compareinv2barcd = $input->param('compareinv2barcd');
55
# warn "uploadbarcodes : ".$uploadbarcodes;
59
my $res;                                            #contains the results loop
56
# use Data::Dumper; warn Dumper($input);
60
57
61
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
58
my ($template, $borrowernumber, $cookie)
62
    {   template_name   => "tools/inventory.tmpl",
59
    = get_template_and_user({template_name => "tools/inventory.tmpl",
63
        query           => $input,
60
                query => $input,
64
        type            => "intranet",
61
                type => "intranet",
65
        authnotrequired => 0,
62
                authnotrequired => 0,
66
        flagsrequired   => { tools => 'inventory' },
63
                flagsrequired => {tools => 'inventory'},
67
        debug           => 1,
64
                debug => 1,
68
    }
65
                });
69
);
70
66
71
67
my $branches = GetBranches();
72
my $branches = GetBranches();
68
my @branch_loop;
73
my @branch_loop;
Lines 103-160 for my $statfield (qw/items.notforloan items.itemlost items.wthdrawn items.damag Link Here
103
        push @$statuses, $hash;
108
        push @$statuses, $hash;
104
    }
109
    }
105
}
110
}
111
112
106
$template->param( statuses => $statuses );
113
$template->param( statuses => $statuses );
107
my $staton = {};								#authorized values that are ticked
114
my $staton = {};								#authorized values that are ticked
108
for my $authvfield (@$statuses) {
115
for my $authvfield (@$statuses) {
109
    $staton->{$authvfield->{fieldname}} = [];
116
    $staton->{$authvfield->{fieldname}} = [];
110
    for my $authval (@{$authvfield->{values}}){
117
    for my $authval (@{$authvfield->{values}}){
111
        if ( defined $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{id}) && $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{id}) eq 'on' ){
118
        if ( defined $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{authorised_value}) && $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{authorised_value}) eq 'on' ){
112
            push @{$staton->{$authvfield->{fieldname}}}, $authval->{id};
119
            push @{$staton->{$authvfield->{fieldname}}}, $authval->{authorised_value};
113
        }
120
        }
114
    }
121
    }
115
}
122
}
116
123
124
my $notforloanlist;
117
my $statussth = '';
125
my $statussth = '';
118
for my $authvfield (@$statuses) {
126
for my $authvfield (@$statuses) {
119
    if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){
127
    if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){
120
        my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};
128
        my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};
121
        $statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";
129
        $statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";
130
        $notforloanlist = $joinedvals if ($authvfield->{fieldname} eq "items.notforloan");
122
    }
131
    }
123
}
132
}
124
$statussth =~ s, and $,,g;
133
$statussth =~ s, and $,,g;
125
 
134
$template->param(
126
$template->param(branchloop => \@branch_loop,
135
    branchloop               => \@branch_loop,
127
                authorised_values=>\@authorised_value_list,   
136
    authorised_values        => \@authorised_value_list,
128
                today			=>	C4::Dates->today(),
137
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
129
                minlocation => $minlocation,
138
    today                    => C4::Dates->today(),
130
                maxlocation => $maxlocation,
139
    minlocation              => $minlocation,
131
                location=>$location,
140
    maxlocation              => $maxlocation,
132
                ignoreissued=>$ignoreissued,
141
    location                 => $location,
133
                branchcode=>$branchcode,      
142
    ignoreissued             => $ignoreissued,
134
                branch    => $branch,
143
    branchcode               => $branchcode,
135
                offset => $offset,
144
    branch                   => $branch,
136
                pagesize => $pagesize,
145
    offset                   => $offset,
137
                datelastseen => $datelastseen,
146
    pagesize                 => $pagesize,
138
                );
147
    datelastseen             => $datelastseen,
148
    compareinv2barcd         => $compareinv2barcd,
149
    notforloanlist           => $notforloanlist
150
);
151
152
my @notforloans;
153
if (defined $notforloanlist) {
154
    @notforloans = split(/,/, $notforloanlist);
155
}
156
157
158
139
my @brcditems;
159
my @brcditems;
140
if ($uploadbarcodes && length($uploadbarcodes)>0){
160
my $barcodelist;
141
    my $dbh=C4::Context->dbh;
161
my @errorloop;
142
    my $date = format_date_in_iso($input->param('setdate')) || C4::Dates->today('iso');
162
if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
143
# 	warn "$date";
163
     my $dbh = C4::Context->dbh;
144
    my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
164
    my $date = format_date_in_iso( $input->param('setdate') ) || C4::Dates->today('iso');
165
166
    my $strsth  = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
145
    my $qonloan = $dbh->prepare($strsth);
167
    my $qonloan = $dbh->prepare($strsth);
146
    $strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
168
    $strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
147
    my $qwthdrawn = $dbh->prepare($strsth);
169
    my $qwthdrawn = $dbh->prepare($strsth);
148
    my @errorloop;
170
    my $count = 0;
149
    my $count=0;
171
  
150
    while (my $barcode=<$uploadbarcodes>){
172
    while ( my $barcode = <$uploadbarcodes> ) {
151
        $barcode =~ s/\r?\n$//;
173
        $barcode =~ s/\r?\n$//;
152
        if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){
174
        $barcodelist .= ($barcodelist) ? '|' . $barcode : $barcode;
153
            push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};
175
        if ( $qwthdrawn->execute($barcode) && $qwthdrawn->rows ) {
154
        }else{
176
            push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };
155
            my $item = GetItem('', $barcode);
177
        } else {
156
            if (defined $item && $item->{'itemnumber'}){
178
            my $item = GetItem( '', $barcode );
157
                ModItem({ datelastseen => $date }, undef, $item->{'itemnumber'});
179
            if ( defined $item && $item->{'itemnumber'} ) {
180
                ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );
158
                push @brcditems, $item;
181
                push @brcditems, $item;
159
                $count++;
182
                $count++;
160
                $qonloan->execute($barcode);
183
                $qonloan->execute($barcode);
Lines 171-218 if ($uploadbarcodes && length($uploadbarcodes)>0){ Link Here
171
                push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
194
                push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
172
            }
195
            }
173
        }
196
        }
197
174
    }
198
    }
175
    $qonloan->finish;
199
    $qonloan->finish;
176
    $qwthdrawn->finish;
200
    $qwthdrawn->finish;
177
    $template->param(date=>format_date($date),Number=>$count);
201
    $template->param( date => format_date($date), Number => $count );
178
# 	$template->param(errorfile=>$errorfile) if ($errorfile);
202
    $template->param( errorloop => \@errorloop ) if (@errorloop);
179
    $template->param(errorloop=>\@errorloop) if (@errorloop);
203
204
180
}
205
}
181
#if we want to compare the results to a list of barcodes, or we have no barcode file
206
$template->param(barcodelist => $barcodelist);
182
if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compareinv2barcd') eq 'on' && length($uploadbarcodes)>0) ) {
207
183
    if ($markseen) {
208
# now build the result list: inventoried items if requested, and mis-placed items -always-
184
        foreach ($input->param) {
209
my $inventorylist;
185
            /SEEN-(.+)/ and &ModDateLastSeen($1);
210
if ( $markseen or $op ) {
186
        }
211
    # retrieve all items in this range.
187
    }
212
    my $totalrecords;
188
    if ($markseen or $op) {
213
    ($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);
189
        $res = GetItemsForInventory( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $pagesize, $staton );
214
190
        $template->param(loop =>$res,
215
    # Real copy
191
                        nextoffset => ($offset+$pagesize),
216
    my @res_copy;
192
                        prevoffset => ($offset?$offset-$pagesize:0),
217
    foreach (@$inventorylist) {
193
                        );
218
        push @res_copy, $_;
194
    }
219
    }
195
    if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){
220
    $res = \@res_copy;
196
        if ( scalar @brcditems > scalar @$res ){
221
}
197
            for my $brcditem (@brcditems) {
222
198
                if (! grep( $_->{barcode} =~ /$brcditem->{barcode}/ , @$res) ){
223
# set "missing" flags for all items with a datelastseen before the choosen datelastseen
199
                    $brcditem->{notfoundkoha} = 1;
224
foreach (@$res) { $_->{missingitem}=1 if C4::Dates->new($_->{datelastseen})->output('iso') lt C4::Dates->new($datelastseen)->output('iso'); }
200
                    push @$res, $brcditem;
225
201
                }
226
# removing missing items from loop if "Compare barcodes list to results" has not been checked
202
            }
227
@$res = grep {!$_->{missingitem} == 1 } @$res if (!$input->param('compareinv2barcd'));
203
        } else {
228
204
            my @notfound;
229
# insert "wrongplace" to all scanned items that are not supposed to be in this range
205
            for my $item (@$res) {
230
# note this list is always displayed, whatever the librarian has choosen for comparison
206
                if ( ! grep( $_->{barcode} =~ /$item->{barcode}/ , @brcditems) ){
231
foreach my $temp (@brcditems) {
207
                    $item->{notfoundbarcode} = 1;
232
208
                    push @notfound, $item;
233
  # Saving notforloan code before it's replaced by it's authorised value for later comparison
209
                }
234
  $temp->{'notforloancode'} = $temp->{'notforloan'};
235
236
  # Populating with authorised values
237
  foreach (keys %$temp) {
238
        # If the koha field is mapped to a marc field
239
        my $fc = $temp->{'frameworkcode'} || '';
240
        my ($f, $sf) = GetMarcFromKohaField("items.$_", $fc);
241
        if ($f and $sf) {
242
            # We replace the code with it's description
243
            my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);
244
            if ($authvals and defined $temp->{$_} and defined $authvals->{$temp->{$_}}) {
245
              $temp->{$_} = $authvals->{$temp->{$_}};
210
            }
246
            }
211
            $res = [@$res, @notfound];
212
        }
247
        }
213
    }
248
    }
249
250
    next if $temp->{onloan}; # skip checked out items
251
252
    # If we have scanned items with a non-matching notforloan value
253
    if (none { $temp->{'notforloancode'} eq $_ } @notforloans) {
254
        $temp->{'changestatus'} = 1;
255
        my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
256
        $temp->{title} = $biblio->{title};
257
        $temp->{author} = $biblio->{author};
258
        $temp->{datelastseen} = format_date($temp->{datelastseen});
259
        push @$res, $temp;
260
261
    }
262
    if (none { $temp->{barcode} eq $_->{barcode} && !$_->{'onloan'} } @$inventorylist) {
263
        my $temp2 = { %$temp };
264
        $temp2->{wrongplace}=1;
265
        my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
266
        $temp2->{title} = $biblio->{title};
267
        $temp2->{author} = $biblio->{author};
268
        $temp2->{datelastseen} = format_date($temp->{datelastseen});
269
        push @$res, $temp2;
270
    }
271
}
272
273
# Finally, modifying datelastseen for remaining items
274
my $moddatecount = 0;
275
foreach (@$res) {
276
    unless ($_->{'missingitem'}) {
277
        ModDateLastSeen($_->{'itemnumber'}); 
278
        $moddatecount++;
279
    }
214
}
280
}
215
281
282
# Removing items that don't have any problems from loop
283
@$res = grep { $_->{missingitem} || $_->{wrongplace} || $_->{changestatus} } @$res;
284
285
$template->param(
286
    moddatecount => $moddatecount,
287
    loop       => $res,
288
    nextoffset => ( $offset + $pagesize ),
289
    prevoffset => ( $offset ? $offset - $pagesize : 0 ),
290
    op         => $op
291
);
292
216
if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){
293
if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){
217
    eval {use Text::CSV};
294
    eval {use Text::CSV};
218
    my $csv = Text::CSV->new or
295
    my $csv = Text::CSV->new or
Lines 221-234 if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){ Link Here
221
        -type       => 'text/csv',
298
        -type       => 'text/csv',
222
        -attachment => 'inventory.csv',
299
        -attachment => 'inventory.csv',
223
    );
300
    );
224
    for my $re (@$res){
301
302
    my $columns_def_hashref = C4::Reports::Guided::_get_column_defs();
303
    foreach my $key ( keys %$columns_def_hashref ) {
304
        my $initkey = $key;
305
        $key =~ s/[^\.]*\.//;
306
        $columns_def_hashref->{$initkey}=NormalizeString($columns_def_hashref->{$initkey});
307
        $columns_def_hashref->{$key} = $columns_def_hashref->{$initkey};
308
    }
309
310
    my @translated_keys;
311
    for my $key (qw / biblioitems.title    biblio.author 
312
                      items.barcode        items.itemnumber 
313
                      items.homebranch     items.location 
314
                      items.itemcallnumber items.notforloan 
315
                      items.itemlost       items.damaged
316
                      items.stocknumber
317
                      / ) {
318
       push @translated_keys, $columns_def_hashref->{$key};
319
    }
320
321
    $csv->combine(@translated_keys);
322
    print $csv->string, "\n";
323
324
    my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /; 
325
    for my $re (@$res) {
225
        my @line;
326
        my @line;
226
        for my $key (keys %$re) {
327
        for my $key (@keys) {
227
            push @line, $re->{$key};
328
            push @line, $re->{$key};
228
        }
329
        }
330
        if ($re->{wrongplace}) {
331
            push @line, "wrong place";
332
        } elsif ($re->{missingitem}) {
333
            push @line, "missing item";
334
        } elsif ($re->{changestatus}) {
335
            push @line, "change item status";
336
        }
229
        $csv->combine(@line);
337
        $csv->combine(@line);
230
        print $csv->string, "\n";
338
        print $csv->string, "\n";
231
    }
339
    }
340
    # Adding not found barcodes
341
    foreach my $error (@errorloop) {
342
	my @line;
343
	if ($error->{'ERR_BARCODE'}) {
344
		push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;
345
		push @line, "barcode not found";
346
		$csv->combine(@line);
347
		print $csv->string, "\n";
348
	}
349
    }
232
    exit;
350
    exit;
233
}
351
}
234
352
235
- 

Return to bug 7684