gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 35341: Improve processing hard due date and auto renewal date 

After quite a struggle, came up with this approach using
flatpickr's parseDate and setDate. Seems to be the best.
The dateformat variable is set in calendar.inc.

Test plan:
Test edit, save, clear rules, focus on both dates.
Toggle all I18N preference date formats.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Bug 35341: Do not reinstantiate flatpickr

We do not need to reinstantiate flatpickr, we need to retrieve the
existing instance.

Test plan:
See previous patch.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
12-01-2024 Squashed both patches. Removed the unused hidden inputs for
hardduedatecompare and added a data attribute for the duedate.
The check with is_valid_date seems no longer needed here. Normally
date is empty or valid. A js warning from parseDate should be
exceptional. Made code for both dates a bit more consistent.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Marcel de Rooy 2023-11-17 10:18:01 +00:00 committed by Katrin Fischer
parent 9e168686cc
commit 963a3a4715
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
View File

@ -279,17 +279,14 @@
<span>Undefined</span>
[% END %]
</td>
<td data-code="[% hardduedatecompare | html %]">
<td data-code="[% hardduedatecompare | html %]" data-duedate="[% hardduedate | $KohaDates %]">
[% IF ( hardduedate ) %]
[% IF ( hardduedatecompare == '-1' ) %]
before [% hardduedate | $KohaDates %]
<input type="hidden" name="hardduedatecomparebackup" value="-1" />
[% ELSIF ( hardduedatecompare == '0' ) %]
on [% hardduedate | $KohaDates %]
<input type="hidden" name="hardduedatecomparebackup" value="0" />
[% ELSIF ( hardduedatecompare == '1' ) %]
after [% hardduedate | $KohaDates %]
<input type="hidden" name="hardduedatecomparebackup" value="1" />
[% END %]
[% ELSE %]
<span>None defined</span>
@ -475,7 +472,7 @@
<option value="0">Exactly on</option>
<option value="1">After</option>
</select>
<input type="text" size="10" id="hardduedate" name="hardduedate" value="[% hardduedate | html %]" class="flatpickr" />
<input type="text" size="10" id="hardduedate" name="hardduedate" class="flatpickr" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</td>
<td><input type="text" name="decreaseloanholds" id="decreaseloanholds" size="2" /></td>
@ -508,7 +505,7 @@
</td>
<td><input type="text" name="no_auto_renewal_after" id="no_auto_renewal_after" size="3" /></td>
<td>
<input type="text" size="10" name="no_auto_renewal_after_hard_limit" id="no_auto_renewal_after_hard_limit" value="[% no_auto_renewal_after_hard_limit | html %]" class="flatpickr"/>
<input type="text" size="10" name="no_auto_renewal_after_hard_limit" id="no_auto_renewal_after_hard_limit" class="flatpickr"/>
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</td>
<td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>
@ -1503,16 +1500,22 @@
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 = '';
if (typeof select_value === 'undefined'){
select_value = '-1';
}else {
input_value = itm_text.split(' ')[1];
// specific processing for Hard due date
$(current_column).find("select").val(itm_code);
var hardduedate = $(this).data('duedate');
if (hardduedate) {
var fp = document.querySelector("#hardduedate")._flatpickr;
hardduedate = fp.parseDate( hardduedate, flatpickr_dateformat_string );
if( hardduedate) fp.setDate( hardduedate, 1 );
}
} else if ( i == 26 ) {
// specific processing for No automatic renewal after (hard limit)
var renewdate = itm_text;
if (renewdate) {
var fp = document.querySelector("#no_auto_renewal_after_hard_limit")._flatpickr;
renewdate = fp.parseDate( renewdate, flatpickr_dateformat_string );
if( renewdate) fp.setDate( renewdate, 1 );
}
$(current_column).find("input[type='text']").val(input_value);
$(current_column).find("select").val(select_value);
} else if ( i == 16 ) {
// specific processing for cap_fine_to_replacement_price
var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");