fix(views): correct elif placement in base.html and clean HTML5 data attributes (v3.8.40)

This commit is contained in:
2026-10-28 05:53:18 -03:00
parent e5e6bfa094
commit 58d94f28d1
10 changed files with 112 additions and 31 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.8.39",
"version": "3.8.40",
"description": "",
"main": "index.js",
"scripts": {
+3 -3
View File
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
});
// Versiones institucionales del sistema
const APP_VERSION = '3.8.39';
const FRONTEND_VERSION = '3.8.39';
const BACKEND_VERSION = '3.8.39';
const APP_VERSION = '3.8.40';
const FRONTEND_VERSION = '3.8.40';
const BACKEND_VERSION = '3.8.40';
env.addGlobal('app_version', APP_VERSION);
env.addGlobal('frontend_version', FRONTEND_VERSION);
+14 -14
View File
@@ -1679,6 +1679,20 @@
<a class="nav-link" href="/credential/my-card"><i class="bi bi-person-badge text-primary"></i> <span class="nav-text">Mi Credencial QR</span></a>
</li>
{% elif user_role == 'recepcion' %}
<!-- RECEPCIÓN / CONTROL DE ACCESO -->
<li class="sidebar-section-header">Control de Acceso</li>
<li class="nav-item">
<a class="nav-link" href="/reception/scanner"><i class="bi bi-qr-code-scan text-primary"></i> <span class="nav-text">Escáner de Acceso QR</span></a>
</li>
<li class="sidebar-section-header">Cartelera &amp; Aulas</li>
<li class="nav-item">
<a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day text-info"></i> <span class="nav-text">Cartelera del Día</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/classrooms/list_classrooms?view_mode=physical"><i class="bi bi-door-closed text-success"></i> <span class="nav-text">Aulas Presenciales</span></a>
</li>
{% else %}
<!-- ALUMNO / ESTUDIANTE -->
<li class="sidebar-section-header">Portal del Estudiante</li>
@@ -1717,20 +1731,6 @@
<li class="nav-item">
<a class="nav-link" href="/credential/my-card"><i class="bi bi-person-badge text-primary"></i> <span class="nav-text">Mi Credencial QR</span></a>
</li>
{% elif user_role == 'recepcion' %}
<!-- RECEPCIÓN / CONTROL DE ACCESO -->
<li class="sidebar-section-header">Control de Acceso</li>
<li class="nav-item">
<a class="nav-link" href="/reception/scanner"><i class="bi bi-qr-code-scan text-primary"></i> <span class="nav-text">Escáner de Acceso QR</span></a>
</li>
<li class="sidebar-section-header">Cartelera &amp; Aulas</li>
<li class="nav-item">
<a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day text-info"></i> <span class="nav-text">Cartelera del Día</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/classrooms/list_classrooms?view_mode=physical"><i class="bi bi-door-closed text-success"></i> <span class="nav-text">Aulas Presenciales</span></a>
</li>
{% endif %}
</ul>
</div>
+23 -2
View File
@@ -107,8 +107,13 @@
<span class="text-muted small">
<i class="bi bi-geo-alt-fill text-danger me-1"></i>{{ b.building_name or 'Todas las Sedes' }}
</span>
<button type="button" class="btn btn-primary btn-sm rounded-pill px-3 shadow-sm"
onclick='openRedeemModal({{ b | tojson | safe }})'>
<button type="button" class="btn btn-primary btn-sm rounded-pill px-3 shadow-sm btn-redeem-benefit"
data-title="{{ b.title }}"
data-partner="{{ b.partner_name }}"
data-discount="{{ b.discount_label }}"
data-desc="{{ b.description or '' }}"
data-terms="{{ b.terms_conditions or '' }}"
data-coupon="{{ b.coupon_code or '' }}">
<i class="bi bi-ticket-perforated me-1"></i> Ver Beneficio
</button>
</div>
@@ -168,6 +173,22 @@
</div>
<script>
document.addEventListener('DOMContentLoaded', function() {
document.addEventListener('click', function(e) {
const btn = e.target.closest('.btn-redeem-benefit');
if (btn) {
openRedeemModal({
title: btn.getAttribute('data-title'),
partner_name: btn.getAttribute('data-partner'),
discount_label: btn.getAttribute('data-discount'),
description: btn.getAttribute('data-desc'),
terms_conditions: btn.getAttribute('data-terms'),
coupon_code: btn.getAttribute('data-coupon')
});
}
});
});
function openRedeemModal(b) {
document.getElementById('redeemTitle').innerText = b.title;
document.getElementById('redeemPartner').innerText = b.partner_name;
+55 -3
View File
@@ -186,15 +186,30 @@
</td>
<td class="text-center">
<div class="form-check form-switch d-inline-block">
<input class="form-check-input" type="checkbox" role="switch" id="switch-{{ b.id }}" {% if b.is_active %}checked{% endif %} onchange="toggleStatus({{ b.id }})">
<input class="form-check-input switch-toggle-status" type="checkbox" role="switch" id="switch-{{ b.id }}" data-id="{{ b.id }}" {% if b.is_active %}checked{% endif %}>
</div>
</td>
<td class="text-end pe-4">
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-outline-secondary rounded-start-pill" title="Editar" onclick='openEditModal({{ b | tojson | safe }})'>
<button type="button" class="btn btn-outline-secondary rounded-start-pill btn-edit-benefit" title="Editar"
data-id="{{ b.id }}"
data-title="{{ b.title }}"
data-partner="{{ b.partner_name }}"
data-category="{{ b.category }}"
data-discount="{{ b.discount_label }}"
data-coupon="{{ b.coupon_code or '' }}"
data-building="{{ b.building_id or '' }}"
data-roles="{{ b.target_roles or 'ALL' }}"
data-from="{{ b.valid_from or '' }}"
data-until="{{ b.valid_until or '' }}"
data-desc="{{ b.description or '' }}"
data-terms="{{ b.terms_conditions or '' }}"
data-active="{{ '1' if b.is_active else '0' }}">
<i class="bi bi-pencil"></i>
</button>
<button type="button" class="btn btn-outline-danger rounded-end-pill" title="Eliminar" onclick="confirmDelete({{ b.id }}, '{{ b.title }}')">
<button type="button" class="btn btn-outline-danger rounded-end-pill btn-delete-benefit" title="Eliminar"
data-id="{{ b.id }}"
data-title="{{ b.title }}">
<i class="bi bi-trash"></i>
</button>
</div>
@@ -332,6 +347,43 @@
});
});
document.addEventListener('DOMContentLoaded', function() {
document.addEventListener('click', function(e) {
const editBtn = e.target.closest('.btn-edit-benefit');
if (editBtn) {
openEditModal({
id: editBtn.getAttribute('data-id'),
title: editBtn.getAttribute('data-title'),
partner_name: editBtn.getAttribute('data-partner'),
category: editBtn.getAttribute('data-category'),
discount_label: editBtn.getAttribute('data-discount'),
coupon_code: editBtn.getAttribute('data-coupon'),
building_id: editBtn.getAttribute('data-building'),
target_roles: editBtn.getAttribute('data-roles'),
valid_from: editBtn.getAttribute('data-from'),
valid_until: editBtn.getAttribute('data-until'),
description: editBtn.getAttribute('data-desc'),
terms_conditions: editBtn.getAttribute('data-terms'),
is_active: editBtn.getAttribute('data-active') === '1'
});
return;
}
const delBtn = e.target.closest('.btn-delete-benefit');
if (delBtn) {
confirmDelete(delBtn.getAttribute('data-id'), delBtn.getAttribute('data-title'));
return;
}
});
document.addEventListener('change', function(e) {
const sw = e.target.closest('.switch-toggle-status');
if (sw) {
toggleStatus(sw.getAttribute('data-id'));
}
});
});
function openCreateModal() {
document.getElementById('benefitModalLabel').innerHTML = '<i class="bi bi-tag-fill me-2"></i> Nuevo Convenio Comercial';
document.getElementById('benefitForm').action = '/benefits';