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 669-688 Link Here
669
                    <td>[% latestserial.serialseq | html %]</td>
669
                    <td>[% latestserial.serialseq | html %]</td>
670
                    <td>[% latestserial.planneddate | html %]</td>
670
                    <td>[% latestserial.planneddate | html %]</td>
671
                    <td>[% latestserial.publisheddate | html %]</td>
671
                    <td>[% latestserial.publisheddate | html %]</td>
672
                    <td>
672
                    <td>[% PROCESS 'serials-status.inc' serial=latestserial ShowOptions=0 %]</td>
673
                      [% IF ( latestserial.status1 ) %]Expected[% END %]
674
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
675
                      [% IF ( latestserial.status3 ) %]Late[% END %]
676
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
677
                      [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
678
                      [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
679
                      [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
680
                      [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
681
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
682
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
683
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
684
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
685
                    </td>
686
                    <td>[% latestserial.notes | html %]</td>
673
                    <td>[% latestserial.notes | html %]</td>
687
                </tr>
674
                </tr>
688
            [% END %]
675
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-10 / +1 lines)
Lines 134-149 Link Here
134
                        </td>
134
                        </td>
135
                        <td>[% missingissue.issn | html %]</td>
135
                        <td>[% missingissue.issn | html %]</td>
136
                        <td>[% missingissue.serialseq | html %]</td>
136
                        <td>[% missingissue.serialseq | html %]</td>
137
                        <td>
137
                        <td>[% INCLUDE 'serials-status.inc' serial=missingissue ShowOptions=0 %]</td>
138
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
139
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
140
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
141
                            [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %]
142
                            [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %]
143
                            [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %]
144
                            [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
145
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
146
                        </td>
147
                        <td class="planneddate">
138
                        <td class="planneddate">
148
                            [% IF ( missingissue.planneddate ) %]
139
                            [% IF ( missingissue.planneddate ) %]
149
                                <span title="[% missingissue.planneddateISO | html %]">[% missingissue.planneddate | html %]</span>
140
                                <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 223-240 Link Here
223
                    [% END %]
223
                    [% END %]
224
                </td>
224
                </td>
225
                <td>
225
                <td>
226
                    [% IF ( serial.status1 ) %]Expected[% END %]
226
                    [% INCLUDE 'serials-status.inc' ShowOptions=0 %]
227
                    [% IF ( serial.status2 ) %]Arrived[% END %]
228
                    [% IF ( serial.status3 ) %]Late[% END %]
229
                    [% IF ( serial.status4 ) %]Missing[% END %]
230
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
231
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
232
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
233
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
234
                    [% IF ( serial.status5 ) %]Not issued[% END %]
235
                    [% IF ( serial.status6 ) %]Delete[% END %]
236
                    [% IF ( serial.status7 ) %]Claimed[% END %]
237
                    [% IF ( serial.status8 ) %]Stopped[% END %]
238
                </td>
227
                </td>
239
                <td>
228
                <td>
240
                    [% serial.notes | html %]
229
                    [% serial.notes | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-114 / +2 lines)
Lines 150-213 $(document).ready(function() { Link Here
150
              <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 %]')}" >
150
              <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 %]')}" >
151
               [% END %] 
151
               [% END %] 
152
            [% END %]
152
            [% END %]
153
            [% IF ( serialslis.status1 ) %]
153
            [% INCLUDE 'serials-status.inc' serial=serialslis ShowOptions=1 HideStatuses="8" %]
154
              <option value="1" selected="selected">Expected</option>
155
            [% ELSE %]
156
              <option value="1">Expected</option>
157
            [% END %]
158
            [% IF ( serialslis.status2 ) %]
159
              <option value="2" selected="selected">Arrived</option>
160
            [% ELSE %]
161
              <option value="2">Arrived</option>
162
            [% END %]
163
            [% IF ( serialslis.status3 ) %]
164
              <option value="3" selected="selected">Late</option>
165
            [% ELSE %]
166
              <option value="3">Late</option>
167
            [% END %]
168
            [% IF ( serialslis.status4 ) %]
169
              <option value="4" selected="selected">Missing</option>
170
            [% ELSE %]
171
              <option value="4">Missing</option>
172
            [% END %]
173
            [% IF ( serialslis.status41 ) %]
174
              <option value="41" selected="selected">Missing (never received)</option>
175
            [% ELSE %]
176
              <option value="41">Missing (never received)</option>
177
            [% END %]
178
            [% IF ( serialslis.status42 ) %]
179
              <option value="42" selected="selected">Missing (sold out)</option>
180
            [% ELSE %]
181
              <option value="42">Missing (sold out)</option>
182
            [% END %]
183
            [% IF ( serialslis.status43 ) %]
184
              <option value="43" selected="selected">Missing (damaged)</option>
185
            [% ELSE %]
186
              <option value="43">Missing (damaged)</option>
187
            [% END %]
188
            [% IF ( serialslis.status44 ) %]
189
              <option value="44" selected="selected">Missing (lost)</option>
190
            [% ELSE %]
191
              <option value="44">Missing (lost)</option>
192
            [% END %]
193
            [% IF ( serialslis.status7 ) %]
194
              <option value="7" selected="selected">Claimed</option>
195
            [% ELSE %]
196
              <option value="7">Claimed</option>
197
            [% END %]
198
            [% IF ( serialslis.status5 ) %]
199
              <option value="5" selected="selected">Not available</option>
200
            [% ELSE %]
201
              <option value="5">Not available</option>
202
            [% END %]
203
            [% IF ( serialslis.status6 ) %]
204
              <option value="6" selected="selected">Delete</option>
205
            [% ELSE %]
206
              <option value="6">Delete</option>
207
            [% END %]
208
            [% IF serialslis.status8 %]
209
              <option value="8" selected="selected">Stopped</option>
210
            [% END %]
211
            </select>
154
            </select>
212
155
213
        </td>
156
        </td>
Lines 300-361 $(document).ready(function() { Link Here
300
            <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 %]')}" >
243
            <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 %]')}" >
301
244
302
                    <option value="">----</option>
245
                    <option value="">----</option>
303
                  [% IF ( newserialloo.status1 ) %]
246
            [% INCLUDE 'serials-status.inc' serial=newserialloo ShowOptions=1 HideStatuses="1,8" %]
304
                    <option value="1" selected="selected">Expected</option>
305
                  [% END %]
306
                  [% IF ( newserialloo.status2 ) %]
307
                    <option value="2" selected="selected">Arrived</option>
308
                  [% ELSE %]
309
                    <option value="2">Arrived</option>
310
                  [% END %]
311
                  [% IF ( newserialloo.status3 ) %]
312
                    <option value="3" selected="selected">Late</option>
313
                  [% ELSE %]
314
                    <option value="3">Late</option>
315
                  [% END %]
316
                  [% IF ( newserialloo.status4 ) %]
317
                    <option value="4" selected="selected">Missing</option>
318
                  [% ELSE %]
319
                    <option value="4">Missing</option>
320
                  [% END %]
321
                  [% IF ( newserialloo.status41 ) %]
322
                    <option value="41" selected="selected">Missing (never received)</option>
323
                  [% ELSE %]
324
                    <option value="41">Missing (never received)</option>
325
                  [% END %]
326
                  [% IF ( newserialloo.status42 ) %]
327
                    <option value="42" selected="selected">Missing (sold out)</option>
328
                  [% ELSE %]
329
                    <option value="42">Missing (sold out)</option>
330
                  [% END %]
331
                  [% IF ( newserialloo.status43 ) %]
332
                    <option value="43" selected="selected">Missing (damaged)</option>
333
                  [% ELSE %]
334
                    <option value="43">Missing (damaged)</option>
335
                  [% END %]
336
                  [% IF ( newserialloo.status44 ) %]
337
                    <option value="44" selected="selected">Missing (lost)</option>
338
                  [% ELSE %]
339
                    <option value="44">Missing (lost)</option>
340
                  [% END %]
341
                  [% IF ( newserialloo.status7 ) %]
342
                    <option value="7" selected="selected">Claimed</option>
343
                  [% ELSE %]
344
                    <option value="7">Claimed</option>
345
                  [% END %]
346
                  [% IF ( newserialloo.status5 ) %]
347
                    <option value="5" selected="selected">Not available</option>
348
                  [% ELSE %]
349
                    <option value="5">Not available</option>
350
                  [% END %]
351
                  [% IF ( newserialloo.status6 ) %]
352
                    <option value="6" selected="selected">Delete</option>
353
                  [% ELSE %]
354
                    <option value="6">Delete</option>
355
                  [% END %]
356
                  [% IF newserialloo.status8 %]
357
                    <option value="8" selected="selected">Stopped</option>
358
                  [% END %]
359
            </select>
247
            </select>
360
248
361
        </td>
249
        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-18 / +1 lines)
Lines 286-308 Link Here
286
                    [% serialslis.publisheddatetext | html %]
286
                    [% serialslis.publisheddatetext | html %]
287
                </td>
287
                </td>
288
                <td>
288
                <td>
289
                    [% IF ( serialslis.status1 ) %]Expected[% END %]
289
                    [% PROCESS 'serials-status.inc' serial=serialslis ShowOptions=0 %]
290
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
291
                    [% IF ( serialslis.status3 ) %]Late[% END %]
292
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
293
                    [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
294
                    [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
295
                    [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
296
                    [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
297
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
298
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
299
                    [% IF ( serialslis.status7 ) %]
300
                      Claimed
301
                      [% IF ( serialslis.claimdate ) %]
302
                        [% serialslis.claimdate | html %]
303
                      [% END %]
304
                    [% END %]
305
                    [% IF ( serialslis.status8 ) %]Stopped[% END %]
306
                </td>
290
                </td>
307
            </tr>
291
            </tr>
308
        [% END %]
292
        [% END %]
309
- 

Return to bug 12187