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 367-383 Link Here
367
                </td>
367
                </td>
368
            </tr>
368
            </tr>
369
            <tr>
369
            <tr>
370
                <th><label for="managedon">Managed by:</label> </th>
371
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
372
                <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>
373
            </tr>
374
            <tr>
375
                <th><label for="accepteddate">Accepted on:</label> </th>
370
                <th><label for="accepteddate">Accepted on:</label> </th>
376
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
371
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</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>
372
                <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>
378
            </tr>
373
            </tr>
379
            </tbody>
374
            </tbody>
380
        </table></li></ol>
375
        </table></li>
376
377
            <li>
378
                <label for="managedon">Managed on:</label>
379
                <input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
380
            </li>
381
            <li>
382
                <label for="managedby_name">by:</label>
383
                <div>
384
                    <span id="managedby_name">
385
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
386
                    </span>
387
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
388
                        | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
389
                    [% END %]
390
                    <br />
391
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
392
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
393
                        <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a>
394
                    [% END %]
395
                    <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
396
                </div>
397
            </li>
398
        </ol>
381
    </fieldset>
399
    </fieldset>
382
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
400
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
383
        <li><label for="branchcode">Library:</label>
401
        <li><label for="branchcode">Library:</label>
Lines 957-962 Link Here
957
    [% END %]
975
    [% END %]
958
    [% IF ( op_save )  %]
976
    [% IF ( op_save )  %]
959
        <script>
977
        <script>
978
979
            function editManagerPopup() {
980
                window.open("/cgi-bin/koha/admin/add_user_search.pl?selection_type=select",
981
                    'PatronPopup',
982
                    'width=740,height=450,location=yes,toolbar=no,'
983
                    + 'scrollbars=yes,resize=yes'
984
                );
985
            }
986
            function select_user(borrowernumber, borrower) {
987
                $("#managedby_name").empty();
988
                $("#managedby").val('');
989
                var borrowername = borrower.firstname + ' ' + borrower.surname;
990
                if (borrowernumber) {
991
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
992
                        + '?borrowernumber=' + borrowernumber + '">'
993
                        + borrowername + '</a>';
994
                    $('#managedby_name').html(managerlink);
995
                    $('#managedby').val(borrowernumber);
996
                }
997
            }
998
960
            $(document).ready(function(){
999
            $(document).ready(function(){
961
                calcNewsuggTotal();
1000
                calcNewsuggTotal();
962
                $("#quantity,#price,#currency").on("change",function(){
1001
                $("#quantity,#price,#currency").on("change",function(){
Lines 980-985 Link Here
980
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
1019
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
981
                    $("#other_reason").hide();
1020
                    $("#other_reason").hide();
982
                });
1021
                });
1022
1023
                $("#edit_manager").on("click",function(e){
1024
                    e.preventDefault();
1025
                    editManagerPopup();
1026
                });
1027
                $("#restore_previous_manager").on("click",function(e){
1028
                    e.preventDefault();
1029
1030
                    $("#managedby_name").empty();
1031
                    $("#managedby").val('');
1032
                    var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]";
1033
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
1034
                        + '?borrowernumber=[% managedby_borrowernumber | html %]">'
1035
                        + borrowername + '</a>';
1036
                    $('#managedby_name').html(managerlink);
1037
                    $('#managedby').val([% managedby_borrowernumber | html %]);
1038
                });
983
            });
1039
            });
984
        </script>
1040
        </script>
985
    [% END %]
1041
    [% 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