From a1a0534a1fcdf962370f1178675eea9adc1631e5 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 22 Aug 2022 02:47:58 -0600 Subject: [PATCH 01/11] add expo to devshell --- devshell.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devshell.toml b/devshell.toml index 046ba4a0..3713822c 100644 --- a/devshell.toml +++ b/devshell.toml @@ -6,3 +6,8 @@ help = "Per project developer environments" [[commands]] package = "nodejs" help = "Node.js" + +[[commands]] +package = "nodePackages.expo-cli" +help = "Expo CLI" + From 04da74a2c4d5afbf1d0204a5335238ef3f7a3eaa Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 22 Aug 2022 03:30:40 -0600 Subject: [PATCH 02/11] remover datos innecesarios --- web-ui/web-react/src/components/GuardasSeguridad.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index 1b2f069f..45b75e92 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -79,17 +79,6 @@ const GuardasSeguridad = () => { status: "1", community_id: cookies.community_id }; - var data2 = { - dni: "11979037", - name: "Jorge", - last_name: "Soto", - email: "jorgesoto@gmail.com", - phone: 84664515, - password: "1203", - user_type: "2", - status: "1", - community_id: "62be68215692582bbfd77134" - } console.log('ssss'); fetch('http://localhost:4000/user/createGuard', { cache: 'no-cache', From cad12bd638fdeec761707ae1b48515f5ebb70c09 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 22 Aug 2022 04:00:25 -0600 Subject: [PATCH 03/11] iniciar proceso de editar guarda --- .../src/components/GuardasSeguridad.js | 59 +++++++++++++++---- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index 45b75e92..85fd4cc2 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -27,6 +27,7 @@ const GuardasSeguridad = () => { user_type: '1', status: '1', status_text: '', + community_id: '', }; @@ -37,6 +38,7 @@ const GuardasSeguridad = () => { const [globalFilter, setGlobalFilter] = useState(null); const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false); const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false); + const [saveButtonTitle, setSaveButtonTitle] = useState("Registrar"); const toast = useRef(null); const dt = useRef(null); @@ -90,7 +92,7 @@ const GuardasSeguridad = () => { } }) .then( - function (response) { + function(response) { if (response.status != 201) console.log('Ocurrió un error con el servicio: ' + response.status); else @@ -98,7 +100,7 @@ const GuardasSeguridad = () => { } ) .then( - function (response) { + function(response) { listaGuardasF(); } ) @@ -129,7 +131,7 @@ const GuardasSeguridad = () => { } }) .then( - function (response) { + function(response) { if (response.status != 201) console.log('Ocurrió un error con el servicio: ' + response.status); else @@ -137,7 +139,7 @@ const GuardasSeguridad = () => { } ) .then( - function (response) { + function(response) { setChangeStatusGuardDialog(false); toast.current.show({ severity: 'success', @@ -163,7 +165,7 @@ const GuardasSeguridad = () => { } }) .then( - function (response) { + function(response) { if (response.status != 201) console.log('Ocurrió un error con el servicio: ' + response.status); else @@ -171,7 +173,7 @@ const GuardasSeguridad = () => { } ) .then( - function (response) { + function(response) { let _guarda = listaGuardas.filter(val => val._id !== guarda._id); setListaGuardas(_guarda); setDeleteGuardaDialog(false); @@ -240,6 +242,16 @@ const GuardasSeguridad = () => { setGuardDialog(true); }; + const editGuard = (guard) => { + setGuarda(guard); + console.log(guard); + setSaveButtonTitle("Actualizar"); + } + + const cancelEdit = () => { + setGuarda(emptyGuarda); + setSaveButtonTitle("Registrar"); + } const actionsGuard = (rowData) => { let icono = ''; @@ -254,6 +266,12 @@ const GuardasSeguridad = () => { } return (
+
- +
@@ -554,25 +572,40 @@ const GuardasSeguridad = () => {
- +
- +
- +
- +
- + +
+
+
-
From 06468fa60114e3bf52534f1a93e29a8bfafebf09 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 22 Aug 2022 04:04:36 -0600 Subject: [PATCH 04/11] eliminar espaciado excesivo --- .../src/components/GuardasSeguridad.js | 1174 ++++++++--------- 1 file changed, 587 insertions(+), 587 deletions(-) diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index 85fd4cc2..811575c1 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -16,601 +16,601 @@ import { useCookies } from "react-cookie"; const GuardasSeguridad = () => { - let emptyGuarda = { - _id: null, - dni: '', - name: '', - last_name: '', - email: '', - phone: '', - password: '', - user_type: '1', - status: '1', - status_text: '', - community_id: '', + let emptyGuarda = { + _id: null, + dni: '', + name: '', + last_name: '', + email: '', + phone: '', + password: '', + user_type: '1', + status: '1', + status_text: '', + community_id: '', + }; + + + const [listaGuardas, setListaGuardas] = useState([]); + const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/'); + const [guarda, setGuarda] = useState(emptyGuarda); + const [selectedGuardas, setSelectedGuardas] = useState(null); + const [globalFilter, setGlobalFilter] = useState(null); + const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false); + const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false); + const [saveButtonTitle, setSaveButtonTitle] = useState("Registrar"); + const toast = useRef(null); + const dt = useRef(null); + + const [cookies, setCookie] = useCookies(); + const [changeStatusGuardDialog, setChangeStatusGuardDialog] = useState(false); + + const [guardDialog, setGuardDialog] = useState(false); + const [submitted, setSubmitted] = useState(false); + + + async function listaGuardasF() { + let nombres = await fetch((urlFetch + cookies.community_id), { method: 'GET' }); + let listaGuardasRes = await nombres.json(); + let data = await listaGuardasRes.message.filter( + (val) => val.status != -1, + ) + await data.map((item) => { + if (item.status == '1') { + item.status_text = 'Activo'; + } else if (item.status == '0') { + item.status_text = 'Inactivo'; + } + }) + setListaGuardas(await data); + } + + useEffect(() => { + listaGuardasF(); + }, []) + + function registrarGuarda() { + var data = { + dni: document.getElementById('identificacion').value, + name: document.getElementById('nombre').value, + last_name: document.getElementById('apellidos').value, + email: document.getElementById('correo_electronico').value, + phone: document.getElementById('telefono').value, + password: document.getElementById('correo_electronico').value, + user_type: "4", //4 es guarda + status: "1", + community_id: cookies.community_id }; - - - const [listaGuardas, setListaGuardas] = useState([]); - const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/'); - const [guarda, setGuarda] = useState(emptyGuarda); - const [selectedGuardas, setSelectedGuardas] = useState(null); - const [globalFilter, setGlobalFilter] = useState(null); - const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false); - const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false); - const [saveButtonTitle, setSaveButtonTitle] = useState("Registrar"); - const toast = useRef(null); - const dt = useRef(null); - - const [cookies, setCookie] = useCookies(); - const [changeStatusGuardDialog, setChangeStatusGuardDialog] = useState(false); - - const [guardDialog, setGuardDialog] = useState(false); - const [submitted, setSubmitted] = useState(false); - - - async function listaGuardasF() { - let nombres = await fetch((urlFetch + cookies.community_id), { method: 'GET' }); - let listaGuardasRes = await nombres.json(); - let data = await listaGuardasRes.message.filter( - (val) => val.status != -1, - ) - await data.map((item) => { - if (item.status == '1') { - item.status_text = 'Activo'; - } else if (item.status == '0') { - item.status_text = 'Inactivo'; - } - }) - setListaGuardas(await data); - } - - useEffect(() => { - listaGuardasF(); - }, []) - - function registrarGuarda() { - var data = { - dni: document.getElementById('identificacion').value, - name: document.getElementById('nombre').value, - last_name: document.getElementById('apellidos').value, - email: document.getElementById('correo_electronico').value, - phone: document.getElementById('telefono').value, - password: document.getElementById('correo_electronico').value, - user_type: "4", //4 es guarda - status: "1", - community_id: cookies.community_id - }; - console.log('ssss'); - fetch('http://localhost:4000/user/createGuard', { - cache: 'no-cache', - method: 'POST', - mode: 'cors', - body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json' - } - }) - .then( - function(response) { - if (response.status != 201) - console.log('Ocurrió un error con el servicio: ' + response.status); - else - return response.json(); - } - ) - .then( - function(response) { - listaGuardasF(); - } - ) - .catch( - err => console.log('Ocurrió un error con el fetch', err) - ); - } - - const cambiarStatusUser = () => { - if (guarda.status == '1') { - guarda.status = '0'; - guarda.status_text = 'Inactivo'; - - } else if (guarda.status == '0') { - guarda.status = '1'; - guarda.status_text = 'Activo'; + console.log('ssss'); + fetch('http://localhost:4000/user/createGuard', { + cache: 'no-cache', + method: 'POST', + mode: 'cors', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' + } + }) + .then( + function(response) { + if (response.status != 201) + console.log('Ocurrió un error con el servicio: ' + response.status); + else + return response.json(); } - var data = { - id: guarda._id, - status: guarda.status, - }; - fetch('http://localhost:4000/user/changeStatus', { - cache: 'no-cache', - method: 'POST', - body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json' - } - }) - .then( - function(response) { - if (response.status != 201) - console.log('Ocurrió un error con el servicio: ' + response.status); - else - return response.json(); - } - ) - .then( - function(response) { - setChangeStatusGuardDialog(false); - toast.current.show({ - severity: 'success', - summary: 'Éxito', - detail: 'Guarda de Seguridad Actualizado', - life: 3000, - }); - } - ) - .catch( - err => console.log('Ocurrió un error con el fetch', err) - ); - } - - - const deleteGuarda = () => { - - fetch('http://localhost:4000/user/deleteAdminSystem/' + guarda._id, { - cache: 'no-cache', - method: 'DELETE', - headers: { - 'Content-Type': 'application/json' - } - }) - .then( - function(response) { - if (response.status != 201) - console.log('Ocurrió un error con el servicio: ' + response.status); - else - return response.json(); - } - ) - .then( - function(response) { - let _guarda = listaGuardas.filter(val => val._id !== guarda._id); - setListaGuardas(_guarda); - setDeleteGuardaDialog(false); - setGuarda(emptyGuarda); - toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administrador del Sistema Eliminado', life: 3000 }); - } - ) - .catch( - err => { - console.log('Ocurrió un error con el fetch', err) - toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Administrador del Sistema no se pudo Eliminar', life: 3000 }); - } - ); - } - - const deleteSelectedGuardas = () => { - let _guardas = listaGuardas.filter(val => !selectedGuardas.includes(val)); - selectedGuardas.map((item) => { - fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, { - cache: 'no-cache', - method: 'DELETE', - headers: { - 'Content-Type': 'application/json' - } - }) - }) - setListaGuardas(_guardas); - setDeleteGuardasDialog(false); - setSelectedGuardas(null); - toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administradores del Sistema Eliminados', life: 3000 }); - } - - const hideDeleteGuardaDialog = () => { - setDeleteGuardaDialog(false); - } - - const hideDeleteGuardasDialog = () => { - setDeleteGuardasDialog(false); - } - - const confirmDeleteGuarda = (guarda) => { - setGuarda(guarda); - setDeleteGuardaDialog(true); - } - - const confirmDeleteSelected = () => { - setDeleteGuardasDialog(true); - } - - const hideChangeStatusGuardDialog = () => { - setChangeStatusGuardDialog(false); - }; - - const confirmChangeStatusGuard = (guard) => { - setGuarda(guard); - setChangeStatusGuardDialog(true); - }; - - const hideGuardDialog = () => { - setSubmitted(false); - setGuardDialog(false); - }; - - const infoGuard = (guard) => { - setGuarda(guard); - setGuardDialog(true); - }; - - const editGuard = (guard) => { - setGuarda(guard); - console.log(guard); - setSaveButtonTitle("Actualizar"); - } - - const cancelEdit = () => { - setGuarda(emptyGuarda); - setSaveButtonTitle("Registrar"); - } - - const actionsGuard = (rowData) => { - let icono = ''; - let text = ''; - if (rowData.status == '0') { - icono = "pi pi-eye"; - text = "Activar Guarda de Seguridad" - } else if (rowData.status == '1') { - icono = "pi pi-eye-slash"; - text = "Inactivar Guarda de Seguridad" - + ) + .then( + function(response) { + listaGuardasF(); } - return ( -
-
- ); + ) + .catch( + err => console.log('Ocurrió un error con el fetch', err) + ); + } + + const cambiarStatusUser = () => { + if (guarda.status == '1') { + guarda.status = '0'; + guarda.status_text = 'Inactivo'; + + } else if (guarda.status == '0') { + guarda.status = '1'; + guarda.status_text = 'Activo'; } - - const leftToolbarTemplate = () => { - return ( - -
-
- - ) - } - - const rightToolbarTemplate = () => { - return ( - -