carlostellocba/admin-edu-space
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: acople de schedule.view_reservation al BFF y creacion/asociacion de comisiones a materias

Browse Source
This commit is contained in:
carlostellocba
2026-09-19 10:23:50 -03:00
parent 1080acd43a
commit 500aeeb9df
12 changed files with 597 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/views/schedule/list.html
+6 -6
View File
@@ -221,17 +221,17 @@
</a>
{% endif %}
{% if user.can_edit_reservation(reservation) %}
<a href="/schedule/edit_reservation"
<a href="/schedule/edit_reservation?id={{ reservation.id }}"
class="btn btn-sm btn-outline-warning py-0 px-2 me-1" title="Modificar Reserva">
<i class="bi bi-pencil"></i>
</a>
{% endif %}
<a href="/schedule/view_reservation"
<a href="/schedule/view_reservation?id={{ reservation.id }}"
class="btn btn-sm btn-outline-secondary py-0 px-2" title="Ver Ficha">
<i class="bi bi-eye"></i>
</a>
{% if user.has_permission('reservations', 'read_write') and (reservation.status == 'PENDING' or reservation.status.value == 'PENDING') %}
<a href="/schedule/confirm_reservation"
<a href="/schedule/confirm_reservation?id={{ reservation.id }}"
class="btn btn-sm btn-outline-success py-0 px-2 ms-1" title="Confirmar">
<i class="bi bi-check-lg"></i>
</a>
@@ -326,16 +326,16 @@
<i class="bi bi-camera-video"></i>
</a>
{% endif %}
<a href="/schedule/view_reservation" class="btn btn-sm btn-outline-secondary py-1 px-2" title="Ver Ficha">
<a href="/schedule/view_reservation?id={{ reservation.id }}" class="btn btn-sm btn-outline-secondary py-1 px-2" title="Ver Ficha">
<i class="bi bi-eye"></i>
</a>
{% if user.can_edit_reservation(reservation) %}
<a href="/schedule/edit_reservation" class="btn btn-sm btn-outline-warning py-1 px-2" title="Modificar">
<a href="/schedule/edit_reservation?id={{ reservation.id }}" class="btn btn-sm btn-outline-warning py-1 px-2" title="Modificar">
<i class="bi bi-pencil"></i>
</a>
{% endif %}
{% if user.has_permission('reservations', 'read_write') and (reservation.status == 'PENDING' or reservation.status.value == 'PENDING') %}
<a href="/schedule/confirm_reservation" class="btn btn-sm btn-outline-success py-1 px-2" title="Confirmar">
<a href="/schedule/confirm_reservation?id={{ reservation.id }}" class="btn btn-sm btn-outline-success py-1 px-2" title="Confirmar">
<i class="bi bi-check-lg"></i>
</a>
{% endif %}
frontend/views/schedule/today.html
+4 -4
View File
@@ -221,11 +221,11 @@
</a>
{% endif %}
{% if user.can_edit_reservation(item.reservation) %}
<a href="/schedule/edit_reservation" class="btn btn-sm btn-outline-warning py-0 px-2" title="Modificar Reserva">
<a href="/schedule/edit_reservation?id={{ item.reservation.id }}" class="btn btn-sm btn-outline-warning py-0 px-2" title="Modificar Reserva">
<i class="bi bi-pencil"></i>
</a>
{% endif %}
<a href="/schedule/view_reservation" class="btn btn-sm btn-outline-secondary py-0 px-2" title="Ver Ficha Detallada">
<a href="/schedule/view_reservation?id={{ item.reservation.id }}" class="btn btn-sm btn-outline-secondary py-0 px-2" title="Ver Ficha Detallada">
<i class="bi bi-eye me-1"></i>Detalles
</a>
</div>
@@ -305,12 +305,12 @@
</a>
{% endif %}
{% if user.can_edit_reservation(reservation) %}
<a href="/schedule/edit_reservation"
<a href="/schedule/edit_reservation?id={{ reservation.id }}"
class="btn btn-sm btn-outline-warning py-0 px-2 me-1" title="Modificar Reserva">
<i class="bi bi-pencil"></i>
</a>
{% endif %}
<a href="/schedule/view_reservation"
<a href="/schedule/view_reservation?id={{ reservation.id }}"
class="btn btn-sm btn-outline-secondary py-0 px-2" title="Ver Ficha">
<i class="bi bi-eye"></i>
</a>
frontend/views/schedule/view.html
+11 -9
View File
@@ -12,7 +12,7 @@
</h1>
<div class="d-flex gap-2">
{% if user.can_edit_reservation(reservation) %}
<a href="/schedule/edit_reservation" class="btn btn-warning">
<a href="/schedule/edit_reservation?id={{ reservation.id }}" class="btn btn-warning">
<i class="bi bi-pencil-square me-1"></i>Modificar Reserva
</a>
{% endif %}
@@ -231,23 +231,25 @@
<div class="card-body">
<div class="d-grid gap-2">
{% if user.can_edit_reservation(reservation) %}
<a href="/schedule/edit_reservation" class="btn btn-warning">
<a href="/schedule/edit_reservation?id={{ reservation.id }}" class="btn btn-warning">
<i class="bi bi-pencil-square me-1"></i>Modificar Reserva
</a>
{% endif %}
{% if reservation.status.value == 'PENDING' %}
<form method="POST" action="/schedule/confirm_reservation">
<button type="submit" class="btn btn-success" onclick="return confirm('Confirm this reservation?')">
<i class="bi bi-check-circle"></i> Confirm Reservation
{% if reservation.status.value == 'PENDING' or reservation.status == 'PENDING' %}
<form method="POST" action="/schedule/confirm_reservation?id={{ reservation.id }}">
<input type="hidden" name="id" value="{{ reservation.id }}">
<button type="submit" class="btn btn-success" onclick="return confirm('¿Confirmar esta reserva?')">
<i class="bi bi-check-circle me-1"></i>Confirmar Reserva
</button>
</form>
{% endif %}
{% if reservation.can_be_cancelled() %}
<form method="POST" action="/schedule/cancel_reservation">
<button type="submit" class="btn btn-danger" onclick="return confirm('Cancel this reservation?')">
<i class="bi bi-x-circle"></i> Cancel Reservation
<form method="POST" action="/schedule/cancel_reservation?id={{ reservation.id }}">
<input type="hidden" name="id" value="{{ reservation.id }}">
<button type="submit" class="btn btn-danger" onclick="return confirm('¿Cancelar esta reserva?')">
<i class="bi bi-x-circle me-1"></i>Cancelar Reserva
</button>
</form>
{% endif %}