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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc (+77 lines)
Line 0 Link Here
1
[% IF ( ShowOptions ) %]
2
  [% IF ( serial.status1 ) %]
3
    <option value="1" selected="selected">Expected</option>
4
  [% ELSIF ( not HideStatuses.match('\b1\b') ) %]
5
    <option value="1">Expected</option>
6
  [% END %]
7
  [% IF ( serial.status2 ) %]
8
    <option value="2" selected="selected">Arrived</option>
9
  [% ELSIF ( not HideStatuses.match('\b2\b') ) %]
10
    <option value="2">Arrived</option>
11
  [% END %]
12
  [% IF ( serial.status3 ) %]
13
    <option value="3" selected="selected">Late</option>
14
  [% ELSIF ( not HideStatuses.match('\b3\b') ) %]
15
    <option value="3">Late</option>
16
  [% END %]
17
  [% IF ( serial.status4 ) %]
18
    <option value="4" selected="selected">Missing</option>
19
  [% ELSIF ( not HideStatuses.match('\b4\b') ) %]
20
    <option value="4">Missing</option>
21
  [% END %]
22
  [% IF ( serial.status41 ) %]
23
    <option value="41" selected="selected">Missing (never received)</option>
24
  [% ELSIF ( not HideStatuses.match('\b41\b') ) %]
25
    <option value="41">Missing (never received)</option>
26
  [% END %]
27
  [% IF ( serial.status42 ) %]
28
    <option value="42" selected="selected">Missing (sold out)</option>
29
  [% ELSIF ( not HideStatuses.match('\b42\b') ) %]
30
    <option value="42">Missing (sold out)</option>
31
  [% END %]
32
  [% IF ( serial.status43 ) %]
33
    <option value="43" selected="selected">Missing (damaged)</option>
34
  [% ELSIF ( not HideStatuses.match('\b43\b') ) %]
35
    <option value="43">Missing (damaged)</option>
36
  [% END %]
37
  [% IF ( serial.status44 ) %]
38
    <option value="44" selected="selected">Missing (lost)</option>
39
  [% ELSIF ( not HideStatuses.match('\b44\b') ) %]
40
    <option value="44">Missing (lost)</option>
41
  [% END %]
42
  [% IF ( serial.status7 ) %]
43
    <option value="7" selected="selected">Claimed</option>
44
  [% ELSIF ( not HideStatuses.match('\b7\b') ) %]
45
    <option value="7">Claimed</option>
46
  [% END %]
47
  [% IF ( serial.status5 ) %]
48
    <option value="5" selected="selected">Not available</option>
49
  [% ELSIF ( not HideStatuses.match('\b5\b') ) %]
50
    <option value="5">Not available</option>
51
  [% END %]
52
  [% IF ( serial.status6 ) %]
53
    <option value="6" selected="selected">Delete</option>
54
  [% ELSIF ( not HideStatuses.match('\b6\b') ) %]
55
    <option value="6">Delete</option>
56
  [% END %]
57
  [% IF serial.status8 %]
58
    <option value="8" selected="selected">Stopped</option>
59
  [% ELSIF ( not HideStatuses.match('\b8\b') ) %]
60
    <option value="8">Stopped</option>
61
  [% END %]
62
[% ELSE %]
63
  [% IF ( serial.status1 ) %]<span class="status-expected">Expected</span>[% END %]
64
  [% IF ( serial.status2 ) %]<span class="status-arrived">Arrived</span>[% END %]
65
  [% IF ( serial.status3 ) %]<span class="status-late">Late</span>[% END %]
66
  [% IF ( serial.status4 ) %]<span class="status-missing">Missing</span>[% END %]
67
  [% IF ( serial.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %]
68
  [% IF ( serial.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %]
69
  [% IF ( serial.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %]
70
  [% IF ( serial.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
71
  [% IF ( serial.status5 ) %]<span class="status-not_issued">Not issued</span>[% END %]
72
  [% IF ( serial.status6 ) %]<span class="status-delete">Delete</span>[% END %]
73
  [% IF ( serial.status7 ) %]<span class="status-claimed">Claimed
74
    [% IF ( serial.claimdate ) %]<span class="claimdate">[% serial.claimdate | html %]</span>[% END %]
75
  </span>[% END %]
76
  [% IF ( serial.status8 ) %]<span class="status-stopped">Stopped</span>[% END %]
77
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-14 / +1 lines)
Lines 582-601 Note that permanent location is a code, and location may be an authval. Link Here
582
                    <td>[% latestserial.serialseq | html %]</td>
582
                    <td>[% latestserial.serialseq | html %]</td>
583
                    <td><span title="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</span></td>
583
                    <td><span title="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</span></td>
584
                    <td><span title="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</span></td>
584
                    <td><span title="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</span></td>
585
                    <td>
585
                    <td>[% PROCESS 'serials-status.inc' serial=latestserial ShowOptions=0 %]</td>
586
                      [% IF ( latestserial.status1 ) %]Expected[% END %]
587
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
588
                      [% IF ( latestserial.status3 ) %]Late[% END %]
589
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
590
                      [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
591
                      [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
592
                      [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
593
                      [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
594
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
595
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
596
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
597
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
598
                    </td>
599
                    <td>[% latestserial.notes | html %]</td>
586
                    <td>[% latestserial.notes | html %]</td>
600
                </tr>
587
                </tr>
601
            [% END %]
588
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-10 / +1 lines)
Lines 132-147 Link Here
132
                        </td>
132
                        </td>
133
                        <td>[% missingissue.issn | html %]</td>
133
                        <td>[% missingissue.issn | html %]</td>
134
                        <td>[% missingissue.serialseq | html %]</td>
134
                        <td>[% missingissue.serialseq | html %]</td>
135
                        <td>
135
                        <td>[% INCLUDE 'serials-status.inc' serial=missingissue ShowOptions=0 %]</td>
136
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
137
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
138
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
139
                            [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %]
140
                            [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %]
141
                            [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %]
142
                            [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
143
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
144
                        </td>
145
                        <td class="planneddate">
136
                        <td class="planneddate">
146
                            [% IF ( missingissue.planneddate ) %]
137
                            [% IF ( missingissue.planneddate ) %]
147
                                <span title="[% missingissue.planneddateISO | html %]">[% missingissue.planneddate | html %]</span>
138
                                <span title="[% missingissue.planneddateISO | html %]">[% missingissue.planneddate | html %]</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-12 / +1 lines)
Lines 257-274 Link Here
257
                    [% END %]
257
                    [% END %]
258
                </td>
258
                </td>
259
                <td>
259
                <td>
260
                    [% IF ( serial.status1 ) %]Expected[% END %]
260
                    [% INCLUDE 'serials-status.inc' ShowOptions=0 %]
261
                    [% IF ( serial.status2 ) %]Arrived[% END %]
262
                    [% IF ( serial.status3 ) %]Late[% END %]
263
                    [% IF ( serial.status4 ) %]Missing[% END %]
264
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
265
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
266
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
267
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
268
                    [% IF ( serial.status5 ) %]Not issued[% END %]
269
                    [% IF ( serial.status6 ) %]Delete[% END %]
270
                    [% IF ( serial.status7 ) %]Claimed[% END %]
271
                    [% IF ( serial.status8 ) %]Stopped[% END %]
272
                </td>
261
                </td>
273
                <td>
262
                <td>
274
                    [% serial.notes | html %]
263
                    [% serial.notes | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-114 / +2 lines)
Lines 148-211 $(document).ready(function() { Link Here
148
              <select name="status" size="1" id="status[% serialslis.serialid | html %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate | html %]')} else {changeDate(this, '[% serialslis.planneddate | html %]')}" >
148
              <select name="status" size="1" id="status[% serialslis.serialid | html %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate | html %]')} else {changeDate(this, '[% serialslis.planneddate | html %]')}" >
149
               [% END %] 
149
               [% END %] 
150
            [% END %]
150
            [% END %]
151
            [% IF ( serialslis.status1 ) %]
151
            [% INCLUDE 'serials-status.inc' serial=serialslis ShowOptions=1 HideStatuses="8" %]
152
              <option value="1" selected="selected">Expected</option>
153
            [% ELSE %]
154
              <option value="1">Expected</option>
155
            [% END %]
156
            [% IF ( serialslis.status2 ) %]
157
              <option value="2" selected="selected">Arrived</option>
158
            [% ELSE %]
159
              <option value="2">Arrived</option>
160
            [% END %]
161
            [% IF ( serialslis.status3 ) %]
162
              <option value="3" selected="selected">Late</option>
163
            [% ELSE %]
164
              <option value="3">Late</option>
165
            [% END %]
166
            [% IF ( serialslis.status4 ) %]
167
              <option value="4" selected="selected">Missing</option>
168
            [% ELSE %]
169
              <option value="4">Missing</option>
170
            [% END %]
171
            [% IF ( serialslis.status41 ) %]
172
              <option value="41" selected="selected">Missing (never received)</option>
173
            [% ELSE %]
174
              <option value="41">Missing (never received)</option>
175
            [% END %]
176
            [% IF ( serialslis.status42 ) %]
177
              <option value="42" selected="selected">Missing (sold out)</option>
178
            [% ELSE %]
179
              <option value="42">Missing (sold out)</option>
180
            [% END %]
181
            [% IF ( serialslis.status43 ) %]
182
              <option value="43" selected="selected">Missing (damaged)</option>
183
            [% ELSE %]
184
              <option value="43">Missing (damaged)</option>
185
            [% END %]
186
            [% IF ( serialslis.status44 ) %]
187
              <option value="44" selected="selected">Missing (lost)</option>
188
            [% ELSE %]
189
              <option value="44">Missing (lost)</option>
190
            [% END %]
191
            [% IF ( serialslis.status7 ) %]
192
              <option value="7" selected="selected">Claimed</option>
193
            [% ELSE %]
194
              <option value="7">Claimed</option>
195
            [% END %]
196
            [% IF ( serialslis.status5 ) %]
197
              <option value="5" selected="selected">Not available</option>
198
            [% ELSE %]
199
              <option value="5">Not available</option>
200
            [% END %]
201
            [% IF ( serialslis.status6 ) %]
202
              <option value="6" selected="selected">Delete</option>
203
            [% ELSE %]
204
              <option value="6">Delete</option>
205
            [% END %]
206
            [% IF serialslis.status8 %]
207
              <option value="8" selected="selected">Stopped</option>
208
            [% END %]
209
            </select>
152
            </select>
210
153
211
        </td>
154
        </td>
Lines 304-365 $(document).ready(function() { Link Here
304
            <select name="status" size="1" id="addstatus[% newserialloo.serialid | html %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','label[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','[% newserialloo.serialid | html %]'); changeDate(this, '[% newserialloo.arriveddate | html %]')} else if (this.value==7){changeDate(this, '[% newserialloo.arriveddate | html %]')} else { HideItems('items'+'[% newserialloo.subscriptionid | html %]'+[% newserialloo.serialid | html %],'label[% serialslis.subscriptionid | html %][% serialslis.serialid | html %]'); changeDate(this, '[% serialslis.planneddate | html %]')}" >
247
            <select name="status" size="1" id="addstatus[% newserialloo.serialid | html %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','label[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','[% newserialloo.serialid | html %]'); changeDate(this, '[% newserialloo.arriveddate | html %]')} else if (this.value==7){changeDate(this, '[% newserialloo.arriveddate | html %]')} else { HideItems('items'+'[% newserialloo.subscriptionid | html %]'+[% newserialloo.serialid | html %],'label[% serialslis.subscriptionid | html %][% serialslis.serialid | html %]'); changeDate(this, '[% serialslis.planneddate | html %]')}" >
305
248
306
                    <option value="">----</option>
249
                    <option value="">----</option>
307
                  [% IF ( newserialloo.status1 ) %]
250
            [% INCLUDE 'serials-status.inc' serial=newserialloo ShowOptions=1 HideStatuses="1,8" %]
308
                    <option value="1" selected="selected">Expected</option>
309
                  [% END %]
310
                  [% IF ( newserialloo.status2 ) %]
311
                    <option value="2" selected="selected">Arrived</option>
312
                  [% ELSE %]
313
                    <option value="2">Arrived</option>
314
                  [% END %]
315
                  [% IF ( newserialloo.status3 ) %]
316
                    <option value="3" selected="selected">Late</option>
317
                  [% ELSE %]
318
                    <option value="3">Late</option>
319
                  [% END %]
320
                  [% IF ( newserialloo.status4 ) %]
321
                    <option value="4" selected="selected">Missing</option>
322
                  [% ELSE %]
323
                    <option value="4">Missing</option>
324
                  [% END %]
325
                  [% IF ( newserialloo.status41 ) %]
326
                    <option value="41" selected="selected">Missing (never received)</option>
327
                  [% ELSE %]
328
                    <option value="41">Missing (never received)</option>
329
                  [% END %]
330
                  [% IF ( newserialloo.status42 ) %]
331
                    <option value="42" selected="selected">Missing (sold out)</option>
332
                  [% ELSE %]
333
                    <option value="42">Missing (sold out)</option>
334
                  [% END %]
335
                  [% IF ( newserialloo.status43 ) %]
336
                    <option value="43" selected="selected">Missing (damaged)</option>
337
                  [% ELSE %]
338
                    <option value="43">Missing (damaged)</option>
339
                  [% END %]
340
                  [% IF ( newserialloo.status44 ) %]
341
                    <option value="44" selected="selected">Missing (lost)</option>
342
                  [% ELSE %]
343
                    <option value="44">Missing (lost)</option>
344
                  [% END %]
345
                  [% IF ( newserialloo.status7 ) %]
346
                    <option value="7" selected="selected">Claimed</option>
347
                  [% ELSE %]
348
                    <option value="7">Claimed</option>
349
                  [% END %]
350
                  [% IF ( newserialloo.status5 ) %]
351
                    <option value="5" selected="selected">Not available</option>
352
                  [% ELSE %]
353
                    <option value="5">Not available</option>
354
                  [% END %]
355
                  [% IF ( newserialloo.status6 ) %]
356
                    <option value="6" selected="selected">Delete</option>
357
                  [% ELSE %]
358
                    <option value="6">Delete</option>
359
                  [% END %]
360
                  [% IF newserialloo.status8 %]
361
                    <option value="8" selected="selected">Stopped</option>
362
                  [% END %]
363
            </select>
251
            </select>
364
252
365
        </td>
253
        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-18 / +1 lines)
Lines 328-350 Link Here
328
                                        [% serialslis.publisheddatetext | html %]
328
                                        [% serialslis.publisheddatetext | html %]
329
                                    </td>
329
                                    </td>
330
                                    <td>
330
                                    <td>
331
                                        [% IF ( serialslis.status1 ) %]Expected[% END %]
331
                                        [% PROCESS 'serials-status.inc' serial=serialslis ShowOptions=0 %]
332
                                        [% IF ( serialslis.status2 ) %]Arrived[% END %]
333
                                        [% IF ( serialslis.status3 ) %]Late[% END %]
334
                                        [% IF ( serialslis.status4 ) %]Missing[% END %]
335
                                        [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
336
                                        [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
337
                                        [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
338
                                        [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
339
                                        [% IF ( serialslis.status5 ) %]Not issued[% END %]
340
                                        [% IF ( serialslis.status6 ) %]Delete[% END %]
341
                                        [% IF ( serialslis.status7 ) %]
342
                                            Claimed
343
                                            [% IF ( serialslis.claimdate ) %]
344
                                                [% serialslis.claimdate | html %]
345
                                            [% END %]
346
                                        [% END %]
347
                                        [% IF ( serialslis.status8 ) %]Stopped[% END %]
348
                                    </td>
332
                                    </td>
349
                                </tr>
333
                                </tr>
350
                            [% END # /FOREACH serialslist %]
334
                            [% END # /FOREACH serialslist %]
351
- 

Return to bug 12187