+ [% FOR i IN [0..6] %]
+ [% SET d = ( CalendarFirstDayOfWeek + i) % 7 %]
+ [% SET hr = library_hours.$d %]
+
- [% PROCESS dayname day=daycount %]
+ [% PROCESS dayname day=d %]
[% hr.open_time | html %]
@@ -573,7 +579,6 @@
[% hr.close_time | html %]
- [% daycount = daycount+1 %]
[% END %]
@@ -609,6 +614,7 @@
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %]
+ [% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
[% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
@@ -638,6 +644,7 @@
var table_settings = [% TablesSettings.GetTableSettings( 'admin', 'libraries', 'libraries', 'json' ) | $raw %];
var saved_table = localStorage.getItem("DataTables_libraries_/cgi-bin/koha/admin/branches.pl");
var updated_settings = get_columns_saved_state(saved_table, table_settings);
+ var calendarFirstDayOfWeek = '[% Koha.Preference('CalendarFirstDayOfWeek') | html %]';
$(document).ready(function() {
@@ -747,18 +754,25 @@
},
{
"data": function( row, type, val, meta ) {
- const daynames = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
- var daycount = 0;
- var result = '
Day
Open time
Close time
';
- while ( row.library_hours[daycount] ) {
- result += '
';
- result += '
'+daynames[daycount]+'
';
- result += '
'+row.library_hours[daycount].open_time+'
';
- result += '
'+row.library_hours[daycount].close_time+'
';
- result += '
';
- daycount++;
+ let result = '';
+ if ( row.library_hours.length > 0 ) {
+ const daysOfWeek = [ _("Sunday"), _("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday") ];
+
+ result = '
Day
Open time
Close time
';
+ let counter = 0;
+ for (let i = calendarFirstDayOfWeek; counter < 7; i++) {
+ const day = i % 7; // Wrap around the day using modulo operator
+ result += '
';
+ result += '
'+daysOfWeek[day]+'
';
+ result += '
'+row.library_hours[day].open_time+'
';
+ result += '
'+row.library_hours[day].close_time+'
';
+ result += '
';
+ counter++;
+ }
+ result += '
';
+ } else {
+ result = _("Library hours not set");
}
- result += '