From a39dc26216146868c4e512611ef2f1da1cdbd67f Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:10:15 -0600 Subject: [PATCH 01/12] =?UTF-8?q?elimaci=C3=B3n=20l=C3=B3gica=20en=20usuar?= =?UTF-8?q?ios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servicio-usuarios/src/users/users.service.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts index 0fd5a813..725127ab 100644 --- a/servicio-usuarios/src/users/users.service.ts +++ b/servicio-usuarios/src/users/users.service.ts @@ -76,8 +76,14 @@ export class UsersService { }); } - async remove(id: string) { + /* async remove(id: string) { return this.userModel.findByIdAndRemove({ _id: id }).exec(); + }*/ + + async remove(id: string) { + return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } //inicio de sesion @@ -142,7 +148,9 @@ export class UsersService { } async deleteAdminSystem(id: string) { - return this.userModel.deleteOne({ _id: id }).exec(); + return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } async validateEmail(email: string) { From 86cfcc64cd3bb10ba091bf48e514b3431563e14c Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:11:23 -0600 Subject: [PATCH 02/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20res?= =?UTF-8?q?ervaciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/reservations/reservations.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servicio-reservaciones/src/reservations/reservations.service.ts b/servicio-reservaciones/src/reservations/reservations.service.ts index 8a681cd3..45382f50 100644 --- a/servicio-reservaciones/src/reservations/reservations.service.ts +++ b/servicio-reservaciones/src/reservations/reservations.service.ts @@ -41,6 +41,8 @@ export class ReservationsService { } async remove(id: string) { - return this.reservationModel.findByIdAndRemove({ _id: id }).exec(); + return this.reservationModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } } From 95d5a5dd0fa99b4449809c6fe051d17e150664fc Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:16:40 -0600 Subject: [PATCH 03/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20rep?= =?UTF-8?q?ortes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servicio-reportes/src/reports/reports.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicio-reportes/src/reports/reports.service.ts b/servicio-reportes/src/reports/reports.service.ts index 37a68957..73bc7330 100644 --- a/servicio-reportes/src/reports/reports.service.ts +++ b/servicio-reportes/src/reports/reports.service.ts @@ -31,6 +31,9 @@ export class ReportsService { } async remove(id: string) { - return this.reportModel.findByIdAndRemove({ _id: id }).exec(); + return this.reportModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); + } } From 91ac92719a867ea425b62c6f08fb1c0525bd9405 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:17:25 -0600 Subject: [PATCH 04/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20inv?= =?UTF-8?q?itados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servicio-invitados/src/guests/guests.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servicio-invitados/src/guests/guests.service.ts b/servicio-invitados/src/guests/guests.service.ts index 97e1c4bd..02379936 100644 --- a/servicio-invitados/src/guests/guests.service.ts +++ b/servicio-invitados/src/guests/guests.service.ts @@ -32,6 +32,8 @@ export class GuestsService { } async remove(id: string) { - return this.guestModel.findByIdAndRemove({ _id: id }).exec(); + return this.guestModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } } From 14df451c0a0be79e6678e499f946c37f6d91b584 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:18:13 -0600 Subject: [PATCH 05/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20for?= =?UTF-8?q?o=20comunicados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/post-comments/post-comments.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servicio-foro-comunicaciones/src/post-comments/post-comments.service.ts b/servicio-foro-comunicaciones/src/post-comments/post-comments.service.ts index 4b8a0c0a..f82b71fa 100644 --- a/servicio-foro-comunicaciones/src/post-comments/post-comments.service.ts +++ b/servicio-foro-comunicaciones/src/post-comments/post-comments.service.ts @@ -33,6 +33,8 @@ export class PostCommentsService { } async remove(id: string) { - return this.commentModel.findByIdAndRemove({ _id: id }).exec(); + return this.commentModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } } From 2519136654143fcebb711be6cfc23deab39a7013 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:18:56 -0600 Subject: [PATCH 06/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20com?= =?UTF-8?q?unidades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/communities/communities.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts index 06792ef5..69cd9f24 100644 --- a/servicio-comunidad-viviendas/src/communities/communities.service.ts +++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts @@ -56,7 +56,9 @@ export class CommunitiesService { } async remove(id: string) { - return this.communityModel.findByIdAndRemove({ _id: id }).exec(); + return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } async findCommunityAdmin(community: string, user_type: string) { From 17941893cbb5e3e01e8c523c6c1ba38981287776 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 17:19:23 -0600 Subject: [PATCH 07/12] =?UTF-8?q?eliminaci=C3=B3n=20l=C3=B3gica=20en=20?= =?UTF-8?q?=C3=A1reas=20comunes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/common_areas/common_areas.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servicio-areas-comunes/src/common_areas/common_areas.service.ts b/servicio-areas-comunes/src/common_areas/common_areas.service.ts index a632a829..325a9821 100644 --- a/servicio-areas-comunes/src/common_areas/common_areas.service.ts +++ b/servicio-areas-comunes/src/common_areas/common_areas.service.ts @@ -32,6 +32,8 @@ export class CommonAreasService { } async remove(id: string) { - return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec(); + return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: '-1'}, { + new: true, + }); } } From b89bcd68bb7ccee5ff7af407fba62bd4420fea2b Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 21:05:19 -0600 Subject: [PATCH 08/12] arreglar columnas del listar admin comunidad --- .../src/components/AdministradoresComunidad.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/web-ui/web-react/src/components/AdministradoresComunidad.js b/web-ui/web-react/src/components/AdministradoresComunidad.js index 37c4dae6..09c1fcf6 100644 --- a/web-ui/web-react/src/components/AdministradoresComunidad.js +++ b/web-ui/web-react/src/components/AdministradoresComunidad.js @@ -345,15 +345,7 @@ const AdministradoresComunidad = () => { ) - const headerOptions = ( - <> -

- {' '} - {' '} - -

- - ) + const onInputChange = (e, name) => { const val = (e.target && e.target.value) || ''; @@ -389,9 +381,9 @@ const AdministradoresComunidad = () => { - - - + + +
From 7fc01af71e9e8efa87f6562bd2116e76286f9e51 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 21:06:50 -0600 Subject: [PATCH 09/12] arreglar columnas comunidad de viviendas --- .../src/components/ComunidadViviendas.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/web-ui/web-react/src/components/ComunidadViviendas.js b/web-ui/web-react/src/components/ComunidadViviendas.js index 706f9063..21b846e9 100644 --- a/web-ui/web-react/src/components/ComunidadViviendas.js +++ b/web-ui/web-react/src/components/ComunidadViviendas.js @@ -493,15 +493,6 @@ const Communities = () => { ); - const headerOptions = ( - <> -

- Opciones{' '} - -

- - ); - return (
@@ -537,21 +528,25 @@ const Communities = () => { > @@ -562,15 +557,16 @@ const Communities = () => { > - + Date: Sun, 31 Jul 2022 21:07:39 -0600 Subject: [PATCH 10/12] arreglar columnas del administrador del sistema --- .../src/components/AdministradoresSistema.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/web-ui/web-react/src/components/AdministradoresSistema.js b/web-ui/web-react/src/components/AdministradoresSistema.js index 5d007e38..6b609bcf 100644 --- a/web-ui/web-react/src/components/AdministradoresSistema.js +++ b/web-ui/web-react/src/components/AdministradoresSistema.js @@ -313,15 +313,6 @@ const AdministradoresSistema = () => { ); - const headerOptions = ( - <> -

- Opciones{' '} - -

- - ); - return (
@@ -402,7 +393,6 @@ const AdministradoresSistema = () => { > { }} > From 440c13018a2129464c9998785dbb1024e1ecf5f4 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 21:09:57 -0600 Subject: [PATCH 11/12] arreglar columnas guardas de seguridad --- .../src/components/GuardasSeguridad.js | 110 ++++++++++-------- 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index e7ff5192..a092910f 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -14,8 +14,8 @@ import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons'; import { faEllipsis } from '@fortawesome/free-solid-svg-icons'; const GuardasSeguridad = () => { - const [listaGuardas,setListaGuardas]=useState([]); - const [urlFetch,setUrlFetch]=useState('http://localhost:4000/user/findGuards/62be68215692582bbfd77134'); + const [listaGuardas, setListaGuardas] = useState([]); + const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/62be68215692582bbfd77134'); const [guarda, setGuarda] = useState(emptyGuarda); const [selectedGuardas, setSelectedGuardas] = useState(null); const [globalFilter, setGlobalFilter] = useState(null); @@ -37,14 +37,14 @@ const GuardasSeguridad = () => { - async function listaGuardasF(){ - let nombres=await fetch(urlFetch, {method:'GET'}); - let listaGuardasRes= await nombres.json(); - setListaGuardas(listaGuardasRes.message); - } - useEffect(()=>{ + async function listaGuardasF() { + let nombres = await fetch(urlFetch, { method: 'GET' }); + let listaGuardasRes = await nombres.json(); + setListaGuardas(listaGuardasRes.message); + } + useEffect(() => { listaGuardasF(); - },[]) + }, []) function registrarGuarda() { var data = { @@ -56,9 +56,9 @@ const GuardasSeguridad = () => { password: document.getElementById('correo_electronico').value, user_type: "4", //4 es guarda status: "1", - community_id:"62be68215692582bbfd77134" + community_id: "62be68215692582bbfd77134" }; - var data2={ + var data2 = { dni: "11979037", name: "Jorge", last_name: "Soto", @@ -67,35 +67,35 @@ const GuardasSeguridad = () => { password: "1203", user_type: "2", status: "4", - community_id:"62be68215692582bbfd77134" + community_id: "62be68215692582bbfd77134" } -console.log('ssss'); - fetch('http://localhost:4000/user/createGuard', { + console.log('ssss'); + fetch('http://localhost:4000/user/createGuard', { cache: 'no-cache', method: 'POST', - mode:'cors', + mode: 'cors', body: JSON.stringify(data2), 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) { - console.log('fff'); - listaGuardasF(); - } - ) - .catch( - err => console.log('Ocurrió un error con el fetch', err) - ); + .then( + function (response) { + if (response.status != 201) + console.log('Ocurrió un error con el servicio: ' + response.status); + else + return response.json(); + } + ) + .then( + function (response) { + console.log('fff'); + listaGuardasF(); + } + ) + .catch( + err => console.log('Ocurrió un error con el fetch', err) + ); } const hideDeleteGuardaDialog = () => { @@ -218,48 +218,58 @@ console.log('ssss'); const headerName = ( <> -

Nombre

+

{' '} + {' '} + Nombre +

) const headerLastName = ( <> -

Apellidos

+

+ {' '} + {' '} + Apellido(s) +

) const headerDNI = ( - <> -

Identificación

- +

{' '} + {' '} + Identificación +

) const headerEmail = ( <> -

Correo Electrónico

+

{' '} + {' '} + Correo Electrónico +

) const headerPhone = ( <> -

Teléfono

+

+ {' '} + {' '} + Teléfono +

) - const headerOptions = ( - <> -

Opciones

- - ) return (
-
+
- + setSelectedGuardas(e.value)} - responsiveLayout="scroll" header={header} + responsiveLayout="scroll" header={header} rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3" paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown" currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords}" @@ -270,8 +280,8 @@ console.log('ssss'); - - + +
@@ -316,7 +326,7 @@ console.log('ssss');
- ); + ); }; export default React.memo(GuardasSeguridad); From 61ec6018eca6e766ac92e5c4960cf1919d27a808 Mon Sep 17 00:00:00 2001 From: Mariela Date: Sun, 31 Jul 2022 21:10:08 -0600 Subject: [PATCH 12/12] fix texto comunidad de vivienda --- web-ui/web-react/src/components/ComunidadViviendas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-ui/web-react/src/components/ComunidadViviendas.js b/web-ui/web-react/src/components/ComunidadViviendas.js index 21b846e9..c0d9a92c 100644 --- a/web-ui/web-react/src/components/ComunidadViviendas.js +++ b/web-ui/web-react/src/components/ComunidadViviendas.js @@ -432,7 +432,7 @@ const Communities = () => { icon={faMapLocationDot} style={{ color: '#D7A86E' }} />{' '} - Pronvincia + Provincia

);