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

Bug 37398: Add set to today function to calendar.inc 

To test:
1. Try editing some items with a empty value in the flatpickr.
2. Make sure the empty date fields get a date set to today when you click on the empty field.
3. Try a datetime field, making sure the datetime is correctly set.

Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 0d5bd311d4)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Lucas Gass 2024-09-23 16:23:13 +00:00 committed by Paul Derscheid
parent 7dfc7e9e6e
commit c769f4fc61
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
View File

@ -133,6 +133,15 @@
}
}
},
onOpen: function( selectedDates, dateText, instance) {
var thisInput = instance.input;
let set_to_today = $(thisInput).data('flatpickr-set-to-today');
if ( set_to_today ) {
if ( thisInput.value === '' ) {
instance.setDate( new Date() );
}
}
},
onClose: function( selectedDates, dateText, instance) {
validate_date( dateText, instance );
var thisInput = instance.input;

4
koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
View File

@ -167,9 +167,9 @@
<textarea id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" rows="5" cols="64" >[% mv.value | html %]</textarea>
[% END %]
[% ELSIF ( mv.type == 'date_field' ) %]
<input type="text" id="[% mv.id | html %]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %] flatpickr" value="[% mv.value | html %]" class="flatpickr" />
<input type="text" id="[% mv.id | html %]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %] flatpickr" value="[% mv.value | html %]" class="flatpickr" data-flatpickr-set-to-today="true" />
[% ELSIF ( mv.type == 'datetime_field' ) %]
<input type="text" id="[% mv.id | html %]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %] flatpickr" value="[% mv.value | html %]" data-flatpickr-enable-time="true" />
<input type="text" id="[% mv.id | html %]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %] flatpickr" value="[% mv.value | html %]" data-flatpickr-enable-time="true" data-flatpickr-set-to-today="true" />
[% END %]
[% IF subfield.kohafield == 'items.more_subfields_xml' %]