Merge branch 'US-15-Activar-DesactivarAdministradordeComunidaddeViviendas' into US-14-EliminarAdministradordeComunidaddeViviendas

api-gateway/src/app.controller.ts

@@ -155,6 +155,12 @@ export class AppController {
     return this.appService.deleteAdminSystem(id);
   }
 
+  @Delete('user/deleteAdminCommunity/:id')
+  deleteAdminCommunity(@Param('id') id: string) {
+    return this.appService.deleteAdminCommunity(id);
+  }
+
+
   @Post('user/changeStatus')
   changeStatusUser(
     @Body('id') pId: string,
@@ -215,6 +221,8 @@ export class AppController {
   ) {
     return this.appService.changeStatusCommunity(pId, pStatus);
   }
+
+  
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
   createCommonArea(
@@ -254,6 +262,14 @@ export class AppController {
     return this.appService.deleteCommonArea(id);
   }
 
+  @Post('commonArea/changeStatus')
+  changeStatusCommonArea(
+    @Body('id') pId: string,
+    @Body('status') pStatus: string,
+  ) {
+    return this.appService.changeStatusCommonArea(pId, pStatus);
+  }
+
   // #==== API GUEST
   //#API userService - create user
   @Post('guest/createGuest')

api-gateway/src/app.service.ts

@@ -193,6 +193,14 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  deleteAdminCommunity(id: string) {
+    const pattern = { cmd: 'deleteAdminCommunity' };
+    const payload = { id: id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   inicioSesion(pEmail: string, pPassword: string) {
     const pattern = { cmd: 'loginUser' };
     const payload = { email: pEmail, password: pPassword };
@@ -343,6 +351,15 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  changeStatusCommonArea(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientCommonAreaApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
   // ====================== GUESTS ===============================
 
   //POST parameter from API

servicio-areas-comunes/src/common_areas/common_areas.controller.ts

@@ -39,4 +39,12 @@ export class CommonAreasController {
     let _community_id = id['community_id'];
     return this.commonAreasService.findByCommunity(_community_id);
   }
+
+   //cambiar de estado
+   @MessagePattern({ cmd: 'changeStatus' })
+   changeStatus(@Payload() body: string) {
+     let pid = body['id'];
+     let pstatus = body['status'];
+     return this.commonAreasService.changeStatus(pid,pstatus);
+   }
 }

servicio-areas-comunes/src/common_areas/common_areas.service.ts

@@ -41,4 +41,10 @@ export class CommonAreasService {
     return this.commonAreaModel.find({ community_id: community_id }).exec();
   }
 
+  async changeStatus(id: string, status: string) {
+    return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: status}, {
+      new: true,
+    });  
+  }
+
 }

servicio-usuarios/src/users/users.controller.ts

@@ -112,11 +112,16 @@ export class UsersController {
 
   @MessagePattern({ cmd: 'deleteAdminSystem' })
   deleteAdminSystem(@Payload() user: any) {
-    console.log('entró');
-
     return this.userService.deleteAdminSystem(user['id']);
   }
 
+  
+  @MessagePattern({ cmd: 'deleteAdminCommunity' })
+  deleteAdminCommunity(@Payload() user: any) {
+    return this.userService.deleteAdminCommunity(user['id']);
+  }
+
+
 
   @MessagePattern({ cmd: 'changeStatus' })
   changeStatus(@Payload() body: string) {

servicio-usuarios/src/users/users.service.ts

@@ -185,6 +185,13 @@ export class UsersService {
     });  
   }
 
+
+  deleteAdminCommunity(id: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  }
+
   async validateEmail(email: string) {
     let repo1 = this.userModel;
     return new Promise<User>((resolve, reject) => {

web-ui/web-react/src/components/AdministradoresComunidad.js

@@ -11,7 +11,7 @@ import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
 import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
 import { faAt } from '@fortawesome/free-solid-svg-icons';
 import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
-import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
+import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
 import { faHomeAlt } from '@fortawesome/free-solid-svg-icons';
 import { Dropdown } from 'primereact/dropdown';
 import classNames from 'classnames';
@@ -31,7 +31,8 @@ const AdministradoresComunidad = () => {
         community_name: '',
         user_type: '2',
         date_entry: new Date(),
-        status: '1'
+        status: '1',
+        status_text: '',
     };
 
     const [listaAdmins, setListaAdmins] = useState([]);
@@ -47,12 +48,23 @@ const AdministradoresComunidad = () => {
     const toast = useRef(null);
     const dt = useRef(null);
 
+    const [changeStatusAdminCommunityDialog, setChangeStatusAdminCommunityDialog] = useState(false);
+
 
     async function listaAdmin() {
-        let nombres = await fetch('http://localhost:4000/user/findAdminComunidad/', { method: 'GET' })
+        await fetch('http://localhost:4000/user/findAdminComunidad/', { method: 'GET' })
             .then((response) => response.json())
             .then((data) => {
                 return Promise.all(data.message.map(item => {
+
+
+                    if (item.status == '1') {
+                        item.status_text = 'Activo';
+                    } else if (item.status == '0') {
+                        item.status_text = 'Inactivo';
+                    } else {
+                        item.status_text = 'Eliminado';
+                    }
                     //item.full_name returns the repositorie name
                     return fetch(`http://localhost:4000/community/findCommunityName/${item.community_id}`, { method: 'GET' })
                         .then((response2) => response2.json())
@@ -63,7 +75,13 @@ const AdministradoresComunidad = () => {
                         })
                 }));
             })
-            .then(data => setListaAdmins(data));
+            .then(data => {
+                data = data.filter(
+                    (val) => val.status != -1,
+                );
+                console.log(data)
+                setListaAdmins(data);
+            });
 
     }
 
@@ -72,11 +90,16 @@ const AdministradoresComunidad = () => {
 
 
     async function getCommunites() {
-        let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
+        let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' })
-        let resList = await response.json();
+            .then((response) => response.json())
-        let list = await resList.message;
+            .then(data => data.message)
+            .then(data => {
+                data = data.filter(
+                    (val) => val.status != -1,
+                )
+                setCommunitiesList(data);
 
-        setCommunitiesList(await list);
+            })
     }
 
     useEffect(() => {
@@ -85,7 +108,7 @@ const AdministradoresComunidad = () => {
 
     useEffect(() => {
         getCommunites();
-    },[])
+    }, [])
 
     const cList = communitiesList.map((item) => ({
         label: item.name,
@@ -94,64 +117,56 @@ const AdministradoresComunidad = () => {
 
 
     const deleteAdminCommunity = () => {
-        /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
+        fetch('http://localhost:4000/user/deleteAdminCommunity/' + adminCommunity._id, {
-               cache: 'no-cache',
+            cache: 'no-cache',
-               method: 'DELETE',
+            method: 'DELETE',
-               headers: {
+            headers: {
-                   'Content-Type': 'application/json'
+                'Content-Type': 'application/json'
-               }
+            }
-           })
+        })
-               .then(
+            .then(
-                   function (response) {
+                function (response) {
-                       if (response.status != 201)
+                    if (response.status != 201)
-                           console.log('Ocurrió un error con el servicio: ' + response.status);
+                        console.log('Ocurrió un error con el servicio: ' + response.status);
-                       else
+                    else
-                           return response.json();
+                        return response.json();
-                   }
+                }
-               )
+            )
-               .then(
+            .then(
-                   function (response) {
+                function (response) {
-                       
+
-                       let _community = communities.filter(val => val._id !== community._id);
+                    let _administrators = listaAdmins.filter(
-                       setCommunities(_community);
+                        (val) => val._id !== adminCommunity._id,
-                       setDeleteCommunityDialog(false);
+                    );
-                       setCommunity(emptyCommunity);
+                    setListaAdmins(_administrators);
-                       toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Comunidad de Viviendas Eliminada', life: 3000 });
+                    setDeleteAdminCommunityDialog(false);
-                   }
+                    setAdminCommunity(emptyAdminCommunity);
-               )
+                    toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Administrador Comunidad Eliminada', life: 3000 });
-               .catch(
+                }
-                   err => {
+            )
-                       console.log('Ocurrió un error con el fetch', err)
+            .catch(
-                       toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Comunidad de Viviendas no se pudo eliminar', life: 3000 });
+                err => {
-                   }
+                    console.log('Ocurrió un error con el fetch', err)
-               ); 
+                    toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Administrador Comunidad no se pudo eliminar', life: 3000 });
-        */
+                }
-        let _administrators = listaAdmins.filter(
+            );
-            (val) => val._id !== adminCommunity._id,
+
-        );
+       
-        setListaAdmins(_administrators);
-        setDeleteAdminCommunityDialog(false);
-        setAdminCommunity(emptyAdminCommunity);
-        toast.current.show({
-            severity: 'success',
-            summary: 'Administrador de Comunidad Eliminada',
-            life: 3000,
-        });
     };
 
     const deleteSelectedAdminsCommunity = () => {
         let _admins = listaAdmins.filter(
             (val) => !selectedAdminsCommunities.includes(val),
         );
-        /*  selectedCommunities.map((item) => {
+         selectedAdminsCommunities.map((item) => {
-                 fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
+                 fetch('http://localhost:4000/user/deleteAdminCommunity/' + item._id, {
                      cache: 'no-cache',
                      method: 'DELETE',
                      headers: {
                          'Content-Type': 'application/json'
                      }
                  })
-             })*/
+             })
         setListaAdmins(_admins);
         setDeleteAdminsCommunitiesDialog(false);
         setSelectedAdminsCommunities(null);
@@ -163,6 +178,52 @@ const AdministradoresComunidad = () => {
         });
     };
 
+
+    const cambiarStatusAdminCommuniy = () => {
+        if (adminCommunity.status == '1') {
+            adminCommunity.status = '0';
+            adminCommunity.status_text = 'Inactivo';
+
+        } else if (adminCommunity.status == '0') {
+            adminCommunity.status = '1';
+            adminCommunity.status_text = 'Activo';
+        }
+        var data = {
+            id: adminCommunity._id,
+            status: adminCommunity.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) {
+                    setChangeStatusAdminCommunityDialog(false);
+                    toast.current.show({
+                        severity: 'success',
+                        summary: 'Éxito',
+                        detail: 'Administrador de Comunidad Actualizado',
+                        life: 3000,
+                    });
+                }
+            )
+            .catch(
+                err => console.log('Ocurrió un error con el fetch', err)
+            );
+    }
+
     const saveAdminCommunity = () => {
         if (adminCommunity.name && adminCommunity.dni && adminCommunity.last_name && adminCommunity.email && adminCommunity.phone) {
 
@@ -228,11 +289,33 @@ const AdministradoresComunidad = () => {
         setDeleteAdminsCommunitiesDialog(true);
     };
 
+    const hideChangeStatusAdmimCommunityDialog = () => {
+        setChangeStatusAdminCommunityDialog(false);
+    };
 
+    const confirmChangeStatuAdminCommunity = (adminCommunity) => {
+        setAdminCommunity(adminCommunity);
+        setChangeStatusAdminCommunityDialog(true);
+    };
 
     const actionsAdminCommunity = (rowData) => {
+        let icono = '';
+        let text = '';
+        if (rowData.status == '0') {
+            icono = "pi pi-eye";
+            text = "Activar Administrador de Comunidad"
+        } else if (rowData.status == '1') {
+            icono = "pi pi-eye-slash";
+            text = "Inactivar Administrador de Comunidad"
+        }
         return (
             <div className="actions">
+                <Button
+                    icon={`${icono}`}
+                    className="p-button-rounded p-button-warning mt-2 mx-2"
+                    onClick={() => confirmChangeStatuAdminCommunity(rowData)}
+                    title={`${text}`}
+                />
                 <Button
                     icon="pi pi-trash"
                     className="p-button-rounded p-button-danger mt-2"
@@ -257,6 +340,22 @@ const AdministradoresComunidad = () => {
         </>
     );
 
+    const changeStatusAdminCommunityDialogFooter = (
+        <>
+            <Button
+                label="No"
+                icon="pi pi-times"
+                className="p-button-text"
+                onClick={hideChangeStatusAdmimCommunityDialog}
+            />
+            <Button
+                label="Yes"
+                icon="pi pi-check"
+                className="p-button-text"
+                onClick={cambiarStatusAdminCommuniy}
+            />
+        </>
+    );
 
     const leftToolbarTemplate = () => {
         return (
@@ -344,7 +443,16 @@ const AdministradoresComunidad = () => {
         </>
     )
 
-  
+    const headerStatus = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#C08135" }} />{' '}
+                Estado
+            </p>
+        </>
+    )
+
+
 
     const onInputChange = (e, name) => {
         const val = (e.target && e.target.value) || '';
@@ -360,6 +468,18 @@ const AdministradoresComunidad = () => {
         console.log(getCommunityValue)
     }
 
+    const statusBodyTemplate = (rowData) => {
+        return (
+            <>
+                <span
+                    className={`status status-${rowData.status}`}
+                >
+                    {rowData.status_text}
+                </span>
+            </>
+        );
+    };
+
     return (
 
 
@@ -380,9 +500,10 @@ const AdministradoresComunidad = () => {
                         <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
                         </Column>
                         <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
-                        <Column field="phone"  header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
                         <Column field="community_name" sortable header={headerCommuntiy} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
-                        <Column  style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdminCommunity}></Column>
+                        <Column field="status" sortable header={headerStatus} body={statusBodyTemplate} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdminCommunity}></Column>
                     </DataTable>
                     <Dialog visible={deleteAdminCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminCommunityDialogFooter} onHide={hideDeleteAdminCommunityDialog}>
                         <div className="flex align-items-center justify-content-center">
@@ -396,6 +517,26 @@ const AdministradoresComunidad = () => {
                             {selectedAdminsCommunities && <span>¿Está seguro eliminar los administradores de las comunidades de viviendas seleccionados?</span>}
                         </div>
                     </Dialog>
+                    <Dialog
+                        visible={changeStatusAdminCommunityDialog}
+                        style={{ width: '450px' }}
+                        header="Confirmar"
+                        modal
+                        footer={changeStatusAdminCommunityDialogFooter}
+                        onHide={hideChangeStatusAdmimCommunityDialog}
+                    >
+                        <div className="flex align-items-center justify-content-center">
+                            <i
+                                className="pi pi-exclamation-triangle mr-3"
+                                style={{ fontSize: '2rem' }}
+                            />
+                            {adminCommunity && (
+                                <span>
+                                    ¿Estás seguro que desea cambiar estado a <b>{adminCommunity.name}</b>?
+                                </span>
+                            )}
+                        </div>
+                    </Dialog>
                 </div>
             </div>
             <div className="col-12">

web-ui/web-react/src/components/AdministradoresSistema.js

@@ -44,7 +44,6 @@ const AdministradoresSistema = () => {
     status_text: '',
   };
 
-
   async function fetchP() {
     let nombres = await fetch(urlFetch, { method: 'GET' });
     let adminRes = await nombres.json();
@@ -60,11 +59,11 @@ const AdministradoresSistema = () => {
     })
     setAdministrators(await data);
   }
+
   useEffect(() => {
     fetchP();
   }, [])
 
-
   function registrarAdmin() {
     var data = {
       dni: document.getElementById('identificacion').value,

web-ui/web-react/src/components/AreasComunes.js

@@ -43,6 +43,7 @@ const AreasComunes = () => {
     const dt = useRef(null);
 
     const [cookies, setCookie] = useCookies();
+    const [changeStatusAreaDialog, setChangeStatusAreaDialog] = useState(false);
 
 
 
@@ -220,6 +221,51 @@ const AreasComunes = () => {
         });
     };
 
+    const cambiarStatuscommonArea = () => {
+        if (commonArea.status == '1') {
+            commonArea.status = '0';
+            commonArea.status_text = 'Inactivo';
+
+        } else if (commonArea.status == '0') {
+            commonArea.status = '1';
+            commonArea.status_text = 'Activo';
+        }
+        var data = {
+            id: commonArea._id,
+            status: commonArea.status,
+        };
+        fetch('http://localhost:4000/commonArea/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) {
+                    setChangeStatusAreaDialog(false);
+                    toast.current.show({
+                        severity: 'success',
+                        summary: 'Éxito',
+                        detail: 'Área Común Actualizada',
+                        life: 3000,
+                    });
+                }
+            )
+            .catch(
+                err => console.log('Ocurrió un error con el fetch', err)
+            );
+    }
+
     const hideDeleteCommonAreaDialog = () => {
         setDeleteCommonAreaDialog(false);
     }
@@ -237,9 +283,36 @@ const AreasComunes = () => {
         setDeleteCommonAreasDialog(true);
     };
 
+
+
+    const hideChangeStatusAreaDialog = () => {
+        setChangeStatusAreaDialog(false);
+    };
+
+    const confirmChangeStatusArea = (commonArea) => {
+        setCommonArea(commonArea);
+        setChangeStatusAreaDialog(true);
+    };
+
     const actionsCommonArea = (rowData) => {
+        let icono = '';
+        let text = '';
+        if (rowData.status == '0') {
+            icono = "pi pi-eye";
+            text = "Activar Área Común"
+        } else if (rowData.status == '1') {
+            icono = "pi pi-eye-slash";
+            text = "Inactivar Área Común"
+        }
+
         return (
             <div className="actions">
+                <Button
+                    icon={`${icono}`}
+                    className="p-button-rounded p-button-warning mt-2 mx-2"
+                    onClick={() => confirmChangeStatusArea(rowData)}
+                    title={`${text}`}
+                />
                 <Button
                     icon="pi pi-trash"
                     className="p-button-rounded p-button-danger mt-2"
@@ -276,6 +349,22 @@ const AreasComunes = () => {
         </>
     );
 
+    const changeStatusAreaDialogFooter = (
+        <>
+            <Button
+                label="No"
+                icon="pi pi-times"
+                className="p-button-text"
+                onClick={hideChangeStatusAreaDialog}
+            />
+            <Button
+                label="Yes"
+                icon="pi pi-check"
+                className="p-button-text"
+                onClick={cambiarStatuscommonArea}
+            />
+        </>
+    );
 
     const leftToolbarTemplate = () => {
         return (
@@ -431,6 +520,26 @@ const AreasComunes = () => {
                             {selectedCommonAreas && <span>¿Está seguro eliminar las áreas comunes seleccionadas?</span>}
                         </div>
                     </Dialog>
+                    <Dialog
+                        visible={changeStatusAreaDialog}
+                        style={{ width: '450px' }}
+                        header="Confirmar"
+                        modal
+                        footer={changeStatusAreaDialogFooter}
+                        onHide={hideChangeStatusAreaDialog}
+                    >
+                        <div className="flex align-items-center justify-content-center">
+                            <i
+                                className="pi pi-exclamation-triangle mr-3"
+                                style={{ fontSize: '2rem' }}
+                            />
+                            {commonArea && (
+                                <span>
+                                    ¿Estás seguro que desea cambiar estado a <b>{commonArea.name}</b>?
+                                </span>
+                            )}
+                        </div>
+                    </Dialog>
                 </div>
             </div>
             <div className="col-12">
@@ -513,7 +622,7 @@ const AreasComunes = () => {
                         </div>
                         <div className="field col-12 md:col-6">
                             <label htmlFor="bookable">¿Necesita Reservación?</label>
-                            <div className="formgrid grid align-items-end" style={{marginTop: '12px', width: '300px'}}>
+                            <div className="formgrid grid align-items-end" style={{ marginTop: '12px', width: '300px' }}>
                                 <div className="field-radiobutton col-6">
 
                                     <RadioButton