From 923915a29bcf7c36ff200398ea9f9c76d213ee3a Mon Sep 17 00:00:00 2001
From: AdalbertoCV <34152734@uaz.edu.mx>
Date: Thu, 26 Sep 2024 18:54:07 -0600
Subject: [PATCH] token timelife actualizado + configuracion de non-editable
 fields en Solicitudes

---
 cosiap_api/cosiap_api/settings.py             |  2 +-
 cosiap_api/solicitudes/views.py               |  4 ++-
 .../modalidades/EditarModalidad.jsx           | 12 +++----
 .../modalidades/ListaModalidades.jsx          | 33 +++++++++++--------
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/cosiap_api/cosiap_api/settings.py b/cosiap_api/cosiap_api/settings.py
index 6776ca3..578ef64 100644
--- a/cosiap_api/cosiap_api/settings.py
+++ b/cosiap_api/cosiap_api/settings.py
@@ -196,7 +196,7 @@ SESSION_COOKIE_SECURE = True
 SESSION_COOKIE_HTTPONLY = True
 
 SIMPLE_JWT = {
-    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=3),
+    'ACCESS_TOKEN_LIFETIME': timedelta(days=1),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
     'ROTATE_REFRESH_TOKENS': False,
     'BLACKLIST_AFTER_ROTATION': False,
diff --git a/cosiap_api/solicitudes/views.py b/cosiap_api/solicitudes/views.py
index d7c164c..f1162c6 100644
--- a/cosiap_api/solicitudes/views.py
+++ b/cosiap_api/solicitudes/views.py
@@ -45,7 +45,9 @@ class SolicitudAPIView(DynamicTableAPIView):
             'gte': [(datetime.now() - timedelta(days=5*30)).strftime('%Y-%m-%d')]
         }
     }
-    non_editable_fields = ["id"]
+    non_editable_fields = ["id","minuta__id","convenio__id","modalidad__id","modalidad__dynamic_form__id","timestamp","solicitante__id",
+    "solicitante__is_superuser","solicitante__is_staff","solicitante__municipio__id","solicitante__municipio__estado__id",
+    "solicitante__datos_bancarios__id","registro_formulario__id"]
     dynamic_form_exist = True
 
 
diff --git a/cosiap_frontend/src/components/modalidades/EditarModalidad.jsx b/cosiap_frontend/src/components/modalidades/EditarModalidad.jsx
index e60c474..016dc67 100644
--- a/cosiap_frontend/src/components/modalidades/EditarModalidad.jsx
+++ b/cosiap_frontend/src/components/modalidades/EditarModalidad.jsx
@@ -358,10 +358,10 @@ const EditModalidad = () => {
                     </div>
     
                     {/* Secciones del formulario */}
-                    {Object.values(sections).map(section => (
+                    {Object.values(sections).map((section,sectionIndex) => (
                         <div key={section.id} className="card">
                             <div className="form-group">
-                                <h4 className="subtitle-text">Sección {section.id}</h4>
+                                <h4 className="subtitle-text">Sección {sectionIndex + 1}</h4>
                                 <input
                                     type="text"
                                     value={section.nombre}
@@ -370,9 +370,9 @@ const EditModalidad = () => {
                                 />
                             </div>
                             <div className="card-body">
-                                {Object.values(section.elementos).map(element => (
+                                {Object.values(section.elementos).map((element, elementIndex) => (
                                     <div key={element.id} className="form-group">
-                                        <h4 className="subtitle-text-1">Elemento {element.id}</h4>
+                                        <h4 className="subtitle-text-1">Elemento {elementIndex + 1}</h4>
                                         <label>
                                             <input
                                                 type="text"
@@ -417,9 +417,9 @@ const EditModalidad = () => {
                                         )}
                                         
                                         {/* Opciones del elemento (si existen) */}
-                                        {element.opciones && Object.values(element.opciones).map(option => (
+                                        {element.opciones && Object.values(element.opciones).map((option, optionIndex) => (
                                             <div key={option.id} className="option-card">
-                                                <h4 className="subtitle-text-2">Opción {option.id}</h4>
+                                                <h4 className="subtitle-text-2">Opción {optionIndex +1}</h4>
                                                 <label>
                                                     <input
                                                         type="text"
diff --git a/cosiap_frontend/src/components/modalidades/ListaModalidades.jsx b/cosiap_frontend/src/components/modalidades/ListaModalidades.jsx
index fec23e5..38259ad 100644
--- a/cosiap_frontend/src/components/modalidades/ListaModalidades.jsx
+++ b/cosiap_frontend/src/components/modalidades/ListaModalidades.jsx
@@ -37,8 +37,22 @@ export default function ListaModalidades({
 
   return (
     <MainContainer title="Modalidades de Apoyo">
+      {/* Botón centrado debajo del título */}
+      {isAdmin && (
+        <div className="flex justify-center my-4">
+          <button
+            className="submit-button bg-gray-500 text-white border border-gray-600 font-bold text-center uppercase rounded-lg py-2 px-4 flex items-center"
+            onClick={() => navigate(`/crear-modalidad/`)}
+          >
+            {/* Signo de "+" antes del texto */}
+            <span className="mr-2 text-xl">+</span>
+            Crear Modalidad
+          </button>
+        </div>
+      )}
+
+      {/* Listado de modalidades */}
       <div className="flex flex-wrap justify-center space-x-4 mt-4">
-        {/** Tarjetas para mostrar modalidades disponibles */}
         {modalidades.length > 0 ? (
           modalidades.map((item) => {
             return (
@@ -49,15 +63,15 @@ export default function ListaModalidades({
                 monto={item.monto_maximo}
                 image={item.imagen}
               >
-                <br></br>
+                <br />
                 <div className="fixed bottom-4 left-1/2 transform -translate-x-1/2">
-                <button
+                  <button
                     className="h-8 w-40 lg:w-48 bg-[var(--principal-c)] text-[var(--principal-mf)] border border-[var(--principal-f)] font-bold text-center uppercase align-middle rounded-lg"
                     onClick={() => {
                       if (isAdmin) {
-                        navigate(`/editar-modalidad/${item.id}`); 
+                        navigate(`/editar-modalidad/${item.id}`);
                       } else {
-                        handleModalidadDetail(item.id); 
+                        handleModalidadDetail(item.id);
                       }
                     }}
                   >
@@ -73,15 +87,6 @@ export default function ListaModalidades({
           </p>
         )}
       </div>
-      <div className="button-container">
-      { isAdmin && 
-      <button
-         className="submit-button"
-         onClick={() => navigate(`/crear-modalidad/`)} >
-         Nueva Modalidad
-      </button>
-      }
-      </div>
     </MainContainer>
   );
 }
-- 
GitLab