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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-17 / +31 lines)
Lines 262-281 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
262
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
262
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
263
            <tbody>
263
            <tbody>
264
            <tr>
264
            <tr>
265
                <th><span class="label">Suggestion creation</span> </th>
265
                <th>Created by:</th>
266
                <td>[% suggesteddate | $KohaDates %]</td>
266
                <td>[% suggesteddate | $KohaDates %]</td>
267
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
267
                <td>
268
                    [% IF ( suggestedby_borrowernumber ) %]
269
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %])</a>
270
                        [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])
271
                    [% END %]
268
                </td>
272
                </td>
269
            </tr>
273
            </tr>
270
            <tr>
274
            <tr>
271
                <th><span class="label">Suggestion management</span> </th>
275
                <th>Managed by:</th>
272
                <td>[% manageddate | $KohaDates %]</td>
276
                <td>[% manageddate | $KohaDates %]</td>
273
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td>
277
                <td>
278
                        [% IF ( managedby_borrowernumber ) %]
279
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %])</a>
280
                            [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])
281
                        [% END %]
282
                </td>
274
            </tr>
283
            </tr>
275
            <tr>
284
            <tr>
276
                <th><span class="label">Suggestion accepted</span> </th>
285
                <th>Accepted on:</th>
277
                <td>[% accepteddate | $KohaDates %]</td>
286
                <td>[% accepteddate | $KohaDates %]</td>
278
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td>
287
                <td>
288
                    [% IF ( acceptedby_borrowernumber ) %]
289
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %] ([% suggestedby_cardnumber %])</a>
290
                        [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])
291
                    [% END %]
292
                </td>
279
            </tr>
293
            </tr>
280
            </tbody>
294
            </tbody>
281
        </table></li></ol>
295
        </table></li></ol>
Lines 405-424 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
405
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
419
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
406
            <tbody>
420
            <tbody>
407
            <tr>
421
            <tr>
408
                <th><label for="suggesteddate">Suggestion creation</label> </th>
422
                <th><label for="suggesteddate">Created by:</label> </th>
409
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/></td>
423
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
410
                <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>  [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
424
                <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 %] ([% suggestedby_cardnumber %])</a>  [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
411
                </td>
425
                </td>
412
            </tr>
426
            </tr>
413
            <tr>
427
            <tr>
414
                <th><label for="managedon">Suggestion management</label> </th>
428
                <th><label for="managedon">Managed by:</label> </th>
415
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" /></td>
429
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
416
                <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> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td>
430
                <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 %] ([% suggestedby_cardnumber %])</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td>
417
            </tr>
431
            </tr>
418
            <tr>
432
            <tr>
419
                <th><label for="accepteddate">Suggestion accepted</label> </th>
433
                <th><label for="accepteddate">Accepted on:</label> </th>
420
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" /></td>
434
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
421
                <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> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td>
435
                <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 %] ([% suggestedby_cardnumber %])</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td>
422
            </tr>
436
            </tr>
423
            </tbody>
437
            </tbody>
424
        </table></li></ol>
438
        </table></li></ol>
Lines 553-563 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
553
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %]
567
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %]
554
                </td>
568
                </td>
555
                <td>
569
                <td>
556
                    [% IF ( suggestions_loo.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %]
570
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby %]">[% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %]</a>
557
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
571
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
558
                </td>
572
                </td>
559
                <td>
573
                <td>
560
                    [% IF ( suggestions_loo.emailmanagedby ) %]<a href="mailto:[% suggestions_loo.emailmanagedby %]">[% END %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %]</a>[% END %]
574
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby %]">[% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %]</a>
561
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
575
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
562
                </td>
576
                </td>
563
                <td>
577
                <td>
(-)a/suggestion/suggestion.pl (-1 / +1 lines)
Lines 286-291 foreach my $element ( qw(managedby suggestedby acceptedby) ) { Link Here
286
            $element."_borrowernumber"=>$$member{borrowernumber},
286
            $element."_borrowernumber"=>$$member{borrowernumber},
287
            $element."_firstname"=>$$member{firstname},
287
            $element."_firstname"=>$$member{firstname},
288
            $element."_surname"=>$$member{surname},
288
            $element."_surname"=>$$member{surname},
289
            $element."_cardnumber"=>$$member{cardnumber},
289
            $element."_branchcode"=>$$member{branchcode},
290
            $element."_branchcode"=>$$member{branchcode},
290
            $element."_description"=>$$member{description},
291
            $element."_description"=>$$member{description},
291
            $element."_category_type"=>$$member{category_type}
292
            $element."_category_type"=>$$member{category_type}
292
- 

Return to bug 12349