Merge pull request #14 from CascoArcilla/HU6

tecnicas/controllers/models_controller/sesion_controller.py

@@ -44,34 +44,41 @@ class SesionController():
 
     @staticmethod
     def getSessionsSavesByCretor(user_name: str, page: int):
-        elements_by_page = 9
+        elements_by_page = 6
 
         try:
             creator = Presentador.objects.get(nombre_usuario=user_name)
         except Presentador.DoesNotExist:
             return controller_error("presentador invalido")
 
-        try:
-            queryset = SesionSensorial.objects.select_related(
+        queryset = (
+            SesionSensorial.objects
+            .filter(creadoPor=creator)
+            .select_related(
                 "tecnica",
                 "tecnica__tipo_tecnica",
                 "tecnica__id_estilo"
-            ).only(
+            )
+            .only(
                 "codigo_sesion",
                 "nombre_sesion",
                 "fechaCreacion",
+                "activo",
                 "tecnica__tipo_tecnica__nombre_tecnica",
                 "tecnica__id_estilo__nombre_estilo"
             )
+            .order_by("-fechaCreacion")
+        )
 
-            paginator = Paginator(queryset, elements_by_page)
-            sessions_in_page = paginator.get_page(page)
-
-            return sessions_in_page
+        paginator = Paginator(queryset, elements_by_page)
+        try:
+            sessions_in_page = paginator.page(page)
         except PageNotAnInteger:
-            return controller_error("indice invalido")
+            return controller_error("índice inválido")
         except EmptyPage:
-            return controller_error("sin registros de sessiones")
+            return controller_error("sin registros de sesiones")
+
+        return (sessions_in_page, not sessions_in_page.number < paginator.num_pages)
 
     @staticmethod
     def getSessionByCodePanelTester(code: str):

tecnicas/templates/tecnicas/manage_sesions/sesiones-panel.html

@@ -19,9 +19,13 @@
             </div>
         </header>
 
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% else %}
         <section class="grid grid-cols-3 max-lg:grid-cols-2 max-sm:grid-cols-1 w-full gap-4 justify-center">
             {% for sesion in sessions %}
-            <div class="card bg-surface-card shadow-lg text-black sm:max-w-80 w-full flex justify-center items-center">
+            <div
+                class='card {{ sesion.activo|yesno:"bg-surface-ligt,bg-surface-card" }} shadow-lg text-black sm:max-w-80 w-full flex justify-center items-center'>
                 <div class="card-body flex flex-col justify-between w-full">
                     <div class="flex flex-col gap-1 [&>*]:first:text-xl [&>*]:first:font-bold [&>*]:first:border-b">
                         {% if sesion.nombre_sesion %}
@@ -47,6 +51,16 @@
                         <li>
                             {{ sesion.fechaCreacion }}
                         </li>
+                        <li>
+                            Estado:
+                            <span class="uppercase font-bold">
+                                {% if sesion.activo %}
+                                Activo
+                                {% else %}
+                                No activo
+                                {% endif %}
+                            </span>
+                        </li>
                     </ul>
                     <div class="mt-6">
                         <a href="{% url 'cata_system:detalles_sesion' session_code=sesion.codigo_sesion %}">
@@ -61,16 +75,25 @@
         </section>
 
         <section class="flex justify-center items-center gap-2">
-            <div class="join">
-                <button class="join-item btn bg-btn-secondary">
-                    <img class="h-full" src="{% static 'img/less-than.svg' %}" alt="menor que">
-                </button>
-                <button class="join-item btn bg-btn-secondary">Page {{ page }}</button>
-                <button class="join-item btn bg-btn-secondary">
-                    <img class="h-full" src="{% static 'img/greater-than.svg' %}" alt="mayor que">
-                </button>
+            <div class="join space-x-2">
+                {% if num_page != 1 %}
+                <a href="{% url 'cata_system:panel_sesiones' page=num_page|add:-1 %}" class="w-fit">
+                    <button class="join-item btn bg-btn-secondary py-1">
+                        <img class="h-full" src="{% static 'img/less-than.svg' %}" alt="menor que">
+                    </button>
+                </a>
+                {% endif %}
+                <button class="join-item btn bg-btn-secondary">Page {{ num_page }}</button>
+                {% if not last_page %} 
+                <a href="{% url 'cata_system:panel_sesiones' page=num_page|add:1 %}"class="w-fit">
+                    <button class="join-item btn bg-btn-secondary py-1">
+                        <img class="h-full" src="{% static 'img/greater-than.svg' %}" alt="mayor que">
+                    </button>
+                    </a>
+                    {% endif %}
             </div>
         </section>
+        {% endif %}
     </article>
 </article>
 {% endblock %}

tecnicas/views/sessions_management/sessions_panel.py

@@ -3,9 +3,9 @@ from ...controllers import SesionController
 
 
 def sesionsPanel(req, page: int):
-    context = {"page": page}
+    context = {"num_page": page}
 
-    sessions_in_page = SesionController.getSessionsSavesByCretor(
+    (sessions_in_page, last_page) = SesionController.getSessionsSavesByCretor(
         user_name="aguBido", page=page)
 
     if isinstance(sessions_in_page, dict):
@@ -13,6 +13,7 @@ def sesionsPanel(req, page: int):
         return render(req, "tecnicas/manage_sesions/sesiones-panel.html", context=context)
 
     context["sessions"] = sessions_in_page
+    context["last_page"] = last_page
 
     number_pages = SesionController.getNumberSessionsByCreator(
         user_name="aguBido")