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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-1 / +1 lines)
Lines 81-87 $(document).ready(function() { Link Here
81
        <fieldset class="rows"><ol>
81
        <fieldset class="rows"><ol>
82
        <li>
82
        <li>
83
			 [% IF ( action_add_category ) %]<label for="category">Category</label>
83
			 [% IF ( action_add_category ) %]<label for="category">Category</label>
84
            <input type="text" name="category"  id="category" size="10" maxlength="10" class="focus" />
84
            <input type="text" name="category"  id="category" size="16" maxlength="16" class="focus" />
85
			 [% ELSE %]<span class="label">Category</span>
85
			 [% ELSE %]<span class="label">Category</span>
86
		<input type="hidden" name="category" value="[% category %]" />	 [% category %]
86
		<input type="hidden" name="category" value="[% category %]" />	 [% category %]
87
			 [% END %]
87
			 [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt (+2 lines)
Lines 34-39 Link Here
34
34
35
<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
35
<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
36
36
37
<p><strong>Customization:</strong> You can create additional custom suggestion statuses by creating new authorised values of the category SUGGEST_STATUS</p>
38
37
<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.10/en/managesuggest.html">manual</a> (online).</strong></p>
39
<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.10/en/managesuggest.html">manual</a> (online).</strong></p>
38
40
39
[% INCLUDE 'help-bottom.inc' %]
41
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-69 / +208 lines)
Lines 1-3 Link Here
1
[% USE KohaAuthorisedValues %]
2
[% USE KohaBranchName %]
1
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions  &rsaquo;
4
<title>Koha &rsaquo; Acquisitions  &rsaquo;
3
    [% IF ( op_save ) %]
5
    [% IF ( op_save ) %]
Lines 190-201 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
190
      <ol>
192
      <ol>
191
        <li>
193
        <li>
192
          <span class="label">Status:</span>
194
          <span class="label">Status:</span>
193
          [% IF ( STATUS == 'ASKED' ) %]Pending
195
          [% SET status_found = 0 %]
194
          [% ELSIF ( STATUS == 'ACCEPTED' ) %]Accepted
196
          [% IF ( STATUS == 'ASKED' ) %]
195
          [% ELSIF ( STATUS == 'CHECKED' ) %]Checked
197
              Pending
196
          [% ELSIF ( STATUS == 'REJECTED' ) %]Rejected
198
              [% SET status_found = 1 %]
197
          [% ELSE %]No Status
199
          [% ELSIF ( STATUS == 'ACCEPTED' ) %]
200
              Accepted
201
              [% SET status_found = 1 %]
202
          [% ELSIF ( STATUS == 'CHECKED' ) %]
203
              Checked
204
              [% SET status_found = 1 %]
205
          [% ELSIF ( STATUS == 'REJECTED' ) %]
206
              Rejected
207
              [% SET status_found = 1 %]
208
          [% ELSE %]
209
              [% FOREACH s IN SuggestionStatuses %]
210
                  [% IF STATUS == s.authorised_value %]
211
                      [% s.lib %]
212
                      [% SET status_found = 1 %]
213
                  [% END %]
214
              [% END %]
198
          [% END %]
215
          [% END %]
216
199
        </li>
217
        </li>
200
        <li>
218
        <li>
201
          <table>
219
          <table>
Lines 204-221 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
204
            <tr>
222
            <tr>
205
                <th><span class="label">Suggestion creation</span> </th>
223
                <th><span class="label">Suggestion creation</span> </th>
206
                <td>[% suggesteddate %]</td>
224
                <td>[% suggesteddate %]</td>
207
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %]
225
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
208
                </td>
226
                </td>
209
            </tr>
227
            </tr>
210
            <tr>
228
            <tr>
211
                <th><span class="label">Suggestion management</span> </th>
229
                <th><span class="label">Suggestion management</span> </th>
212
                <td>[% manageddate %]</td>
230
                <td>[% manageddate %]</td>
213
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
231
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
214
            </tr>
232
            </tr>
215
            <tr>
233
            <tr>
216
                <th><span class="label">Suggestion accepted</span> </th>
234
                <th><span class="label">Suggestion accepted</span> </th>
217
                <td>[% accepteddate %]</td>
235
                <td>[% accepteddate %]</td>
218
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
236
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
219
            </tr>
237
            </tr>
220
            </tbody>
238
            </tbody>
221
        </table></li></ol>
239
        </table></li></ol>
Lines 286-319 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
286
    </fieldset>
304
    </fieldset>
287
    <fieldset class="rows"> <legend>Suggestion management</legend>
305
    <fieldset class="rows"> <legend>Suggestion management</legend>
288
       <ol>
306
       <ol>
289
            [% IF ( suggestionid ) %]<li><label for="status">Status:</label><select id="STATUS" name="STATUS"><option value="">No Status</option>
307
            [% IF ( suggestionid ) %]
290
                [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
308
                <li>
291
                [% ELSE %]<option value="ASKED">Pending</option>[% END %]
309
                    <label for="status">Status:</label>
292
                [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
310
                    <select id="STATUS" name="STATUS">
293
                [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
311
                        <option value="">No Status</option>
294
                [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
312
295
                [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
313
                        [% IF (statusselected_ASKED ) %]
296
                [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
314
                            <option value="ASKED" selected="selected">Pending</option>
297
                [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
315
                        [% ELSE %]
298
            </select></li>[% END %]
316
                            <option value="ASKED">Pending</option>
317
                        [% END %]
318
319
                        [% IF (statusselected_ACCEPTED ) %]
320
                            <option value="ACCEPTED" selected="selected">Accepted</option>
321
                        [% ELSE %]
322
                            <option value="ACCEPTED">Accepted</option>
323
                        [% END %]
324
325
                        [% IF (statusselected_CHECKED ) %]
326
                            <option value="CHECKED" selected="selected">Checked</option>
327
                        [% ELSE %]
328
                            <option value="CHECKED">Checked</option>
329
                        [% END %]
330
331
                        [% IF ( statusselected_REJECTED ) %]
332
                            <option value="REJECTED" selected="selected">Rejected</option>
333
                        [% ELSE %]
334
                            <option value="REJECTED">Rejected</option>
335
                        [% END %]
336
337
                        [% FOREACH s IN SuggestionStatuses %]
338
                            [% IF s.authorised_value == selected_status %]
339
                                <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
340
                            [% ELSE %]
341
                                <option value="[% s.authorised_value %]">[% s.lib %]</option>
342
                            [% END %]
343
                        [% END %]
344
                    </select>
345
                </li>
346
            [% END %]
299
        <li><table>
347
        <li><table>
300
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
348
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
301
            <tbody>
349
            <tbody>
302
            <tr>
350
            <tr>
303
                <th><label for="suggesteddate">Suggestion creation</label> </th>
351
                <th><label for="suggesteddate">Suggestion creation</label> </th>
304
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
352
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
305
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %]
353
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
306
                </td>
354
                </td>
307
            </tr>
355
            </tr>
308
            <tr>
356
            <tr>
309
                <th><label for="managedon">Suggestion management</label> </th>
357
                <th><label for="managedon">Suggestion management</label> </th>
310
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
358
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
311
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
359
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
312
            </tr>
360
            </tr>
313
            <tr>
361
            <tr>
314
                <th><label for="accepteddate">Suggestion accepted</label> </th>
362
                <th><label for="accepteddate">Suggestion accepted</label> </th>
315
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
363
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
316
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
364
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
317
            </tr>
365
            </tr>
318
            </tbody>
366
            </tbody>
319
        </table></li></ol>
367
        </table></li></ol>
Lines 359-379 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
359
<h1>Suggestions management</h1>
407
<h1>Suggestions management</h1>
360
408
361
[% UNLESS ( notabs ) %]
409
[% UNLESS ( notabs ) %]
362
<div id="sorting" class="overlay">Sorting...</div>
410
    <div id="sorting" class="overlay">Sorting...</div>
363
<div id="loadingtab" class="overlay">Loading tab...</div>
411
    <div id="loadingtab" class="overlay">Loading tab...</div>
364
<div id="suggestiontabs" class="toptabs">
412
    <div id="suggestiontabs" class="toptabs">
365
<ul class="ui-tabs-nav">
413
    <ul class="ui-tabs-nav">
366
[% FOREACH suggestion IN suggestions %]
414
        [% FOREACH suggestion IN suggestions %]
367
[% IF ( suggestion.first ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% suggestion.suggestiontype %]">[% IF ( suggestion.suggestiontypelabel ) %]
415
            [% IF ( suggestion.first ) %]
368
    [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
416
                <li class="ui-tabs-selected">
369
    [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
417
            [% ELSE %]
370
    [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked
418
                <li>
371
    [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected
419
            [% END %]
372
    [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
420
373
    [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered[% ELSE %]
421
            <a href="#[% suggestion.suggestiontype %]">
374
    [% suggestion.suggestiontypelabel %][% END %]
422
            [% IF ( suggestion.suggestiontypelabel ) %]
375
    [% ELSE %]No name[% END %] ([% suggestion.suggestionscount %])</a></li>
423
                [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
376
[% END %]
424
                [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
425
                [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked
426
                [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected
427
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
428
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
429
                [% ELSE %][% suggestion.suggestiontypelabel %][% END %]
430
            [% ELSE %]
431
                [% IF ( suggestion.suggestiontype ) %]
432
                    [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) %]
433
                [% ELSE %]
434
                    No name
435
                [% END %]
436
            [% END %]
437
            ([% suggestion.suggestions_loop.size %])</a></li>
438
439
        [% END %]
377
    </ul>
440
    </ul>
378
[% END %]
441
[% END %]
379
442
Lines 417-457 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
417
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
480
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
418
                </td>
481
                </td>
419
                <td>
482
                <td>
420
                    [% suggestions_loo.branchcode %]
483
                    [% suggestions_loo.branchcode | $KohaBranchName %]
421
                </td>
484
                </td>
422
                <td>
485
                <td>
423
                    [% suggestions_loo.budget_name %]
486
                    [% suggestions_loo.budget_name %]
424
                </td>
487
                </td>
425
                <td>
488
                <td>
426
                    [% IF ( suggestions_loo.ASKED ) %]Pending[% END %] [% IF ( suggestions_loo.ACCEPTED ) %]Accepted[% END %] [% IF ( suggestions_loo.ORDERED ) %]Ordered[% END %] [% IF ( suggestions_loo.REJECTED ) %]Rejected[% END %] [% IF ( suggestions_loo.CHECKED ) %]Checked[% END %] [% IF ( suggestions_loo.reason ) %]<br />([% suggestions_loo.reason %])[% END %]
489
                    [% IF ( suggestions_loo.ASKED ) %]
490
                        Pending
491
                    [% ELSIF ( suggestions_loo.ACCEPTED ) %]
492
                        Accepted
493
                    [% ELSIF ( suggestions_loo.ORDERED ) %]
494
                        Ordered
495
                    [% ELSIF ( suggestions_loo.REJECTED ) %]
496
                        Rejected
497
                    [% ELSIF ( suggestions_loo.CHECKED ) %]
498
                        Checked
499
                    [% ELSIF KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
500
                        [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
501
                    [% END %]
502
503
                    [% IF ( suggestions_loo.reason ) %]
504
                        <br />([% suggestions_loo.reason %])
505
                    [% END %]
427
                </td>
506
                </td>
428
        </tr>
507
        </tr>
429
        [% END %]</tbody>
508
        [% END %]</tbody>
430
        </table>  <fieldset>
509
        </table>  <fieldset>
431
    <div id="select-reason[% suggestion.suggestiontype %]">
510
    <div id="select-reason[% suggestion.suggestiontype %]">
432
        <div id="status[% suggestion.suggestiontype %]">
511
        <div id="status[% suggestion.suggestiontype %]">
433
	<label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label><select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
512
            <label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label>
434
	<option value=""> -- Choose a status --</option>
513
            <select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
435
    [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
514
                <option value=""> -- Choose a status --</option>
436
    [% ELSE %]<option value="ASKED">Pending</option>[% END %]
515
437
    [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
516
                [% IF (statusselected_ASKED ) %]
438
    [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
517
                    <option value="ASKED" selected="selected">Pending</option>
439
    [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
518
                [% ELSE %]
440
    [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
519
                    <option value="ASKED">Pending</option>
441
    [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
520
                [% END %]
442
    [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
521
443
	</select>
522
                [% IF (statusselected_ACCEPTED ) %]
444
    <label for="reason[% suggestion.suggestiontype %]">with this reason:</label>                 <select id="reason[% suggestion.suggestiontype %]" name="reason[% suggestion.suggestiontype %]">
523
                    <option value="ACCEPTED" selected="selected">Accepted</option>
445
                    <option value=""> -- Choose a reason -- </option>
524
                [% ELSE %]
446
                        [% FOREACH reasonsloo IN suggestion.reasonsloop %]
525
                    <option value="ACCEPTED">Accepted</option>
447
                        <option value="[% reasonsloo.lib %]">[% reasonsloo.lib %]</option>
526
                [% END %]
448
                        [% END %]
527
449
                    <option value="other">Others...</option>
528
                [% IF (statusselected_CHECKED ) %]
450
                    </select>   <span id="other_reason[% suggestion.suggestiontype %]">
529
                    <option value="CHECKED" selected="selected">Checked</option>
451
            <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype %]" name="other_reason[% suggestion.suggestiontype %]" value="please note your reason here..." /> <a href="#back[% suggestion.suggestiontype %]">Cancel</a>
530
                [% ELSE %]
452
        </span> <strong style="padding: 0 1em;">OR:</strong> <label for="[% suggestion.suggestiontype %]delete">Delete selected</label> <input type="checkbox" name="op" id="[% suggestion.suggestiontype %]delete" />
531
                    <option value="CHECKED">Checked</option>
453
        </div>
532
                [% END %]
533
534
                [% IF ( statusselected_REJECTED ) %]
535
                    <option value="REJECTED" selected="selected">Rejected</option>
536
                [% ELSE %]
537
                    <option value="REJECTED">Rejected</option>
538
                [% END %]
539
540
                [% FOREACH s IN SuggestionStatuses %]
541
                    <option value="[% s.authorised_value %]">[% s.lib %]</option>
542
                [% END %]
543
            </select>
544
545
            <label for="reason[% suggestion.suggestiontype %]">with this reason:</label>
546
            <select id="reason[% suggestion.suggestiontype %]" name="reason[% suggestion.suggestiontype %]">
547
                <option value=""> -- Choose a reason -- </option>
548
                [% FOREACH reasonsloo IN suggestion.reasonsloop %]
549
                    <option value="[% reasonsloo.lib %]">[% reasonsloo.lib %]</option>
550
                [% END %]
551
                <option value="other">Others...</option>
552
            </select>
553
554
            <span id="other_reason[% suggestion.suggestiontype %]">
555
                <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype %]" name="other_reason[% suggestion.suggestiontype %]" value="please note your reason here..." />
556
                <a href="#back[% suggestion.suggestiontype %]">Cancel</a>
557
            </span>
558
559
            <strong style="padding: 0 1em;">OR:</strong>
560
561
            <label for="[% suggestion.suggestiontype %]delete">Delete selected</label>
562
            <input type="checkbox" name="op" id="[% suggestion.suggestiontype %]delete" />
454
        </div>
563
        </div>
564
    </div>
455
565
456
566
457
    <input type="hidden" name="tabcode" value="[% suggestion.suggestiontype %]" />
567
    <input type="hidden" name="tabcode" value="[% suggestion.suggestiontype %]" />
Lines 493-508 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
493
                </fieldset>
603
                </fieldset>
494
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
604
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
495
                    <ol>
605
                    <ol>
496
                      <li><label for="STATUS"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
606
                      <li>
497
                        [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
607
                          <label for="STATUS"> Status:</label>
498
                        [% ELSE %]<option value="ASKED">Pending</option>[% END %]
608
                          <select name="STATUS" id="STATUS">
499
                        [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
609
                              <option value="">Any</option>
500
                        [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
610
501
                        [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
611
                              [% IF (statusselected_ASKED ) %]
502
                        [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
612
                                  <option value="ASKED" selected="selected">Pending</option>
503
                        [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
613
                              [% ELSE %]
504
                        [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
614
                                  <option value="ASKED">Pending</option>
505
                      </select></li>
615
                              [% END %]
616
617
                              [% IF (statusselected_ACCEPTED ) %]
618
                                  <option value="ACCEPTED" selected="selected">Accepted</option>
619
                              [% ELSE %]
620
                                  <option value="ACCEPTED">Accepted</option>
621
                              [% END %]
622
623
                              [% IF (statusselected_CHECKED ) %]
624
                                  <option value="CHECKED" selected="selected">Checked</option>
625
                              [% ELSE %]
626
                                  <option value="CHECKED">Checked</option>
627
                              [% END %]
628
629
                              [% IF ( statusselected_REJECTED ) %]
630
                                  <option value="REJECTED" selected="selected">Rejected</option>
631
                              [% ELSE %]
632
                                  <option value="REJECTED">Rejected</option>
633
                              [% END %]
634
635
                              [% FOREACH s IN SuggestionStatuses %]
636
                                  [% IF s.authorised_value == selected_status %]
637
                                      <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
638
                                  [% ELSE %]
639
                                      <option value="[% s.authorised_value %]">[% s.lib %]</option>
640
                                  [% END %]
641
                              [% END %]
642
                          </select>
643
                      </li>
644
506
                    <li><label for="suggestedby"> Suggested by:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
645
                    <li><label for="suggestedby"> Suggested by:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
507
[% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
646
[% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
508
                                                                     </select></li>
647
                                                                     </select></li>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt (-6 / +9 lines)
Lines 1-3 Link Here
1
[% USE KohaAuthorisedValues %]
1
[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
2
[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
2
[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
3
[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
3
[% IF ( op_else ) %]Purchase Suggestions[% END %]
4
[% IF ( op_else ) %]Purchase Suggestions[% END %]
Lines 216-227 $.tablesorter.addParser({ Link Here
216
					[% IF ( suggestions_loo.surnamemanagedby ) %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby %][% ELSE %]&nbsp;[% END %]
217
					[% IF ( suggestions_loo.surnamemanagedby ) %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby %][% ELSE %]&nbsp;[% END %]
217
                </td>
218
                </td>
218
                <td>
219
                <td>
219
                    [% IF ( suggestions_loo.ASKED ) %]Requested[% END %]
220
                    [% IF    ( suggestions_loo.ASKED ) %]Requested
220
                    [% IF ( suggestions_loo.CHECKED ) %]Checked by the library[% END %]
221
                    [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library
221
                    [% IF ( suggestions_loo.ACCEPTED ) %]Accepted by the library[% END %]
222
                    [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library
222
                    [% IF ( suggestions_loo.ORDERED ) %]Ordered by the library[% END %]
223
                    [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library
223
                    [% IF ( suggestions_loo.REJECTED ) %]Suggestion declined [% END %]
224
                    [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
224
                    [% IF ( suggestions_loo.AVAILABLE ) %]Available in the library[% END %]
225
                    [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
226
                    [% ELSE %] [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %]
227
225
                    [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %]
228
                    [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %]
226
                </td>
229
                </td>
227
            </tr>
230
            </tr>
(-)a/suggestion/suggestion.pl (-1 / +7 lines)
Lines 58-63 sub Init{ Link Here
58
58
59
sub GetCriteriumDesc{
59
sub GetCriteriumDesc{
60
    my ($criteriumvalue,$displayby)=@_;
60
    my ($criteriumvalue,$displayby)=@_;
61
    unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
62
        return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown";
63
    }
61
    return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
64
    return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
62
    return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
65
    return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
63
    return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
66
    return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
Lines 383-386 foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { Link Here
383
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
386
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
384
}
387
}
385
$template->param(%hashlists);
388
$template->param(%hashlists);
389
$template->param(
390
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
391
    SuggestionStatuses       => GetAuthorisedValues('SUGGEST_STATUS'),
392
);
386
output_html_with_http_headers $input, $cookie, $template->output;
393
output_html_with_http_headers $input, $cookie, $template->output;
387
- 

Return to bug 9307