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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-8 / +9 lines)
Lines 1-5 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% USE KohaDates %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Acquisitions  &rsaquo;
5
<title>Koha &rsaquo; Acquisitions  &rsaquo;
5
    [% IF ( op_save ) %]
6
    [% IF ( op_save ) %]
Lines 261-278 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
261
            <tbody>
262
            <tbody>
262
            <tr>
263
            <tr>
263
                <th><span class="label">Suggestion creation</span> </th>
264
                <th><span class="label">Suggestion creation</span> </th>
264
                <td>[% suggesteddate %]</td>
265
                <td>[% suggesteddate | $KohaDates %]</td>
265
                <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 %]
266
                <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 %]
266
                </td>
267
                </td>
267
            </tr>
268
            </tr>
268
            <tr>
269
            <tr>
269
                <th><span class="label">Suggestion management</span> </th>
270
                <th><span class="label">Suggestion management</span> </th>
270
                <td>[% manageddate %]</td>
271
                <td>[% manageddate | $KohaDates %]</td>
271
                <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>
272
                <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>
272
            </tr>
273
            </tr>
273
            <tr>
274
            <tr>
274
                <th><span class="label">Suggestion accepted</span> </th>
275
                <th><span class="label">Suggestion accepted</span> </th>
275
                <td>[% accepteddate %]</td>
276
                <td>[% accepteddate | $KohaDates %]</td>
276
                <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>
277
                <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>
277
            </tr>
278
            </tr>
278
            </tbody>
279
            </tbody>
Lines 397-414 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
397
            <tbody>
398
            <tbody>
398
            <tr>
399
            <tr>
399
                <th><label for="suggesteddate">Suggestion creation</label> </th>
400
                <th><label for="suggesteddate">Suggestion creation</label> </th>
400
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
401
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/></td>
401
                <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 %]
402
                <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 %]
402
                </td>
403
                </td>
403
            </tr>
404
            </tr>
404
            <tr>
405
            <tr>
405
                <th><label for="managedon">Suggestion management</label> </th>
406
                <th><label for="managedon">Suggestion management</label> </th>
406
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
407
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" /></td>
407
                <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>
408
                <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>
408
            </tr>
409
            </tr>
409
            <tr>
410
            <tr>
410
                <th><label for="accepteddate">Suggestion accepted</label> </th>
411
                <th><label for="accepteddate">Suggestion accepted</label> </th>
411
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
412
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" /></td>
412
                <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>
413
                <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>
413
            </tr>
414
            </tr>
414
            </tbody>
415
            </tbody>
Lines 515-525 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
515
                </td>
516
                </td>
516
                <td>
517
                <td>
517
                    [% 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.emailsuggestedby ) %]</a>[% END %]
518
                    [% 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.emailsuggestedby ) %]</a>[% END %]
518
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate %][% END %]
519
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
519
                </td>
520
                </td>
520
                <td>
521
                <td>
521
                    [% 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 %]
522
                    [% 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 %]
522
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
523
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
523
                </td>
524
                </td>
524
                <td>
525
                <td>
525
                    [% Branches.GetName( suggestions_loo.branchcode ) %]
526
                    [% Branches.GetName( suggestions_loo.branchcode ) %]
(-)a/suggestion/suggestion.pl (-19 / +2 lines)
Lines 28-34 use C4::Koha; #GetItemTypes Link Here
28
use C4::Branch;
28
use C4::Branch;
29
use C4::Budgets;
29
use C4::Budgets;
30
use C4::Search;
30
use C4::Search;
31
use C4::Dates qw(format_date);
32
use C4::Members;
31
use C4::Members;
33
use C4::Debug;
32
use C4::Debug;
34
33
Lines 41-61 sub Init{ Link Here
41
    # "Managed by" is used only when a suggestion is being edited (not when created)
40
    # "Managed by" is used only when a suggestion is being edited (not when created)
42
    if ($suggestion->{'suggesteddate'} eq "0000-00-00" ||$suggestion->{'suggesteddate'} eq "") {
41
    if ($suggestion->{'suggesteddate'} eq "0000-00-00" ||$suggestion->{'suggesteddate'} eq "") {
43
        # new suggestion
42
        # new suggestion
44
        $suggestion->{'suggesteddate'} = C4::Dates->today;
43
        $suggestion->{suggesteddate} = dt_from_string;
45
        $suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'suggestedby'});
44
        $suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'suggestedby'});
46
    }
45
    }
47
    else {
46
    else {
48
        # editing of an existing suggestion
47
        # editing of an existing suggestion
49
        $suggestion->{'manageddate'} = C4::Dates->today;
48
        $suggestion->{manageddate} = dt_from_string;
50
        $suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
49
        $suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
51
        # suggesteddate, when coming from the DB, needs to be formated
52
        $suggestion->{'suggesteddate'} = format_date($suggestion->{'suggesteddate'});
53
    }
54
    foreach my $date ( qw(rejecteddate accepteddate) ){
55
    $suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
56
                                "":
57
                                format_date($suggestion->{$date}) 
58
                              );
59
    }
50
    }
60
    $suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
51
    $suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
61
}
52
}
Lines 258-270 if ($op=~/else/) { Link Here
258
                my $bud = GetBudget( $suggestion->{budgetid} );
249
                my $bud = GetBudget( $suggestion->{budgetid} );
259
                $suggestion->{budget_name} = $bud->{budget_name} if $bud;
250
                $suggestion->{budget_name} = $bud->{budget_name} if $bud;
260
            }
251
            }
261
            foreach my $date (qw(suggesteddate manageddate accepteddate)) {
262
                if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00") {
263
                    $suggestion->{$date} = format_date( $suggestion->{$date} );
264
                } else {
265
                    $suggestion->{$date} = "";
266
                }
267
            }
268
        }
252
        }
269
        push @allsuggestions,{
253
        push @allsuggestions,{
270
                            "suggestiontype"=>$criteriumvalue||"suggest",
254
                            "suggestiontype"=>$criteriumvalue||"suggest",
271
- 

Return to bug 12627