Attachment #100610 for bug #24159

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




                chargeperiod                     => undef,
                chargeperiod_charge_at           => undef,
                issuelength                      => undef,
                useDaysMode                      => undef,
                lengthunit                       => undef,
                hardduedate                      => undef,
                hardduedatecompare               => undef,

    my $onshelfholds     = $input->param('onshelfholds') || 0;
    my $issuelength  = $input->param('issuelength');
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
    my $useDaysMode = $input->param('useDaysMode');
    my $lengthunit  = $input->param('lengthunit');
    my $hardduedate = $input->param('hardduedate') || undef;
    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );

        chargeperiod                  => $chargeperiod,
        chargeperiod_charge_at        => $chargeperiod_charge_at,
        issuelength                   => $issuelength,
        useDaysMode                   => $useDaysMode,
        lengthunit                    => $lengthunit,
        hardduedate                   => $hardduedate,
        hardduedatecompare            => $hardduedatecompare,




                        [% SET maxissueqty = all_rules.$c.$i.maxissueqty %]
                        [% SET maxonsiteissueqty = all_rules.$c.$i.maxonsiteissueqty %]
                        [% SET issuelength = all_rules.$c.$i.issuelength %]
                        [% SET useDaysMode = all_rules.$c.$i.useDaysMode %]
                        [% SET lengthunit = all_rules.$c.$i.lengthunit %]
                        [% SET hardduedate = all_rules.$c.$i.hardduedate %]
                        [% SET hardduedatecompare = all_rules.$c.$i.hardduedatecompare %]

                        [% SET article_requests = all_rules.$c.$i.article_requests %]
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]

                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || useDaysMode || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]
                        [% IF show_rule %]
                            [% SET row_count = row_count + 1 %]
                            <tr row_countd="row_[% row_count | html %]">

                                        [% END %]
                                    </td>
                                    <td>[% issuelength | html %]</td>
                                    <td>
                                        [% SWITCH useDaysMode %]
                                        [% CASE 'Calendar' %]<span title="Use the calendar to skip days the library is closed">Calendar</span>
                                        [% CASE 'Datedue' %]<span title="Use the calendar to push the due date to the next open day">Datedue</span>
                                        [% CASE 'Days' %]<span title="Ignore the calendar">Days</span>
                                        [% CASE 'Dayweek' %]<span title="Use the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise">Dayweek</span>
                                        [% CASE %]<span title="Use the system preference 'useDaysMode' as a default value">Default</span>
                                        [% END %]
                                    <td>
                                        [% IF ( lengthunit == 'days' ) %]
                                            Days

                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
                    <td>
                        <select name="useDaysMode" id="useDaysMode">
                            <option value="">Default</option>
                            <option value="Calendar">Calendar</option>
                            <option value="Datedue">Datedue</option>
                            <option value="Days">Days</option>
                            <option value="Dayweek">Dayweek</option>
                        </select>
                    </td>
                    <td>
                      <select name="lengthunit" id="lengthunit">
                        <option value="days" selected="selected">Days</option>

                      <th>Current checkouts allowed</th>
                      <th>Current on-site checkouts allowed</th>
                      <th>Loan period</th>
                      <th>Days mode</th>
                      <th>Unit</th>
                      <th>Hard due date</th>
                      <th>Fine amount</th>

                        // specific processing for the Note column
                        var note = $(this).find("a[name='viewnote']").data("content");
                        $(current_column).find("input[type='text']").val(note);
                    } else if ( i == 9 ) {
                        // specific processing for the Hard due date column
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
                        var input_value = '';

                        }
                        $(current_column).find("input[type='text']").val(input_value);
                        $(current_column).find("select").val(select_value);
                    } else if ( i == 15 ) {
                        // specific processing for cap_fine_to_replacement_price
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );

                            // Remove potential previous input added
                            $(current_column).find("input").remove();
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
                        } else if ( i == 5 || i == 6 || i == 25 || i == 26 || i == 27 ) {
                            // If the value is not an integer for
                            //     - "Current checkouts allowed"
                            //     - "Current on-site checkouts allowed"
- 

Return to bug 24159

Lines 94-99 if ($op eq 'delete') { Link Here

(-)a/admin/smart-rules.pl (+3 lines)
94	chargeperiod => undef,	94	chargeperiod => undef,
95	chargeperiod_charge_at => undef,	95	chargeperiod_charge_at => undef,
96	issuelength => undef,	96	issuelength => undef,
		97	useDaysMode => undef,
97	lengthunit => undef,	98	lengthunit => undef,
98	hardduedate => undef,	99	hardduedate => undef,
99	hardduedatecompare => undef,	100	hardduedatecompare => undef,
Lines 277-282 elsif ($op eq 'add') { Link Here
277	my $onshelfholds = $input->param('onshelfholds') \|\| 0;	278	my $onshelfholds = $input->param('onshelfholds') \|\| 0;
278	my $issuelength = $input->param('issuelength');	279	my $issuelength = $input->param('issuelength');
279	$issuelength = $issuelength eq q{} ? undef : $issuelength;	280	$issuelength = $issuelength eq q{} ? undef : $issuelength;
		281	my $useDaysMode = $input->param('useDaysMode');
280	my $lengthunit = $input->param('lengthunit');	282	my $lengthunit = $input->param('lengthunit');
281	my $hardduedate = $input->param('hardduedate') \|\| undef;	283	my $hardduedate = $input->param('hardduedate') \|\| undef;
282	$hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );	284	$hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
Lines 302-307 elsif ($op eq 'add') { Link Here
302	chargeperiod => $chargeperiod,	304	chargeperiod => $chargeperiod,
303	chargeperiod_charge_at => $chargeperiod_charge_at,	305	chargeperiod_charge_at => $chargeperiod_charge_at,
304	issuelength => $issuelength,	306	issuelength => $issuelength,
		307	useDaysMode => $useDaysMode,
305	lengthunit => $lengthunit,	308	lengthunit => $lengthunit,
306	hardduedate => $hardduedate,	309	hardduedate => $hardduedate,
307	hardduedatecompare => $hardduedatecompare,	310	hardduedatecompare => $hardduedatecompare,

Lines 130-135 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-5 / +23 lines)
130	[% SET maxissueqty = all_rules.$c.$i.maxissueqty %]	130	[% SET maxissueqty = all_rules.$c.$i.maxissueqty %]
131	[% SET maxonsiteissueqty = all_rules.$c.$i.maxonsiteissueqty %]	131	[% SET maxonsiteissueqty = all_rules.$c.$i.maxonsiteissueqty %]
132	[% SET issuelength = all_rules.$c.$i.issuelength %]	132	[% SET issuelength = all_rules.$c.$i.issuelength %]
		133	[% SET useDaysMode = all_rules.$c.$i.useDaysMode %]
133	[% SET lengthunit = all_rules.$c.$i.lengthunit %]	134	[% SET lengthunit = all_rules.$c.$i.lengthunit %]
134	[% SET hardduedate = all_rules.$c.$i.hardduedate %]	135	[% SET hardduedate = all_rules.$c.$i.hardduedate %]
135	[% SET hardduedatecompare = all_rules.$c.$i.hardduedatecompare %]	136	[% SET hardduedatecompare = all_rules.$c.$i.hardduedatecompare %]
Lines 156-162 Link Here
156	[% SET article_requests = all_rules.$c.$i.article_requests %]	157	[% SET article_requests = all_rules.$c.$i.article_requests %]
157	[% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]	158	[% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
158		159
159	[% SET show_rule = maxissueqty \|\| maxonsiteissueqty \|\| issuelength \|\| lengthunit \|\| hardduedate \|\| hardduedatebefore \|\| hardduedateexact \|\| fine \|\| chargeperiod \|\| chargeperiod_charge_at \|\| firstremind \|\| overduefinescap \|\| cap_fine_to_replacement_price \|\| finedays \|\| maxsuspensiondays \|\| suspension_chargeperiod \|\| renewalsallowed \|\| renewalsallowed \|\| norenewalbefore \|\| auto_renew \|\| no_auto_renewal_after \|\| no_auto_renewal_after_hard_limit \|\| reservesallowed \|\| holds_per_day \|\| holds_per_record \|\| onshelfholds \|\| opacitemholds \|\| article_requests \|\| article_requests %]	160	[% SET show_rule = maxissueqty \|\| maxonsiteissueqty \|\| issuelength \|\| useDaysMode \|\| lengthunit \|\| hardduedate \|\| hardduedatebefore \|\| hardduedateexact \|\| fine \|\| chargeperiod \|\| chargeperiod_charge_at \|\| firstremind \|\| overduefinescap \|\| cap_fine_to_replacement_price \|\| finedays \|\| maxsuspensiondays \|\| suspension_chargeperiod \|\| renewalsallowed \|\| renewalsallowed \|\| norenewalbefore \|\| auto_renew \|\| no_auto_renewal_after \|\| no_auto_renewal_after_hard_limit \|\| reservesallowed \|\| holds_per_day \|\| holds_per_record \|\| onshelfholds \|\| opacitemholds \|\| article_requests \|\| article_requests %]
160	[% IF show_rule %]	161	[% IF show_rule %]
161	[% SET row_count = row_count + 1 %]	162	[% SET row_count = row_count + 1 %]
162	<tr row_countd="row_[% row_count \| html %]">	163	<tr row_countd="row_[% row_count \| html %]">
Lines 198-203 Link Here
198	[% END %]	199	[% END %]
199	</td>	200	</td>
200	<td>[% issuelength \| html %]</td>	201	<td>[% issuelength \| html %]</td>
		202	<td>
		203	[% SWITCH useDaysMode %]
		204	[% CASE 'Calendar' %]<span title="Use the calendar to skip days the library is closed">Calendar</span>
		205	[% CASE 'Datedue' %]<span title="Use the calendar to push the due date to the next open day">Datedue</span>
		206	[% CASE 'Days' %]<span title="Ignore the calendar">Days</span>
		207	[% CASE 'Dayweek' %]<span title="Use the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise">Dayweek</span>
		208	[% CASE %]<span title="Use the system preference 'useDaysMode' as a default value">Default</span>
		209	[% END %]
201	<td>	210	<td>
202	[% IF ( lengthunit == 'days' ) %]	211	[% IF ( lengthunit == 'days' ) %]
203	Days	212	Days
Lines 335-340 Link Here
335	<td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>	344	<td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
336	<td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>	345	<td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
337	<td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>	346	<td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
		347	<td>
		348	<select name="useDaysMode" id="useDaysMode">
		349	<option value="">Default</option>
		350	<option value="Calendar">Calendar</option>
		351	<option value="Datedue">Datedue</option>
		352	<option value="Days">Days</option>
		353	<option value="Dayweek">Dayweek</option>
		354	</select>
		355	</td>
338	<td>	356	<td>
339	<select name="lengthunit" id="lengthunit">	357	<select name="lengthunit" id="lengthunit">
340	<option value="days" selected="selected">Days</option>	358	<option value="days" selected="selected">Days</option>
Lines 419-424 Link Here
419	<th>Current checkouts allowed</th>	437	<th>Current checkouts allowed</th>
420	<th>Current on-site checkouts allowed</th>	438	<th>Current on-site checkouts allowed</th>
421	<th>Loan period</th>	439	<th>Loan period</th>
		440	<th>Days mode</th>
422	<th>Unit</th>	441	<th>Unit</th>
423	<th>Hard due date</th>	442	<th>Hard due date</th>
424	<th>Fine amount</th>	443	<th>Fine amount</th>
Lines 988-994 Link Here
988	// specific processing for the Note column	1007	// specific processing for the Note column
989	var note = $(this).find("a[name='viewnote']").data("content");	1008	var note = $(this).find("a[name='viewnote']").data("content");
990	$(current_column).find("input[type='text']").val(note);	1009	$(current_column).find("input[type='text']").val(note);
991	} else if ( i == 8 ) {	1010	} else if ( i == 9 ) {
992	// specific processing for the Hard due date column	1011	// specific processing for the Hard due date column
993	var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();	1012	var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
994	var input_value = '';	1013	var input_value = '';
Lines 999-1005 Link Here
999	}	1018	}
1000	$(current_column).find("input[type='text']").val(input_value);	1019	$(current_column).find("input[type='text']").val(input_value);
1001	$(current_column).find("select").val(select_value);	1020	$(current_column).find("select").val(select_value);
1002	} else if ( i == 14 ) {	1021	} else if ( i == 15 ) {
1003	// specific processing for cap_fine_to_replacement_price	1022	// specific processing for cap_fine_to_replacement_price
1004	var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");	1023	var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
1005	$('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );	1024	$('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
Lines 1024-1030 Link Here
1024	// Remove potential previous input added	1043	// Remove potential previous input added
1025	$(current_column).find("input").remove();	1044	$(current_column).find("input").remove();
1026	$(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");	1045	$(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
1027	} else if ( i == 4 \|\| i == 5 \|\| i == 24 \|\| i == 25 \|\| i == 26 ) {	1046	} else if ( i == 5 \|\| i == 6 \|\| i == 25 \|\| i == 26 \|\| i == 27 ) {
1028	// If the value is not an integer for	1047	// If the value is not an integer for
1029	// - "Current checkouts allowed"	1048	// - "Current checkouts allowed"
1030	// - "Current on-site checkouts allowed"	1049	// - "Current on-site checkouts allowed"
1031	-