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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-6 / +62 lines)
Lines 371-388 Link Here
371
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>  [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %]
371
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>  [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %]
372
                </td>
372
                </td>
373
            </tr>
373
            </tr>
374
            <tr>
375
                <th><label for="managedon">Managed by:</label> </th>
376
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
377
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby | html %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %]</td>
378
            </tr>
379
            <tr>
374
            <tr>
380
                <th><label for="accepteddate">Accepted on:</label> </th>
375
                <th><label for="accepteddate">Accepted on:</label> </th>
381
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
376
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
382
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td>
377
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td>
383
            </tr>
378
            </tr>
384
            </tbody>
379
            </tbody>
385
        </table></li></ol>
380
        </table></li>
381
382
            <li>
383
                <label for="managedon">Managed on:</label>
384
                <input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
385
            </li>
386
            <li>
387
                <label for="managedby_name">by:</label>
388
                <div>
389
                    <span id="managedby_name">
390
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
391
                    </span>
392
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
393
                        | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
394
                    [% END %]
395
                    <br />
396
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
397
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
398
                        <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a>
399
                    [% END %]
400
                    <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
401
                </div>
402
            </li>
403
        </ol>
386
    </fieldset>
404
    </fieldset>
387
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
405
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
388
        <li><label for="branchcode">Library:</label>
406
        <li><label for="branchcode">Library:</label>
Lines 962-967 Link Here
962
    [% END %]
980
    [% END %]
963
    [% IF ( op_save )  %]
981
    [% IF ( op_save )  %]
964
        <script>
982
        <script>
983
984
            function editManagerPopup() {
985
                window.open("/cgi-bin/koha/admin/add_user_search.pl?selection_type=select",
986
                    'PatronPopup',
987
                    'width=740,height=450,location=yes,toolbar=no,'
988
                    + 'scrollbars=yes,resize=yes'
989
                );
990
            }
991
            function select_user(borrowernumber, borrower) {
992
                $("#managedby_name").empty();
993
                $("#managedby").val('');
994
                var borrowername = borrower.firstname + ' ' + borrower.surname;
995
                if (borrowernumber) {
996
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
997
                        + '?borrowernumber=' + borrowernumber + '">'
998
                        + borrowername + '</a>';
999
                    $('#managedby_name').html(managerlink);
1000
                    $('#managedby').val(borrowernumber);
1001
                }
1002
            }
1003
965
            $(document).ready(function(){
1004
            $(document).ready(function(){
966
                calcNewsuggTotal();
1005
                calcNewsuggTotal();
967
                $("#quantity,#price,#currency").on("change",function(){
1006
                $("#quantity,#price,#currency").on("change",function(){
Lines 985-990 Link Here
985
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
1024
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
986
                    $("#other_reason").hide();
1025
                    $("#other_reason").hide();
987
                });
1026
                });
1027
1028
                $("#edit_manager").on("click",function(e){
1029
                    e.preventDefault();
1030
                    editManagerPopup();
1031
                });
1032
                $("#restore_previous_manager").on("click",function(e){
1033
                    e.preventDefault();
1034
1035
                    $("#managedby_name").empty();
1036
                    $("#managedby").val('');
1037
                    var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]";
1038
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
1039
                        + '?borrowernumber=[% managedby_borrowernumber | html %]">'
1040
                        + borrowername + '</a>';
1041
                    $('#managedby_name').html(managerlink);
1042
                    $('#managedby').val([% managedby_borrowernumber | html %]);
1043
                });
988
            });
1044
            });
989
        </script>
1045
        </script>
990
    [% END %]
1046
    [% END %]
(-)a/suggestion/suggestion.pl (-2 / +2 lines)
Lines 154-160 if ( $op =~ /save/i ) { Link Here
154
                $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
154
                $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
155
            }
155
            }
156
            $suggestion_only->{manageddate} = dt_from_string;
156
            $suggestion_only->{manageddate} = dt_from_string;
157
            $suggestion_only->{"managedby"}   = C4::Context->userenv->{number};
157
            $suggestion_only->{"managedby"} ||= C4::Context->userenv->{number};
158
        }
158
        }
159
159
160
        my $otherreason = $input->param('other_reason');
160
        my $otherreason = $input->param('other_reason');
Lines 334-339 foreach my $element ( qw(managedby suggestedby acceptedby) ) { Link Here
334
        my $patron = Koha::Patrons->find( $$suggestion_ref{$element} );
334
        my $patron = Koha::Patrons->find( $$suggestion_ref{$element} );
335
        my $category = $patron->category;
335
        my $category = $patron->category;
336
        $template->param(
336
        $template->param(
337
            $element."_patron"=> $patron,
337
            $element."_borrowernumber"=>$patron->borrowernumber,
338
            $element."_borrowernumber"=>$patron->borrowernumber,
338
            $element."_firstname"=>$patron->firstname,
339
            $element."_firstname"=>$patron->firstname,
339
            $element."_surname"=>$patron->surname,
340
            $element."_surname"=>$patron->surname,
340
- 

Return to bug 23590