feat(schedule): group reservations by real time slots and clean date-time formatting v3.4.2
This commit is contained in:
+60
-7
@@ -85,9 +85,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
|
||||
});
|
||||
|
||||
// Versiones institucionales del sistema
|
||||
const APP_VERSION = '3.4.1';
|
||||
const FRONTEND_VERSION = '3.4.1';
|
||||
const BACKEND_VERSION = '3.4.1';
|
||||
const APP_VERSION = '3.4.2';
|
||||
const FRONTEND_VERSION = '3.4.2';
|
||||
const BACKEND_VERSION = '3.4.2';
|
||||
|
||||
env.addGlobal('app_version', APP_VERSION);
|
||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||
@@ -129,20 +129,73 @@ env.addFilter('format', function(str, ...args) {
|
||||
|
||||
const formatDateHelper = function(d, fmt) {
|
||||
if (!d) return '';
|
||||
if (typeof d === 'string') return d.split('T')[0];
|
||||
return new Date(d).toISOString().split('T')[0];
|
||||
let str = String(d);
|
||||
let datePart = str.includes('T') ? str.split('T')[0] : (str.includes(' ') ? str.split(' ')[0] : str);
|
||||
if (datePart.match(/^\d{4}-\d{2}-\d{2}$/)) {
|
||||
const [y, m, day] = datePart.split('-');
|
||||
const year = parseInt(y, 10);
|
||||
const month = parseInt(m, 10);
|
||||
const dayNum = parseInt(day, 10);
|
||||
const dObj = new Date(year, month - 1, dayNum);
|
||||
const daysNames = ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'];
|
||||
const monthsNames = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'];
|
||||
const dayName = daysNames[dObj.getDay()] || '';
|
||||
const monthName = monthsNames[month - 1] || '';
|
||||
const dayPad = String(dayNum).padStart(2, '0');
|
||||
const monthPad = String(month).padStart(2, '0');
|
||||
|
||||
if (fmt === 'long' || fmt === 'human') {
|
||||
return `${dayName} ${dayPad}/${monthPad}/${year}`;
|
||||
}
|
||||
if (fmt === 'full') {
|
||||
return `${dayName}, ${dayPad} de ${monthName} de ${year}`;
|
||||
}
|
||||
return `${dayPad}/${monthPad}/${year}`;
|
||||
}
|
||||
return datePart;
|
||||
};
|
||||
|
||||
const formatDateTimeHelper = function(d, fmt) {
|
||||
if (!d) return '';
|
||||
if (typeof d === 'string') return d.replace('T', ' ').substring(0, 16);
|
||||
return new Date(d).toLocaleString();
|
||||
let str = String(d);
|
||||
let datePart = formatDateHelper(str);
|
||||
let timePart = '';
|
||||
if (str.includes('T')) {
|
||||
timePart = str.split('T')[1].substring(0, 5) + ' hs';
|
||||
} else if (str.includes(' ')) {
|
||||
timePart = str.split(' ')[1].substring(0, 5) + ' hs';
|
||||
}
|
||||
return timePart ? `${datePart} ${timePart}` : datePart;
|
||||
};
|
||||
|
||||
const formatTimeCleanHelper = function(d) {
|
||||
if (!d) return '';
|
||||
let str = String(d);
|
||||
if (str.includes('T')) return str.split('T')[1].substring(0, 5) + ' hs';
|
||||
if (str.includes(' ')) return str.split(' ')[1].substring(0, 5) + ' hs';
|
||||
if (str.match(/^\d{2}:\d{2}/)) return str.substring(0, 5) + ' hs';
|
||||
return str;
|
||||
};
|
||||
|
||||
const formatTimeRangeHelper = function(start, end) {
|
||||
if (!start) return '';
|
||||
let s = String(start);
|
||||
let e = String(end || '');
|
||||
let st = s.includes('T') ? s.split('T')[1].substring(0, 5) : (s.includes(' ') ? s.split(' ')[1].substring(0, 5) : s.substring(0, 5));
|
||||
let et = e.includes('T') ? e.split('T')[1].substring(0, 5) : (e.includes(' ') ? e.split(' ')[1].substring(0, 5) : e.substring(0, 5));
|
||||
return et ? `${st} - ${et} hs` : `${st} hs`;
|
||||
};
|
||||
|
||||
env.addGlobal('format_date', formatDateHelper);
|
||||
env.addGlobal('format_datetime', formatDateTimeHelper);
|
||||
env.addGlobal('format_time', formatTimeCleanHelper);
|
||||
env.addGlobal('format_time_range', formatTimeRangeHelper);
|
||||
|
||||
env.addFilter('format_date', formatDateHelper);
|
||||
env.addFilter('format_datetime', formatDateTimeHelper);
|
||||
env.addFilter('format_date_human', function(d) { return formatDateHelper(d, 'human'); });
|
||||
env.addFilter('format_time', formatTimeCleanHelper);
|
||||
env.addFilter('format_time_range', formatTimeRangeHelper);
|
||||
|
||||
env.addFilter('tojson', function(val) {
|
||||
return JSON.stringify(val !== undefined ? val : null);
|
||||
|
||||
Reference in New Issue
Block a user