Attachment #19085 for bug #9307

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

Lines 81-87 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-1 / +1 lines)
81	<fieldset class="rows"><ol>	81	<fieldset class="rows"><ol>
82	<li>	82	<li>
83	[% IF ( action_add_category ) %]<label for="category">Category: </label>	83	[% IF ( action_add_category ) %]<label for="category">Category: </label>
84	<input type="text" name="category" id="category" size="10" maxlength="10" class="focus" />	84	<input type="text" name="category" id="category" size="16" maxlength="16" class="focus" />
85	[% ELSE %]<span class="label">Category</span>	85	[% ELSE %]<span class="label">Category</span>
86	<input type="hidden" name="category" value="[% category %]" /> [% category %]	86	<input type="hidden" name="category" value="[% category %]" /> [% category %]
87	[% END %]	87	[% END %]

Lines 36-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt (+2 lines)
36		36
37	<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>	37	<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
38		38
		39	<p><strong>Customization:</strong> You can create additional custom suggestion statuses by creating new authorised values of the category SUGGEST_STATUS</p>
		40
39	<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.12/en/managesuggest.html">manual</a> (online).</strong></p>	41	<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.12/en/managesuggest.html">manual</a> (online).</strong></p>
40		42
41	[% INCLUDE 'help-bottom.inc' %]	43	[% INCLUDE 'help-bottom.inc' %]




[% USE KohaAuthorisedValues %]
[% USE KohaBranchName %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions  &rsaquo;
    [% IF ( op_save ) %]

      <ol>
        <li>
          <span class="label">Status:</span>
          [% SET status_found = 0 %]
          [% IF ( STATUS == 'ASKED' ) %]
              Pending
              [% SET status_found = 1 %]
          [% ELSIF ( STATUS == 'ACCEPTED' ) %]
              Accepted
              [% SET status_found = 1 %]
          [% ELSIF ( STATUS == 'CHECKED' ) %]
              Checked
              [% SET status_found = 1 %]
          [% ELSIF ( STATUS == 'REJECTED' ) %]
              Rejected
              [% SET status_found = 1 %]
          [% ELSE %]
              [% FOREACH s IN SuggestionStatuses %]
                  [% IF STATUS == s.authorised_value %]
                      [% s.lib %]
                      [% SET status_found = 1 %]
                  [% END %]
              [% END %]
          [% END %]

        </li>
        <li>
          <table>

            <tr>
                <th><span class="label">Suggestion creation</span> </th>
                <td>[% suggesteddate %]</td>
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
                </td>
            </tr>
            <tr>
                <th><span class="label">Suggestion management</span> </th>
                <td>[% manageddate %]</td>
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
            </tr>
            <tr>
                <th><span class="label">Suggestion accepted</span> </th>
                <td>[% accepteddate %]</td>
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
            </tr>
            </tbody>
        </table></li></ol>

    </fieldset>
    <fieldset class="rows"> <legend>Suggestion management</legend>
       <ol>
            [% IF ( suggestionid ) %]
                <li>
                    <label for="status">Status:</label>
                    <select id="STATUS" name="STATUS">
                        <option value="">No Status</option>

                        [% IF (statusselected_ASKED ) %]
                            <option value="ASKED" selected="selected">Pending</option>
                        [% ELSE %]
                            <option value="ASKED">Pending</option>
                        [% END %]

                        [% IF (statusselected_ACCEPTED ) %]
                            <option value="ACCEPTED" selected="selected">Accepted</option>
                        [% ELSE %]
                            <option value="ACCEPTED">Accepted</option>
                        [% END %]

                        [% IF (statusselected_CHECKED ) %]
                            <option value="CHECKED" selected="selected">Checked</option>
                        [% ELSE %]
                            <option value="CHECKED">Checked</option>
                        [% END %]

                        [% IF ( statusselected_REJECTED ) %]
                            <option value="REJECTED" selected="selected">Rejected</option>
                        [% ELSE %]
                            <option value="REJECTED">Rejected</option>
                        [% END %]

                        [% FOREACH s IN SuggestionStatuses %]
                            [% IF s.authorised_value == selected_status %]
                                <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
                            [% ELSE %]
                                <option value="[% s.authorised_value %]">[% s.lib %]</option>
                            [% END %]
                        [% END %]
                    </select>
                </li>
            [% END %]
        <li><table>
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
            <tbody>
            <tr>
                <th><label for="suggesteddate">Suggestion creation</label> </th>
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
                <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>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
                </td>
            </tr>
            <tr>
                <th><label for="managedon">Suggestion management</label> </th>
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
                <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> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
            </tr>
            <tr>
                <th><label for="accepteddate">Suggestion accepted</label> </th>
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
                <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> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
            </tr>
            </tbody>
        </table></li></ol>

<h1>Suggestions management</h1>

[% UNLESS ( notabs ) %]
    <div id="suggestiontabs" class="toptabs">
    <ul class="ui-tabs-nav">
        [% FOREACH suggestion IN suggestions %]
            [% IF ( suggestion.first ) %]
                <li class="ui-tabs-selected">
            [% ELSE %]
                <li>
            [% END %]

            <a href="#[% suggestion.suggestiontype %]">
            [% IF ( suggestion.suggestiontypelabel ) %]
                [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
                [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
                [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked
                [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
                [% ELSE %][% suggestion.suggestiontypelabel %][% END %]
            [% ELSE %]
                [% IF ( suggestion.suggestiontype ) %]
                    [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) %]
                [% ELSE %]
                    No name
                [% END %]
            [% END %]
            ([% suggestion.suggestions_loop.size %])</a></li>

        [% END %]
    </ul>
[% END %]


                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
                </td>
                <td>
                    [% suggestions_loo.branchcode | $KohaBranchName %]
                </td>
                <td>
                    [% suggestions_loo.budget_name %]
                </td>
                <td>
                    [% IF ( suggestions_loo.ASKED ) %]
                        Pending
                    [% ELSIF ( suggestions_loo.ACCEPTED ) %]
                        Accepted
                    [% ELSIF ( suggestions_loo.ORDERED ) %]
                        Ordered
                    [% ELSIF ( suggestions_loo.REJECTED ) %]
                        Rejected
                    [% ELSIF ( suggestions_loo.CHECKED ) %]
                        Checked
                    [% ELSIF KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
                        [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
                    [% END %]

                    [% IF ( suggestions_loo.reason ) %]
                        <br />([% suggestions_loo.reason %])
                    [% END %]
                </td>
        </tr>
        [% END %]</tbody>
        </table>  <fieldset>
    <div id="select-reason[% suggestion.suggestiontype %]">
        <div id="status[% suggestion.suggestiontype %]">
            <label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label>
            <select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
                <option value=""> -- Choose a status --</option>

                [% IF (statusselected_ASKED ) %]
                    <option value="ASKED" selected="selected">Pending</option>
                [% ELSE %]
                    <option value="ASKED">Pending</option>
                [% END %]

                [% IF (statusselected_ACCEPTED ) %]
                    <option value="ACCEPTED" selected="selected">Accepted</option>
                [% ELSE %]
                    <option value="ACCEPTED">Accepted</option>
                [% END %]

                [% IF (statusselected_CHECKED ) %]
                    <option value="CHECKED" selected="selected">Checked</option>
                [% ELSE %]
                    <option value="CHECKED">Checked</option>
                [% END %]

                [% IF ( statusselected_REJECTED ) %]
                    <option value="REJECTED" selected="selected">Rejected</option>
                [% ELSE %]
                    <option value="REJECTED">Rejected</option>
                [% END %]

                [% FOREACH s IN SuggestionStatuses %]
                    <option value="[% s.authorised_value %]">[% s.lib %]</option>
                [% END %]
            </select>

            <label for="reason[% suggestion.suggestiontype %]">with this reason:</label>
            <select id="reason[% suggestion.suggestiontype %]" name="reason[% suggestion.suggestiontype %]">
                <option value=""> -- Choose a reason -- </option>
                [% FOREACH reasonsloo IN suggestion.reasonsloop %]
                    <option value="[% reasonsloo.lib %]">[% reasonsloo.lib %]</option>
                [% END %]
                <option value="other">Others...</option>
            </select>

            <span id="other_reason[% suggestion.suggestiontype %]">
                <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype %]" name="other_reason[% suggestion.suggestiontype %]" value="please note your reason here..." />
                <a href="#back[% suggestion.suggestiontype %]">Cancel</a>
            </span>

            <strong style="padding: 0 1em;">OR:</strong>

            <label for="[% suggestion.suggestiontype %]delete">Delete selected</label>
            <input type="checkbox" name="op" id="[% suggestion.suggestiontype %]delete" />
        </div>
    </div>


    <input type="hidden" name="tabcode" value="[% suggestion.suggestiontype %]" />

                </fieldset>
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
                    <ol>
                      <li>
                          <label for="STATUS"> Status:</label>
                          <select name="STATUS" id="STATUS">
                              <option value="">Any</option>

                              [% IF (statusselected_ASKED ) %]
                                  <option value="ASKED" selected="selected">Pending</option>
                              [% ELSE %]
                                  <option value="ASKED">Pending</option>
                              [% END %]

                              [% IF (statusselected_ACCEPTED ) %]
                                  <option value="ACCEPTED" selected="selected">Accepted</option>
                              [% ELSE %]
                                  <option value="ACCEPTED">Accepted</option>
                              [% END %]

                              [% IF (statusselected_CHECKED ) %]
                                  <option value="CHECKED" selected="selected">Checked</option>
                              [% ELSE %]
                                  <option value="CHECKED">Checked</option>
                              [% END %]

                              [% IF ( statusselected_REJECTED ) %]
                                  <option value="REJECTED" selected="selected">Rejected</option>
                              [% ELSE %]
                                  <option value="REJECTED">Rejected</option>
                              [% END %]

                              [% FOREACH s IN SuggestionStatuses %]
                                  [% IF s.authorised_value == selected_status %]
                                      <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
                                  [% ELSE %]
                                      <option value="[% s.authorised_value %]">[% s.lib %]</option>
                                  [% END %]
                              [% END %]
                          </select>
                      </li>

                    <li><label for="suggestedby"> Suggested by:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
[% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
                                                                     </select></li>

Lines 58-63 sub Init{ Link Here

(-)a/suggestion/suggestion.pl (-1 / +7 lines)
58		58
59	sub GetCriteriumDesc{	59	sub GetCriteriumDesc{
60	my ($criteriumvalue,$displayby)=@_;	60	my ($criteriumvalue,$displayby)=@_;
		61	unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
		62	return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) \|\| "Unknown";
		63	}
61	return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);	64	return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
62	return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);	65	return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
63	return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);	66	return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
Lines 383-386 foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { Link Here
383	$hashlists{ lc($field) . "_loop" } = \@codes_list;	386	$hashlists{ lc($field) . "_loop" } = \@codes_list;
384	}	387	}
385	$template->param(%hashlists);	388	$template->param(%hashlists);
		389	$template->param(
		390	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
		391	SuggestionStatuses => GetAuthorisedValues('SUGGEST_STATUS'),
		392	);
386	output_html_with_http_headers $input, $cookie, $template->output;	393	output_html_with_http_headers $input, $cookie, $template->output;
387	-

Return to bug 9307

Lines 1-3 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt (-6 / +9 lines)
		1	[% USE KohaAuthorisedValues %]
1	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;	2	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
2	[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]	3	[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
3	[% IF ( op_else ) %]Purchase Suggestions[% END %]	4	[% IF ( op_else ) %]Purchase Suggestions[% END %]
Lines 216-227 $.tablesorter.addParser({ Link Here
216	[% IF ( suggestions_loo.surnamemanagedby ) %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby %][% ELSE %] [% END %]	217	[% IF ( suggestions_loo.surnamemanagedby ) %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby %][% ELSE %] [% END %]
217	</td>	218	</td>
218	<td>	219	<td>
219	[% IF ( suggestions_loo.ASKED ) %]Requested[% END %]	220	[% IF ( suggestions_loo.ASKED ) %]Requested
220	[% IF ( suggestions_loo.CHECKED ) %]Checked by the library[% END %]	221	[% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library
221	[% IF ( suggestions_loo.ACCEPTED ) %]Accepted by the library[% END %]	222	[% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library
222	[% IF ( suggestions_loo.ORDERED ) %]Ordered by the library[% END %]	223	[% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library
223	[% IF ( suggestions_loo.REJECTED ) %]Suggestion declined [% END %]	224	[% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
224	[% IF ( suggestions_loo.AVAILABLE ) %]Available in the library[% END %]	225	[% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
		226	[% ELSE %] [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %]
		227
225	[% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %]	228	[% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %]
226	</td>	229	</td>
227	</tr>	230	</tr>