7 Ревизии 02a0e9fc9b ... d08c2b752d

Автор SHA1 Съобщение Дата
  ElPoteito d08c2b752d Cambio de versión преди 9 месеца
  acampillo 279c249969 Merge branch 'acampillo' into desarrollo преди 9 месеца
  ElPoteito b2d57cb5dc Cambio de versión преди 9 месеца
  ElPoteito 110b3fa705 Excel municipios преди 9 месеца
  Jose Cienfuegos 726623197a Se agrego localhost en .env.development.local преди 9 месеца
  Jose Cienfuegos 744dccc989 Se quitaron columnas en el grid de condicionantes преди 9 месеца
  Jose Cienfuegos 700d697ea2 Se agrego imagen en login de inicio преди 9 месеца

+ 3 - 2
.env.development.local

@@ -1,7 +1,8 @@
 # Projecto   firebase | jwt
 VITE_PROJECT=jwt
 VITE_NOMBRE_PAGINA=
-VITE_API_URL=http://localhost:8080
+#VITE_API_URL=http://localhost:8080
+VITE_API_URL=https://sagarhpa.api.edesarrollos.info
 VITE_USR_URL=http://127.0.0.1:5173/
 VITE_API_VERSION=1.24.05.17+1
 
@@ -11,4 +12,4 @@ VITE_API_MODULE_EXCEL=/excel/
 VITE_API_MODULE_WORD=/word/
 VITE_API_MODULE_PUBLIC=/publico/
 
-VITE_API_VERSION=1.24.05.06+0
+VITE_API_VERSION=1.24.08.02+2

+ 3 - 3
src/components/layouts/SimpleTableLayout.jsx

@@ -29,7 +29,7 @@ const SimpleTableLayout = ({
     <>
       {Boolean(onSearch) && !Boolean(customRender) && (
         <div style={styles.container}>
-          <Row gutter={10}>
+          <Row gutter={10} justify={'space-between'}>
             {titulo && (<Col span={24}>{titulo}</Col>)}
             <Col
               xs={24}
@@ -37,7 +37,7 @@ const SimpleTableLayout = ({
               md={11}
               lg={7}
               xxl={7}
-              style={styles.inputSearch}
+              style={{...styles.inputSearch, border: '1px solid red'}}
             >
               <Input.Search
                 enterButton
@@ -46,7 +46,7 @@ const SimpleTableLayout = ({
               />
             </Col>
             {Boolean(btnGroup) && (
-              <Col xs={24} sm={24} md={13} lg={17} xxl={17}>
+              <Col xs={24} sm={24} md={13} lg={17} xxl={17} style={{ border: '1px solid red'}}>
                 <ButtonGroup data={btnGroup} />
               </Col>
             )}

+ 3 - 1
src/routers/routes.jsx

@@ -14,6 +14,8 @@ import {
   ApartmentOutlined,
   UnorderedListOutlined 
 } from "@ant-design/icons";
+import { BsFillCartCheckFill } from "react-icons/bs";
+
 //Íconos de Ant Design
 
 //Íconos React Icons
@@ -182,7 +184,7 @@ const dashboardRoutes = [
             layout: "dashboard",
             path: "/productos",
             name: "Productos",
-            icon: <ApartmentOutlined />,
+            icon: <BsFillCartCheckFill />,
             sidebar: "single",
             ver: "MENU-ADMIN",
             routes: [

+ 5 - 28
src/views/auth/Ingresar.jsx

@@ -63,7 +63,7 @@ const Ingresar = () => {
   return (
     <Row gutter={[10, 10]}>
       {/* Listado Izquierdo */}
-      <Col
+     {/*  <Col
         sm={24}
         md={6}
         style={{
@@ -98,30 +98,15 @@ const Ingresar = () => {
             </i>{" "}
           </p>
         </div>
-      </Col>
+      </Col> */}
 
       {/* Formulario */}
-      <Col sm={24} md={12}>
+      <Col sm={24} md={12}  lg={24}>
         <div style={SignInStyles.container}>
-          <p>
-            <strong>Ingresa aquí tu solicitud.</strong> A través del sistema
-            SIISTAI podrás solicitar toda la información pública del Gobierno
-            del Estado.
-          </p>
+          
           <div style={SignInStyles.logoContainer}>
-            <img src={"./logo_istai_lg.png"} style={{ width: "60%" }} alt="" />
+            <img src={"https://solicitud.sagarhpa.com/img/EscudoSonora.png"} style={{ width: "60%" }} alt="" />
           </div>
-          <p>
-            <i>
-              Si desea consultar las versiones públicas de las resoluciones de
-              los recursos de revisión que han realizado otras personas, a
-              través del SIISTAI,
-              <a href="#" target="_blank" rel="noreferrer">
-                {" "}
-                da clic aquí.
-              </a>
-            </i>{" "}
-          </p>
           <Spin indicator={antIcon} spinning={sessionLoading}>
             <Form
               name="normal_login"
@@ -186,18 +171,10 @@ const Ingresar = () => {
                   </Form.Item>
                 </Col>
               </Row>
-              <div style={{ textAlign: "center" }}>
-                <Typography.Text type="secondary">
-                  ¿No tienes cuenta? <Link to="/registrar">Regístrate</Link>
-                </Typography.Text>
-              </div>
             </Form>
           </Spin>
         </div>
       </Col>
-      <Col>
-        <div style={SignInStyles.container}></div>
-      </Col>
       <br />
     </Row>
   );

+ 50 - 20
src/views/catalogos/municipios/Formulario.jsx

@@ -10,6 +10,7 @@ import PropTypes from 'prop-types'
 const Formulario = ({
   form,
   onFinish,
+  botones = []
 }) => {
   return (
     <Form
@@ -21,28 +22,57 @@ const Formulario = ({
       onFinishFailed={() => { }}
     >
       <Row gutter={16}>
-        <Col span={6}>
-
-
-          <Form.Item
-            label="Búsqueda"
-            name="q"
-          >
-            <Input />
-          </Form.Item>
+        <Col span={12}>
+          <Row gutter={10}>
+            <Col span={12}>
+              <Form.Item
+                // label="Búsqueda"
+                name="q"
+              >
+                <Input />
+              </Form.Item>
+            </Col>
+            <Col span={4}>
+              <Form.Item>
+                <Button
+                  type="primary"
+                  htmlType="submit"
+                  // style={{ marginTop: "30px" }}
+                  block
+                >
+                  Buscar
+                </Button>
+              </Form.Item>
+            </Col>
+          </Row>
         </Col>
-        <Col span={6}>
-          <Form.Item>
-            <Button
-              type="primary"
-              htmlType="submit"
-              style={{ marginTop: "30px" }}
-            >
-              Buscar
-            </Button>
-          </Form.Item>
+        <Col span={12}>
+          <Row gutter={10} justify={'end'}>
+            {botones.map((i, index) => (
+              <Col>
+                {
+                  Boolean(i?.text) ? (
+                    <Button
+                      key={`btnGroup-${index}`}
+                      onClick={i.onClick}
+                      {...i.props}
+                    >
+                      {i.icon} {i.text}
+                    </Button>
+                  ) : (
+                    <Button
+                      key={`btnGroup-${index}`}
+                      onClick={i.onClick}
+                      icon={i.icon}
+                      {...i.props}
+                    />
+                  )
+                }
+              </Col>
+            ))}
+          </Row>
         </Col>
-      </Row>  
+      </Row>
     </Form>
   )
 }

+ 17 - 11
src/views/catalogos/municipios/Municipios.jsx

@@ -1,10 +1,10 @@
 import { useRef, useState } from "react";
 import { Form, Modal, Tooltip, notification } from "antd";
-import { DeleteOutlined, PlusOutlined } from "@ant-design/icons";
+import { DeleteOutlined, FileExcelOutlined, PlusOutlined } from "@ant-design/icons";
 import { Tabla } from "../../../components";
 import { SimpleTableLayout } from "../../../components/layouts";
 import { ActionsButton } from "../../../components";
-import { isEllipsis, eliminarRegistro } from "../../../utilities";
+import { isEllipsis, eliminarRegistro, openInNewTab } from "../../../utilities";
 import { Link, useNavigate } from "react-router-dom";
 import Formulario from "./Formulario";
 
@@ -25,7 +25,7 @@ const Municipios = () => {
       q: q ?? "",
       padre: true,
     };
-    setBuscarParams(params);    
+    setBuscarParams(params);
   };
 
   const botones = [
@@ -35,6 +35,12 @@ const Municipios = () => {
       text: "Nuevo",
       icon: <PlusOutlined />,
     },
+    {
+      onClick: () => openInNewTab('/excel/municipio'),
+      props: { disabled: false, block: false },
+      text: "Excel",
+      icon: <FileExcelOutlined />,
+    },
   ];
 
   const linkText = (value, row, key) => (
@@ -87,21 +93,21 @@ const Municipios = () => {
     {
       title: "Estado",
       key: "estado",
-      dataIndex: ["estado", "nombre"], 
+      dataIndex: ["estado", "nombre"],
       render: (value) => value,
     },
   ];
 
   return (
     <SimpleTableLayout
-      btnGroup={{
-        btnGroup: botones,
-      }}
+      customRender={
+        <Formulario
+          form={form}
+          onFinish={onFinish}
+          botones={botones}
+        />
+      }
     >
-      <Formulario
-        form={form}
-        onFinish={onFinish} 
-      />
       <Tabla
         columns={columns}
         nameURL={endPoint}

+ 15 - 2
src/views/condicionantes/CondicionanteDetalle.jsx

@@ -16,6 +16,10 @@ const selectores = {
     expand: "subproductos",
     ordenar: "nombre-asc",
   },
+  niveles: {
+    name: "nivel",
+    ordenar: "nombre-asc",
+  }
 };
 
 const endpoints = {
@@ -245,7 +249,7 @@ const CondicionanteDetalle = () => {
             </Form.Item>
           </Col>
           <Divider style={{ margin: '8px 0', borderColor: 'transparent' }} />
-          <Col md={12} xs={24}>
+          <Col md={8} xs={24}>
             <Form.Item
               label={<Text strong>Fines de Movilización</Text>}
               name="fines"
@@ -264,7 +268,7 @@ const CondicionanteDetalle = () => {
               </Checkbox.Group>
             </Form.Item>
           </Col>
-          <Col md={12} xs={24}>
+          <Col md={8} xs={24}>
             <Form.Item
               label={<Text strong>Tipo de Movilización</Text>}
               name="tipos"
@@ -283,6 +287,15 @@ const CondicionanteDetalle = () => {
               </Checkbox.Group>
             </Form.Item>
           </Col>
+          <Col md={8} xs={24}>
+            <Form.Item
+              label={<Text strong>Nivel</Text>}
+              name="idNivel"
+              rules={[{ required: true, message: 'El nivel es obligatorio.' }]}
+            >
+              <Select modelsParams={selectores.niveles} labelProp="nombre" valueProp="id" />
+            </Form.Item>
+          </Col>
           <Divider style={{ margin: '8px 0', borderColor: 'transparent' }} />
           <Col md={12} xs={24}>
             <Form.Item

+ 0 - 26
src/views/condicionantes/Condicionantes.jsx

@@ -82,32 +82,6 @@ const Condicionantes = () => {
       dataIndex: "titulo",
       render: linkText,
     },
-    {
-      title: "Descripción",
-      key: "descripcion",
-      dataIndex: "descripcion",
-      render: (text) => (
-        <div dangerouslySetInnerHTML={{ __html: text }} />
-      ),
-    },
-    {
-      title: "Activa",
-      key: "activa",
-      dataIndex: "activa",
-      render: linkText,
-    },
-    {
-      title: "Editado por",
-      key: "editadoPor",
-      dataIndex: "editadoPor",
-      render: linkText,
-    },
-    {
-      title: "Fecha de Edición",
-      key: "fechaEdicion",
-      dataIndex: "fechaEdicion",
-      render: linkText,
-    }
   ];
 
   return (