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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-17 / +17 lines)
Lines 165-173 Link Here
165
                <th>Created by:</th>
165
                <th>Created by:</th>
166
                <td>[% suggesteddate | $KohaDates %]</td>
166
                <td>[% suggesteddate | $KohaDates %]</td>
167
                <td>
167
                <td>
168
                    [% IF ( suggestedby_borrowernumber ) %]
168
                    [% IF ( suggestedby_patron.borrowernumber ) %]
169
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
169
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a>
170
                        [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])
170
                        [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])
171
                    [% END %]
171
                    [% END %]
172
                </td>
172
                </td>
173
            </tr>
173
            </tr>
Lines 175-183 Link Here
175
                <th>Managed by:</th>
175
                <th>Managed by:</th>
176
                <td>[% manageddate | $KohaDates %]</td>
176
                <td>[% manageddate | $KohaDates %]</td>
177
                <td>
177
                <td>
178
                        [% IF ( managedby_borrowernumber ) %]
178
                        [% IF ( managedby_patron.borrowernumber ) %]
179
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
179
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_patron.borrowernumber | uri %]">[% managedby_patron.surname | html %], [% managedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a>
180
                            [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
180
                            [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %])
181
                        [% END %]
181
                        [% END %]
182
                </td>
182
                </td>
183
            </tr>
183
            </tr>
Lines 185-193 Link Here
185
                <th>Accepted on:</th>
185
                <th>Accepted on:</th>
186
                <td>[% accepteddate | $KohaDates %]</td>
186
                <td>[% accepteddate | $KohaDates %]</td>
187
                <td>
187
                <td>
188
                    [% IF ( acceptedby_borrowernumber ) %]
188
                    [% IF ( acceptedby_patron.borrowernumber ) %]
189
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
189
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a>
190
                        [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])
190
                        [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %])
191
                    [% END %]
191
                    [% END %]
192
                </td>
192
                </td>
193
            </tr>
193
            </tr>
Lines 362-374 Link Here
362
            <tr>
362
            <tr>
363
                <th><label for="suggesteddate">Created by:</label> </th>
363
                <th><label for="suggesteddate">Created by:</label> </th>
364
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
364
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
365
                <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 %]
365
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a>  [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])[% END %]
366
                </td>
366
                </td>
367
            </tr>
367
            </tr>
368
            <tr>
368
            <tr>
369
                <th><label for="accepteddate">Accepted on:</label> </th>
369
                <th><label for="accepteddate">Accepted on:</label> </th>
370
                <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>
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>
371
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %])[% END %]</td>
372
            </tr>
372
            </tr>
373
            </tbody>
373
            </tbody>
374
        </table></li>
374
        </table></li>
Lines 383-394 Link Here
383
                    <span id="managedby_name">
383
                    <span id="managedby_name">
384
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
384
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
385
                    </span>
385
                    </span>
386
                    [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %]
386
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.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 %])
387
                        | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %])
388
                    [% END %]
388
                    [% END %]
389
                    <br />
389
                    <br />
390
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
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 %]
391
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %]
392
                        <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a>
392
                        <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a>
393
                    [% END %]
393
                    [% END %]
394
                    <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
394
                    <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
Lines 1018-1029 Link Here
1018
1018
1019
                    $("#managedby_name").empty();
1019
                    $("#managedby_name").empty();
1020
                    $("#managedby").val('');
1020
                    $("#managedby").val('');
1021
                    var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]";
1021
                    var borrowername = "[% managedby_patron.firstname | html %] [% managedby_patron.surname | html %]";
1022
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
1022
                    var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
1023
                        + '?borrowernumber=[% managedby_borrowernumber | html %]">'
1023
                        + '?borrowernumber=[% managedby_patron.borrowernumber | html %]">'
1024
                        + borrowername + '</a>';
1024
                        + borrowername + '</a>';
1025
                    $('#managedby_name').html(managerlink);
1025
                    $('#managedby_name').html(managerlink);
1026
                    $('#managedby').val([% managedby_borrowernumber | html %]);
1026
                    $('#managedby').val([% managedby_patron.borrowernumber | html %]);
1027
                });
1027
                });
1028
            });
1028
            });
1029
        </script>
1029
        </script>
(-)a/suggestion/suggestion.pl (-19 / +5 lines)
Lines 329-353 if ($op=~/else/) { Link Here
329
    );
329
    );
330
}
330
}
331
331
332
foreach my $element ( qw(managedby suggestedby acceptedby) ) {
333
#    $debug || warn $$suggestion_ref{$element};
334
    if ($$suggestion_ref{$element}){
335
        my $patron = Koha::Patrons->find( $$suggestion_ref{$element} );
336
        my $category = $patron->category;
337
        $template->param(
338
            $element."_patron"=> $patron,
339
            $element."_borrowernumber"=>$patron->borrowernumber,
340
            $element."_firstname"=>$patron->firstname,
341
            $element."_surname"=>$patron->surname,
342
            $element."_cardnumber"=>$patron->cardnumber,
343
            $element."_branchcode"=>$patron->branchcode,
344
            $element."_description"=>$category->description,
345
            $element."_category_type"=>$category->category_type,
346
        );
347
    }
348
}
349
$template->param(
332
$template->param(
350
    %$suggestion_ref,  
333
    "${_}_patron" => scalar Koha::Patrons->find( $suggestion_ref->{$_} ) )
334
  for qw(managedby suggestedby acceptedby);
335
336
$template->param(
337
    %$suggestion_ref,
351
    "op_$op"                => 1,
338
    "op_$op"                => 1,
352
    "op"             =>$op,
339
    "op"             =>$op,
353
);
340
);
354
- 

Return to bug 23590