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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl (-12 / +17 lines)
Lines 124-133 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
124
    </fieldset>
124
    </fieldset>
125
    <fieldset class="rows"> <legend>Suggestion management</legend>
125
    <fieldset class="rows"> <legend>Suggestion management</legend>
126
       <ol>
126
       <ol>
127
            <!--TMPL_IF Name="suggestionid"--><li><label for="status">Status:</label><select id="status" name="status"><option value="">No Status</option>
127
            <!--TMPL_IF Name="suggestionid"--><li><label for="status">Status:</label><select id="STATUS" name="STATUS"><option value="">No Status</option>
128
                <!-- TMPL_LOOP name="status_loop" -->
128
                <option value="ASKED"<!-- TMPL_IF NAME="statusselected_ASKED" --> selected="selected"<!--/TMPL_IF-->>Asked</option>
129
                    <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF -->
129
                <option value="ACCEPTED"<!-- TMPL_IF NAME="statusselected_ACCEPTED" --> selected="selected"<!--/TMPL_IF-->>Accepted</option>
130
                <!-- /TMPL_LOOP -->
130
                <option value="CHECKED"<!-- TMPL_IF NAME="statusselected_CHECKED" --> selected="selected"<!--/TMPL_IF-->>Checked</option>
131
                <option value="REJECTED"<!-- TMPL_IF NAME="statusselected_REJECTED" --> selected="selected"<!--/TMPL_IF-->>Rejected</option>
131
            </select></li><!--/TMPL_IF-->
132
            </select></li><!--/TMPL_IF-->
132
        <li><table>
133
        <li><table>
133
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
134
            <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
Lines 178-185 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
178
                </li><li><label for="total">Total</label>
179
                </li><li><label for="total">Total</label>
179
			<input type="text" readonly="readonly" id="total" name="total" size="10" value="<!--TMPL_VAR Name="total"-->"/>
180
			<input type="text" readonly="readonly" id="total" name="total" size="10" value="<!--TMPL_VAR Name="total"-->"/>
180
                </li></ol>
181
                </li></ol>
181
    </fieldset>
182
    </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="<!--TMPL_IF Name="returnsuggestedby"--><!--TMPL_VAR Name="returnsuggestedby"--><!-- TMPL_ELSE -->noone<!--/TMPL_IF-->"/>
182
    <fieldset class="action"><input type="hidden" name="op" value="<!--TMPL_VAR Name="op"-->" /><!--TMPL_IF Name="suggestionid"--><input type="submit" value="Save" /> <a class="cancel" href="suggestion.pl?suggestionid=<!--TMPL_VAR Name="suggestionid"-->">Cancel</a><!--TMPL_ELSE--><input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a><!--/TMPL_IF-->
183
    <fieldset class="action"><input type="hidden" name="op" value="<!--TMPL_VAR Name="op"-->" /><!--TMPL_IF Name="suggestionid"--><input type="submit" value="Save" /> <a class="cancel" href="<!--TMPL_IF Name="returnsuggestedby"-->/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="returnsuggestedby"-->#suggestions<!-- TMPL_ELSE -->suggestion.pl?suggestionid=<!--TMPL_VAR Name="suggestionid"--><!--/TMPL_IF-->">Cancel</a><!--TMPL_ELSE--><input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a><!--/TMPL_IF-->
183
    </fieldset>
184
    </fieldset>
184
    </form>
185
    </form>
185
<!-- /TMPL_IF -->
186
<!-- /TMPL_IF -->
Lines 250-256 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
250
                    <!-- TMPL_VAR name="budget_name" -->
251
                    <!-- TMPL_VAR name="budget_name" -->
251
                </td>
252
                </td>
252
                <td>
253
                <td>
253
                    <!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF --> <!-- TMPL_IF name="ACCEPTED" -->Accepted<!-- /TMPL_IF --> <!-- TMPL_IF name="ORDERED" -->Ordered<!-- /TMPL_IF --> <!-- TMPL_IF name="REJECTED" -->Rejected<!-- /TMPL_IF --> <!-- TMPL_IF name="CHECKED" -->Checked<!-- /TMPL_IF --> <!-- TMPL_IF name="reason" --><br />(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
254
                    <!-- TMPL_IF name="ASKED" -->Asked<!-- /TMPL_IF --> <!-- TMPL_IF name="ACCEPTED" -->Accepted<!-- /TMPL_IF --> <!-- TMPL_IF name="ORDERED" -->Ordered<!-- /TMPL_IF --> <!-- TMPL_IF name="REJECTED" -->Rejected<!-- /TMPL_IF --> <!-- TMPL_IF name="CHECKED" -->Checked<!-- /TMPL_IF --> <!-- TMPL_IF name="reason" --><br />(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
254
                </td>
255
                </td>
255
        </tr>
256
        </tr>
256
        <!-- /TMPL_LOOP --></tbody>
257
        <!-- /TMPL_LOOP --></tbody>
Lines 259-267 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
259
        <div id="status<!-- TMPL_VAR NAME="suggestiontype" -->">
260
        <div id="status<!-- TMPL_VAR NAME="suggestiontype" -->">
260
	<label for="STATUS<!-- TMPL_VAR NAME="suggestiontype" -->">Mark selected as: </label><select name="STATUS" id="STATUS<!-- TMPL_VAR NAME="suggestiontype" -->">
261
	<label for="STATUS<!-- TMPL_VAR NAME="suggestiontype" -->">Mark selected as: </label><select name="STATUS" id="STATUS<!-- TMPL_VAR NAME="suggestiontype" -->">
261
	<option value=""> -- Choose a status --</option>
262
	<option value=""> -- Choose a status --</option>
262
	<option value="ACCEPTED">Accepted</option>
263
	<option value="ASKED"<!-- TMPL_IF NAME="statusselected_ASKED" --> selected="selected"<!--/TMPL_IF-->>Asked</option>
263
	<option value="CHECKED">Checked</option>
264
	<option value="ACCEPTED"<!-- TMPL_IF NAME="statusselected_ACCEPTED" --> selected="selected"<!--/TMPL_IF-->>Accepted</option>
264
	<option value="REJECTED">Rejected</option>
265
	<option value="CHECKED"<!-- TMPL_IF NAME="statusselected_CHECKED" --> selected="selected"<!--/TMPL_IF-->>Checked</option>
266
	<option value="REJECTED"<!-- TMPL_IF NAME="statusselected_REJECTED" --> selected="selected"<!--/TMPL_IF-->>Rejected</option>
265
	</select>
267
	</select>
266
    <label for="reason<!-- TMPL_VAR NAME="suggestiontype" -->">with this reason:</label>                 <select id="reason<!-- TMPL_VAR NAME="suggestiontype" -->" name="reason<!-- TMPL_VAR NAME="suggestiontype" -->">
268
    <label for="reason<!-- TMPL_VAR NAME="suggestiontype" -->">with this reason:</label>                 <select id="reason<!-- TMPL_VAR NAME="suggestiontype" -->" name="reason<!-- TMPL_VAR NAME="suggestiontype" -->">
267
                    <option value=""> -- Choose a reason -- </option>
269
                    <option value=""> -- Choose a reason -- </option>
Lines 313-320 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
313
                    <li><label for="collectiontitle"> Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="<!-- TMPL_VAR name="collectiontitle"-->" /></li><li><input type="submit" value="Go" /></li></ol>
315
                    <li><label for="collectiontitle"> Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="<!-- TMPL_VAR name="collectiontitle"-->" /></li><li><input type="submit" value="Go" /></li></ol>
314
                </fieldset>
316
                </fieldset>
315
				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
317
				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
316
                    <ol><li><label for="status"> Status:</label><select name="status" id="status"><option value="">Any</option>
318
                    <ol><li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
317
<!-- TMPL_LOOP name="status_loop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
319
                    	<option value="ASKED"<!-- TMPL_IF NAME="statusselected_ASKED" --> selected="selected"<!--/TMPL_IF-->>Asked</option>
320
						<option value="ACCEPTED"<!-- TMPL_IF NAME="statusselected_ACCEPTED" --> selected="selected"<!--/TMPL_IF-->>Accepted</option>
321
						<option value="CHECKED"<!-- TMPL_IF NAME="statusselected_CHECKED" --> selected="selected"<!--/TMPL_IF-->>Checked</option>
322
						<option value="REJECTED"<!-- TMPL_IF NAME="statusselected_REJECTED" --> selected="selected"<!--/TMPL_IF-->>Rejected</option>
318
                                                          </select></li>
323
                                                          </select></li>
319
                    <li><label for="suggestedby"> Suggested By:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
324
                    <li><label for="suggestedby"> Suggested By:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
320
<!-- TMPL_LOOP name="suggestedby_loop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
325
<!-- TMPL_LOOP name="suggestedby_loop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
(-)a/suggestion/suggestion.pl (-3 / +11 lines)
Lines 72-83 my $op = $input->param('op')||'else'; Link Here
72
my @editsuggestions = $input->param('edit_field');
72
my @editsuggestions = $input->param('edit_field');
73
my $branchfilter   = $input->param('branchcode');
73
my $branchfilter   = $input->param('branchcode');
74
my $suggestedby    = $input->param('suggestedby');
74
my $suggestedby    = $input->param('suggestedby');
75
my $returnsuggested = $input->param('returnsuggested');
76
my $returnsuggestedby = $input->param('returnsuggestedby');
75
my $managedby    = $input->param('managedby');
77
my $managedby    = $input->param('managedby');
76
my $displayby    = $input->param('displayby');
78
my $displayby    = $input->param('displayby');
77
my $tabcode    = $input->param('tabcode');
79
my $tabcode    = $input->param('tabcode');
78
80
79
# filter informations which are not suggestion related.
81
# filter informations which are not suggestion related.
80
my $suggestion_ref  = $input->Vars;
82
my $suggestion_ref  = $input->Vars;
83
81
delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode edit_field );
84
delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode edit_field );
82
foreach (keys %$suggestion_ref){
85
foreach (keys %$suggestion_ref){
83
    delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' || $op eq 'change'));
86
    delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' || $op eq 'change'));
Lines 199-205 if ($op=~/else/) { Link Here
199
    );
202
    );
200
}
203
}
201
204
202
foreach my $element qw(managedby suggestedby){
205
foreach my $element qw(managedby suggestedby acceptedby) {
203
#    $debug || warn $$suggestion_ref{$element};
206
#    $debug || warn $$suggestion_ref{$element};
204
    if ($$suggestion_ref{$element}){
207
    if ($$suggestion_ref{$element}){
205
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
208
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
Lines 220-225 $template->param( Link Here
220
    "op"             =>$op,
223
    "op"             =>$op,
221
);
224
);
222
225
226
if(defined($returnsuggested) and $returnsuggested ne "noone")
227
{
228
	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
229
}
223
230
224
####################
231
####################
225
## Initializing selection lists
232
## Initializing selection lists
Lines 258-263 foreach my $support(@$supportlist){ Link Here
258
    }
265
    }
259
}
266
}
260
$template->param(itemtypeloop=>$supportlist);
267
$template->param(itemtypeloop=>$supportlist);
268
$template->param( returnsuggestedby => $returnsuggestedby );
261
269
262
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patronreason'});
270
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patronreason'});
263
$template->param(patron_reason_loop=>$patron_reason_loop);
271
$template->param(patron_reason_loop=>$patron_reason_loop);
Lines 271-276 foreach my $budget (@$budgets){ Link Here
271
};
279
};
272
280
273
$template->param( budgetsloop => $budgets);
281
$template->param( budgetsloop => $budgets);
282
$template->param( "statusselected_$$suggestion_ref{'STATUS'}" =>1);
274
283
275
# get currencies and rates
284
# get currencies and rates
276
my @rates = GetCurrencies();
285
my @rates = GetCurrencies();
Lines 293-299 $template->param( Link Here
293
);
302
);
294
303
295
my %hashlists;
304
my %hashlists;
296
foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) {
305
foreach my $field qw(managedby acceptedby suggestedby budgetid) {
297
    my $values_list;
306
    my $values_list;
298
    $values_list=GetDistinctValues("suggestions.".$field) ;
307
    $values_list=GetDistinctValues("suggestions.".$field) ;
299
    my @codes_list = map{
308
    my @codes_list = map{
300
- 

Return to bug 5870