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 366-382 Link Here
366
                </td>
366
                </td>
367
            </tr>
367
            </tr>
368
            <tr>
368
            <tr>
369
                <th><label for="managedon">Managed by:</label> </th>
370
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
371
                <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>
372
            </tr>
373
            <tr>
374
                <th><label for="accepteddate">Accepted on:</label> </th>
369
                <th><label for="accepteddate">Accepted on:</label> </th>
375
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
370
                <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="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>
371
                <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
            </tr>
372
            </tr>
378
            </tbody>
373
            </tbody>
379
        </table></li></ol>
374
        </table></li>
375
376
            <li>
377
                <label for="managedon">Managed on:</label>
378
                <input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
379
            </li>
380
            <li>
381
                <label for="managedby_name">by:</label>
382
                <div>
383
                    <span id="managedby_name">
384
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
385
                    </span>
386
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
387
                        | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
388
                    [% END %]
389
                    <br />
390
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
391
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
392
                        <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a>
393
                    [% END %]
394
                    <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
395
                </div>
396
            </li>
397
        </ol>
380
    </fieldset>
398
    </fieldset>
381
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
399
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
382
        <li><label for="branchcode">Library:</label>
400
        <li><label for="branchcode">Library:</label>
Lines 946-951 Link Here
946
    [% END %]
964
    [% END %]
947
    [% IF ( op_save )  %]
965
    [% IF ( op_save )  %]
948
        <script type="text/javascript">
966
        <script type="text/javascript">
967
968
            function editManagerPopup() {
969
                window.open("/cgi-bin/koha/admin/add_user_search.pl?selection_type=select",
970
                    'PatronPopup',
971
                    'width=740,height=450,location=yes,toolbar=no,'
972
                    + 'scrollbars=yes,resize=yes'
973
                );
974
            }
975
            function select_user(borrowernumber, borrower) {
976
                $("#managedby_name").empty();
977
                $("#managedby").val('');
978
                var borrowername = borrower.firstname + ' ' + borrower.surname;
979
                if (borrowernumber) {
980
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
981
                        + '?borrowernumber=' + borrowernumber + '">'
982
                        + borrowername + '</a>';
983
                    $('#managedby_name').html(managerlink);
984
                    $('#managedby').val(borrowernumber);
985
                }
986
            }
987
949
            $(document).ready(function(){
988
            $(document).ready(function(){
950
                calcNewsuggTotal();
989
                calcNewsuggTotal();
951
                $("#quantity,#price,#currency").on("change",function(){
990
                $("#quantity,#price,#currency").on("change",function(){
Lines 969-974 Link Here
969
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
1008
                    $(".select-reason").show().find("option[value='']").attr("selected","selected");
970
                    $("#other_reason").hide();
1009
                    $("#other_reason").hide();
971
                });
1010
                });
1011
1012
                $("#edit_manager").on("click",function(e){
1013
                    e.preventDefault();
1014
                    editManagerPopup();
1015
                });
1016
                $("#restore_previous_manager").on("click",function(e){
1017
                    e.preventDefault();
1018
1019
                    $("#managedby_name").empty();
1020
                    $("#managedby").val('');
1021
                    var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]";
1022
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
1023
                        + '?borrowernumber=[% managedby_borrowernumber | html %]">'
1024
                        + borrowername + '</a>';
1025
                    $('#managedby_name').html(managerlink);
1026
                    $('#managedby').val([% managedby_borrowernumber | html %]);
1027
                });
972
            });
1028
            });
973
        </script>
1029
        </script>
974
    [% END %]
1030
    [% END %]
(-)a/suggestion/suggestion.pl (-2 / +2 lines)
Lines 155-161 if ( $op =~ /save/i ) { Link Here
155
                $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
155
                $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
156
            }
156
            }
157
            $suggestion_only->{manageddate} = dt_from_string;
157
            $suggestion_only->{manageddate} = dt_from_string;
158
            $suggestion_only->{"managedby"}   = C4::Context->userenv->{number};
158
            $suggestion_only->{"managedby"} ||= C4::Context->userenv->{number};
159
        }
159
        }
160
160
161
        my $otherreason = $input->param('other_reason');
161
        my $otherreason = $input->param('other_reason');
Lines 335-340 foreach my $element ( qw(managedby suggestedby acceptedby) ) { Link Here
335
        my $patron = Koha::Patrons->find( $$suggestion_ref{$element} );
335
        my $patron = Koha::Patrons->find( $$suggestion_ref{$element} );
336
        my $category = $patron->category;
336
        my $category = $patron->category;
337
        $template->param(
337
        $template->param(
338
            $element."_patron"=> $patron,
338
            $element."_borrowernumber"=>$patron->borrowernumber,
339
            $element."_borrowernumber"=>$patron->borrowernumber,
339
            $element."_firstname"=>$patron->firstname,
340
            $element."_firstname"=>$patron->firstname,
340
            $element."_surname"=>$patron->surname,
341
            $element."_surname"=>$patron->surname,
341
- 

Return to bug 23590