From 060bd28bf83d0a933280e2bd467158c22b53d30c Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 1 Aug 2022 02:05:02 -0600
Subject: [PATCH 1/6] agregar primeras funciones en el frontend

---
 .../src/components/AdministradoresSistema.js  | 81 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/web-ui/web-react/src/components/AdministradoresSistema.js b/web-ui/web-react/src/components/AdministradoresSistema.js
index 5d007e38..a1b78350 100644
--- a/web-ui/web-react/src/components/AdministradoresSistema.js
+++ b/web-ui/web-react/src/components/AdministradoresSistema.js
@@ -27,6 +27,10 @@ const AdministradoresSistema = () => {
   const toast = useRef(null);
   const dt = useRef(null);
 
+  const [changeStatusAdminSystemDialog, setChangeStatusAdminSystemDialog] = useState(false);
+  const [changeStatusAdminsSystemDialog, setChangeStatusAdminsSystemDialog] =
+    useState(false);
+
   let emptySysAdmin = {
     _id: null,
     dni: '',
@@ -111,6 +115,14 @@ const AdministradoresSistema = () => {
     setDeleteAdminsSystemDialog(false);
   };
 
+  const confirmChangeStatusAdminSystem = (sysAdmin) => {
+    setSysAdmin(sysAdmin);
+    setDeleteAdminSystemDialog(true);
+  };
+
+  const hideChangeStatusAdminSystemDialog = () => {
+    setChangeStatusAdminSystemDialog(false);
+  };
 
   const deleteSysAdmin = () => {
     fetch('http://localhost:4000/user/deleteAdminSystem/' + sysadmin._id, {
@@ -127,8 +139,9 @@ const AdministradoresSistema = () => {
       })
       .then(function (response) {
         let _sysadmin = administrators.filter(
-          (val) => val._id !== sysadmin._id,
+          (val) => (val._id !== sysadmin._id || val.status != -1),
         );
+        
         setAdministrators(_sysadmin);
         setDeleteAdminSystemDialog(false);
         setSysAdmin(emptySysAdmin);
@@ -152,7 +165,7 @@ const AdministradoresSistema = () => {
 
   const deleteSelectedAdminsSystem = () => {
     let _administrators = administrators.filter(
-      (val) => !selectedAdministrators.includes(val),
+      (val) => (!selectedAdministrators.includes(val) || val.status != -1),
     );
     selectedAdministrators.map((item) => {
       fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
@@ -163,6 +176,7 @@ const AdministradoresSistema = () => {
         },
       });
     });
+
     setAdministrators(_administrators);
     setDeleteAdminsSystemDialog(false);
     setSelectedAdministrators(null);
@@ -174,9 +188,55 @@ const AdministradoresSistema = () => {
     });
   };
 
+  const changeStatusAdminSystm = () => {
+    fetch('http://localhost:4000/user/statusAdminSystem/' + sysadmin._id, {
+      cache: 'no-cache',
+      method: 'POST',
+      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 _sysadmin = administrators.filter(
+          (val) => (val._id !== sysadmin._id || val.status != -1),
+        );
+
+        setAdministrators(_sysadmin);
+        setDeleteAdminSystemDialog(false);
+        setSysAdmin(emptySysAdmin);
+        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 actionsAdmin = (rowData) => {
     return (
       <div className="actions">
+          <Button
+          icon="pi pi-eye"
+          className="p-button-rounded p-button-warning mt-2"
+          onClick={() => confirmChangeStatusAdminSystem(rowData)}
+        />
         <Button
           icon="pi pi-trash"
           className="p-button-rounded p-button-danger mt-2"
@@ -264,6 +324,23 @@ const AdministradoresSistema = () => {
     </>
   );
 
+  const changeStatusAdminSystemDialogFooter = (
+    <>
+      <Button
+        label="No"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideChangeStatusAdminSystemDialog}
+      />
+      <Button
+        label="Yes"
+        icon="pi pi-check"
+        className="p-button-text"
+        onClick={changeStatusAdminSystm}
+      />
+    </>
+  );
+
   const headerName = (
     <>
       <p>

From ca19da1d1927aec1ad2af3063562017fc68a2b93 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 2 Aug 2022 21:48:10 -0600
Subject: [PATCH 2/6] remove console.log

---
 web-ui/web-react/src/components/ComunidadViviendas.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web-ui/web-react/src/components/ComunidadViviendas.js b/web-ui/web-react/src/components/ComunidadViviendas.js
index c9076d26..e220c777 100644
--- a/web-ui/web-react/src/components/ComunidadViviendas.js
+++ b/web-ui/web-react/src/components/ComunidadViviendas.js
@@ -353,7 +353,6 @@ const Communities = () => {
       id: community._id,
       status: community.status,
     };
-    console.log(data);
     fetch('http://localhost:4000/community/changeStatus', {
       cache: 'no-cache',
       method: 'POST',

From e2f0b401c554c4fd12191e165d7bf824082a8c5f Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 2 Aug 2022 21:50:01 -0600
Subject: [PATCH 3/6] agregar funciones en servicio de usuarios

---
 servicio-usuarios/src/users/users.controller.ts | 9 +++++++--
 servicio-usuarios/src/users/users.service.ts    | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index bd875b12..a32d265d 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -6,7 +6,7 @@ import { MongoExceptionFilter } from 'src/MongoExceptionFilter';
 
 @Controller()
 export class UsersController {
-  constructor(private readonly userService: UsersService) {}
+  constructor(private readonly userService: UsersService) { }
 
   @MessagePattern({ cmd: 'createUser' })
   create(@Payload() user: UserDocument) {
@@ -117,6 +117,11 @@ export class UsersController {
     return this.userService.deleteAdminSystem(user['id']);
   }
 
-  
 
+  @MessagePattern({ cmd: 'changeStatus' })
+  changeStatus(@Payload() body: string) {
+    let pid = body['id'];
+    let pstatus = body['status'];
+    return this.userService.changeStatus(pid, pstatus);
+  }
 }
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 268ab49a..2015ef45 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -223,5 +223,10 @@ export class UsersService {
     return num_house;
   }
 
+  async changeStatus(id: string, status: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: status}, {
+      new: true,
+    });  
+  }
 }
 

From 89469a687c13673540ff6520491d79389cae2b04 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 2 Aug 2022 21:52:30 -0600
Subject: [PATCH 4/6] agregar y actualizar funciones en api-gateway

---
 api-gateway/src/app.controller.ts | 12 +++++--
 api-gateway/src/app.service.ts    | 52 ++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index 3884c89a..5d2b9f92 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -128,6 +128,14 @@ export class AppController {
     return this.appService.deleteAdminSystem(id);
   }
 
+  @Post('user/changeStatus')
+  changeStatusUser(
+    @Body('id') pId: string,
+    @Body('status') pStatus: string,
+  ) {
+    return this.appService.changeStatusUser(pId, pStatus);
+  }
+
   // #==== API Communities
   @Post('community/createCommunity')
   createCommunity(
@@ -174,11 +182,11 @@ export class AppController {
     return this.appService.findCommunityAdmin(community_id);
   }
   @Post('community/changeStatus')
-  changeStatus(
+  changeStatusCommunity(
     @Body('id') pId: string,
     @Body('status') pStatus: string,
   ) {
-    return this.appService.changeStatus(pId, pStatus);
+    return this.appService.changeStatusCommunity(pId, pStatus);
   }
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index 52c79492..d4a5c20b 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -18,7 +18,7 @@ export class AppService {
     @Inject('SERVICIO_REPORTES') private readonly clientReportApp: ClientProxy,
     @Inject('SERVICIO_NOTIFICACIONES')
     private readonly clientNotificationtApp: ClientProxy,
-  ) {}
+  ) { }
 
   // ====================== USERS ===============================
 
@@ -79,7 +79,7 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
-  
+
   createAdminCommunity(dni: string, name: string, last_name: string, email: string, phone: number
     , user_type: string, status: string, date_entry: Date, community_id: string) {
     const pattern = { cmd: 'createAdminCommunity' };
@@ -128,7 +128,7 @@ export class AppService {
         map((message: string) => ({ message })),
       );
   }
-  
+
 
   //GET parameter from API
   findUser(paramUserDNI: string) {
@@ -179,17 +179,10 @@ export class AppService {
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
-  changeStatus(pId: string, pStatus: string) {
-    const pattern = { cmd: 'changeStatus' };
-    const payload = { id: pId, status: pStatus };
-    return this.clientCommunityApp
-      .send<string>(pattern, payload)
-      .pipe(map((message: string) => ({ message })));
-  }
 
 
-   //GET parameter from API
-   findUserById(id: string) {
+  //GET parameter from API
+  findUserById(id: string) {
     const pattern = { cmd: 'findById' };
     const payload = { id: id };
     return this.clientUserApp
@@ -197,8 +190,23 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  changeStatusUser(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
 
   // ====================== COMMUNITIES ===============================
+  changeStatusCommunity(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
 
   //POST parameter from API
   createCommunity(name: string, province: string, canton: string, district: string
@@ -285,8 +293,8 @@ export class AppService {
   }
 
 
-   //GET parameter from API
-   findByCommunity(paramCommunityId: string) {
+  //GET parameter from API
+  findByCommunity(paramCommunityId: string) {
     const pattern = { cmd: 'findByCommunity' };
     const payload = { community_id: paramCommunityId };
     return this.clientCommonAreaApp
@@ -295,14 +303,14 @@ export class AppService {
   }
 
 
-    //DELETE parameter from API
-    deleteCommonArea(paramCommonAreaId: string) {
-      const pattern = { cmd: 'removeCommonArea' };
-      const payload = { id: paramCommonAreaId };
-      return this.clientCommonAreaApp
-        .send<string>(pattern, payload)
-        .pipe(map((message: string) => ({ message })));
-    }
+  //DELETE parameter from API
+  deleteCommonArea(paramCommonAreaId: string) {
+    const pattern = { cmd: 'removeCommonArea' };
+    const payload = { id: paramCommonAreaId };
+    return this.clientCommonAreaApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
 
   // ====================== GUESTS ===============================
 

From 2424d78bf6c6184a59271d6a7fc6177ae5c2ec65 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 2 Aug 2022 22:09:24 -0600
Subject: [PATCH 5/6] finalizar funcionalidad cambiar de estado

---
 .../src/components/AdministradoresSistema.js  | 147 +++++++++++-------
 .../src/components/ComunidadViviendas.js      |   2 -
 2 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/web-ui/web-react/src/components/AdministradoresSistema.js b/web-ui/web-react/src/components/AdministradoresSistema.js
index b2eca848..c2761b49 100644
--- a/web-ui/web-react/src/components/AdministradoresSistema.js
+++ b/web-ui/web-react/src/components/AdministradoresSistema.js
@@ -11,7 +11,7 @@ import { 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';
 
 const AdministradoresSistema = () => {
   const [administrators, setAdministrators] = useState([]);
@@ -98,6 +98,51 @@ const AdministradoresSistema = () => {
       );
   }
 
+  const cambiarStatusUser = () => {
+    if (sysadmin.status == '1') {
+      sysadmin.status = '0';
+      sysadmin.status_text = 'Inactivo';
+
+    } else if (sysadmin.status == '0') {
+      sysadmin.status = '1';
+      sysadmin.status_text = 'Activo';
+    }
+    var data = {
+      id: sysadmin._id,
+      status: sysadmin.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) {
+          setChangeStatusAdminSystemDialog(false);
+          toast.current.show({
+            severity: 'success',
+            summary: 'Éxito',
+            detail: 'Administrador del Sistema Actualizado',
+            life: 3000,
+          });
+        }
+      )
+      .catch(
+        err => console.log('Ocurrió un error con el fetch', err)
+      );
+  }
+
   const confirmDeleteAdminSystem = (sysAdmin) => {
     setSysAdmin(sysAdmin);
     setDeleteAdminSystemDialog(true);
@@ -115,13 +160,13 @@ const AdministradoresSistema = () => {
     setDeleteAdminsSystemDialog(false);
   };
 
-  const confirmChangeStatusAdminSystem = (sysAdmin) => {
-    setSysAdmin(sysAdmin);
-    setDeleteAdminSystemDialog(true);
+  const hideChangeStatusAdminDialog = () => {
+    setChangeStatusAdminSystemDialog(false);
   };
 
-  const hideChangeStatusAdminSystemDialog = () => {
-    setChangeStatusAdminSystemDialog(false);
+  const confirmChangeStatusAdminSystem = (sysAdmin) => {
+    setSysAdmin(sysAdmin);
+    setChangeStatusAdminSystemDialog(true);
   };
 
   const deleteSysAdmin = () => {
@@ -165,7 +210,7 @@ const AdministradoresSistema = () => {
 
   const deleteSelectedAdminsSystem = () => {
     let _administrators = administrators.filter(
-      (val) => (!selectedAdministrators.includes(val) || val.status != -1),
+      (val) => (!selectedAdministrators.includes(val)),
     );
     selectedAdministrators.map((item) => {
       fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
@@ -176,7 +221,9 @@ const AdministradoresSistema = () => {
         },
       });
     });
-
+    _administrators = _administrators.filter(
+      (val) => val.status != -1,
+    )
     setAdministrators(_administrators);
     setDeleteAdminsSystemDialog(false);
     setSelectedAdministrators(null);
@@ -188,53 +235,21 @@ const AdministradoresSistema = () => {
     });
   };
 
-  const changeStatusAdminSystm = () => {
-    fetch('http://localhost:4000/user/statusAdminSystem/' + sysadmin._id, {
-      cache: 'no-cache',
-      method: 'POST',
-      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 _sysadmin = administrators.filter(
-          (val) => (val._id !== sysadmin._id || val.status != -1),
-        );
-
-        setAdministrators(_sysadmin);
-        setDeleteAdminSystemDialog(false);
-        setSysAdmin(emptySysAdmin);
-        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 actionsAdmin = (rowData) => {
+     let icono = '';
+    if (rowData.status == '0') {
+      icono = "pi pi-eye";
+    } else if (rowData.status == '1') {
+      icono = "pi pi-eye-slash";
+    }
+
     return (
       <div className="actions">
           <Button
-          icon="pi pi-eye"
-          className="p-button-rounded p-button-warning mt-2"
+          icon={`${icono}`}
+          className={`p-button-rounded p-button-warning mt-2 mx-2`}
           onClick={() => confirmChangeStatusAdminSystem(rowData)}
         />
         <Button
@@ -330,13 +345,13 @@ const AdministradoresSistema = () => {
         label="No"
         icon="pi pi-times"
         className="p-button-text"
-        onClick={hideChangeStatusAdminSystemDialog}
+        onClick={hideChangeStatusAdminDialog}
       />
       <Button
         label="Yes"
         icon="pi pi-check"
         className="p-button-text"
-        onClick={changeStatusAdminSystm}
+        onClick={cambiarStatusUser}
       />
     </>
   );
@@ -389,6 +404,14 @@ const AdministradoresSistema = () => {
       </p>
     </>
   );
+  const headerStatus = (
+    <>
+      <p> {' '}
+        <FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#D7A86E" }} />{' '}
+        Estado
+      </p>
+    </>
+  )
 
   return (
     <div className="grid">
@@ -525,6 +548,26 @@ const AdministradoresSistema = () => {
               )}
             </div>
           </Dialog>
+          <Dialog
+            visible={changeStatusAdminSystemDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={changeStatusAdminSystemDialogFooter}
+            onHide={hideChangeStatusAdminDialog}
+          >
+            <div className="flex align-items-center justify-content-center">
+              <i
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {sysadmin && (
+                <span>
+                  ¿Estás seguro que desea cambiar estado a <b>{sysadmin.name}</b>?
+                </span>
+              )}
+            </div>
+          </Dialog>
         </div>
       </div>
       <div className="col-12">
diff --git a/web-ui/web-react/src/components/ComunidadViviendas.js b/web-ui/web-react/src/components/ComunidadViviendas.js
index e220c777..5b607e5e 100644
--- a/web-ui/web-react/src/components/ComunidadViviendas.js
+++ b/web-ui/web-react/src/components/ComunidadViviendas.js
@@ -12,9 +12,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
 import { faMapLocationDot } from '@fortawesome/free-solid-svg-icons';
 import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
-import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
 import { faHashtag } from '@fortawesome/free-solid-svg-icons';
-import { icon } from '@fortawesome/fontawesome-svg-core';
 import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
 
 const Communities = () => {

From e0fe79a1e50d40c0512ca3a120d75ceca3f0e7ba Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 2 Aug 2022 22:22:45 -0600
Subject: [PATCH 6/6] agregar columna de estado en la lista

---
 .../src/components/AdministradoresSistema.js  | 52 +++++++++++++++----
 .../src/components/ComunidadViviendas.js      | 28 +++++-----
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/web-ui/web-react/src/components/AdministradoresSistema.js b/web-ui/web-react/src/components/AdministradoresSistema.js
index c2761b49..40529fc6 100644
--- a/web-ui/web-react/src/components/AdministradoresSistema.js
+++ b/web-ui/web-react/src/components/AdministradoresSistema.js
@@ -41,14 +41,24 @@ const AdministradoresSistema = () => {
     password: '',
     user_type: '1',
     status: '1',
+    status_text: '',
   };
 
 
   async function fetchP() {
     let nombres = await fetch(urlFetch, { method: 'GET' });
     let adminRes = await nombres.json();
+    let data = await adminRes.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';
+      } 
+    })
     setAdministrators(adminRes.message);
-    console.log(administrators);
   }
   useEffect(() => {
     fetchP();
@@ -67,7 +77,6 @@ const AdministradoresSistema = () => {
       status: "1"
     };
     setSysAdmin(data)
-    // console.log(data);
 
     fetch('http://localhost:4000/user/createAdminSystem/', {
       cache: 'no-cache',
@@ -186,7 +195,7 @@ const AdministradoresSistema = () => {
         let _sysadmin = administrators.filter(
           (val) => (val._id !== sysadmin._id || val.status != -1),
         );
-        
+
         setAdministrators(_sysadmin);
         setDeleteAdminSystemDialog(false);
         setSysAdmin(emptySysAdmin);
@@ -235,27 +244,33 @@ const AdministradoresSistema = () => {
     });
   };
 
-  
+
 
   const actionsAdmin = (rowData) => {
-     let icono = '';
+    let icono = '';
+    let text = '';
     if (rowData.status == '0') {
       icono = "pi pi-eye";
+      text = "Activar Administrador"
     } else if (rowData.status == '1') {
       icono = "pi pi-eye-slash";
+      text = "Inactivar Administrador"
+
     }
 
     return (
       <div className="actions">
-          <Button
+        <Button
           icon={`${icono}`}
           className={`p-button-rounded p-button-warning mt-2 mx-2`}
           onClick={() => confirmChangeStatusAdminSystem(rowData)}
+          title={`${text}`}
         />
         <Button
           icon="pi pi-trash"
-          className="p-button-rounded p-button-danger mt-2"
+          className="p-button-rounded p-button-danger mt-2 mx-2"
           onClick={() => confirmDeleteAdminSystem(rowData)}
+          title="Eliminar Administrador"
         />
       </div>
     );
@@ -413,6 +428,18 @@ const AdministradoresSistema = () => {
     </>
   )
 
+  const statusBodyTemplate = (rowData) => {
+    return (
+      <>
+        <span
+          className={`status status-${rowData.status}`}
+        >
+          {rowData.status_text}
+        </span>
+      </>
+    );
+  };
+
   return (
     <div className="grid">
       <div className="col-12">
@@ -502,8 +529,15 @@ const AdministradoresSistema = () => {
               }}
             ></Column>
             <Column
-              
-              style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
+              field="status"
+              sortable
+              header={headerStatus}
+              body={statusBodyTemplate}
+              style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+            </Column>
+            <Column
+
+              style={{ flexGrow: 1, flexBasis: '80px', minWidth: '80px' }}
               body={actionsAdmin}
             ></Column>
           </DataTable>
diff --git a/web-ui/web-react/src/components/ComunidadViviendas.js b/web-ui/web-react/src/components/ComunidadViviendas.js
index 5b607e5e..61c86b41 100644
--- a/web-ui/web-react/src/components/ComunidadViviendas.js
+++ b/web-ui/web-react/src/components/ComunidadViviendas.js
@@ -696,15 +696,15 @@ const Communities = () => {
 
   const statusBodyTemplate = (rowData) => {
     return (
-        <>
-            <span
-                className={`status status-${rowData.status}`}
-            >
-                {rowData.status_text}
-            </span>
-        </>
+      <>
+        <span
+          className={`status status-${rowData.status}`}
+        >
+          {rowData.status_text}
+        </span>
+      </>
     );
-};
+  };
 
   const tenantsBodyTemplate = (rowData) => {
     let tenants = rowData.tenants;
@@ -790,12 +790,12 @@ const Communities = () => {
               header={headerAdministrator}
               style={{ flexGrow: 1, flexBasis: '180px' }}
             ></Column>
-            <Column 
-            field="status" 
-            sortable 
-            header={headerStatus} 
-            body={statusBodyTemplate} 
-            style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+            <Column
+              field="status"
+              sortable
+              header={headerStatus}
+              body={statusBodyTemplate}
+              style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
             </Column>
             <Column
               body={actionsCommunity}