Merge pull request #121 from DeimosPr4/UH-eliminarAdminSistema
UH-eliminar administrador del sistema
This commit is contained in:
GitHub
commit
4f92903768
|
|
@ -1,4 +1,4 @@
|
|||
import { Controller, Get, Post, Body, Param } from '@nestjs/common';
|
||||
import { Controller, Get, Post, Body, Param, Delete } from '@nestjs/common';
|
||||
import { AppService } from "./app.service";
|
||||
@Controller()
|
||||
export class AppController {
|
||||
|
|
@ -92,6 +92,13 @@ export class AppController {
|
|||
}
|
||||
|
||||
|
||||
@Delete('user/deleteAdminSystem/:id')
|
||||
deleteAdminSystem(
|
||||
@Param('id') id: string,
|
||||
) {
|
||||
return this.appService.deleteAdminSystem(id);
|
||||
}
|
||||
|
||||
// #==== API Communities
|
||||
@Post('community/createCommunity')
|
||||
createCommunity(
|
||||
|
|
@ -342,6 +349,4 @@ export class AppController {
|
|||
|
||||
return this.appService.html(email, name);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -116,6 +116,17 @@ export class AppService {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
deleteAdminSystem(id: string) {
|
||||
const pattern = { cmd: 'deleteAdminSystem' };
|
||||
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};
|
||||
|
|
|
|||
|
|
@ -84,6 +84,12 @@ export class UsersController {
|
|||
return this.userService.findCommunityUser(user["community_id"], user["user_type"]);
|
||||
}
|
||||
|
||||
@MessagePattern({ cmd: 'deleteAdminSystem' })
|
||||
deleteAdminSystem(@Payload() user: any) {
|
||||
console.log("entró")
|
||||
|
||||
return this.userService.deleteAdminSystem(user["id"]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export class UsersService {
|
|||
@Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy,
|
||||
|
||||
) { }
|
||||
private publicKey: string;
|
||||
private publicKey: string;
|
||||
async create(user: UserDocument): Promise<User> {
|
||||
let passwordEncriptada = Md5.init(user.password);
|
||||
user.password = passwordEncriptada;
|
||||
|
|
@ -79,15 +79,15 @@ export class UsersService {
|
|||
|
||||
|
||||
//find admin del sistema
|
||||
async findGuardsCommunity(pcommunity_id: string): Promise<User[]> {
|
||||
async findGuardsCommunity(pcommunity_id: string): Promise<User[]> {
|
||||
return this.userModel.find({ user_type: 4 }).exec();
|
||||
}
|
||||
|
||||
//find admin de comunidad
|
||||
async allUsersAdminComunidad(): Promise<User[]> {
|
||||
return this.userModel.find({ user_type: 2 }).exec();
|
||||
}
|
||||
|
||||
|
||||
async testSendMail(user: UserDocument) {
|
||||
let passwordEncriptada = Md5.init(user.password);
|
||||
user.password = passwordEncriptada;
|
||||
|
|
@ -105,11 +105,12 @@ export class UsersService {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
async findCommunityUser(community_id: string, user_type: number): Promise<User> {
|
||||
return this.userModel.findOne({ community_id: community_id, user_type: user_type }).exec();
|
||||
}
|
||||
|
||||
async deleteAdminSystem(id: string) {
|
||||
return this.userModel.deleteOne({_id: id}).exec();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,46 @@
|
|||
import React, { useEffect, useState } from 'react';
|
||||
import React, { useEffect, useState, useRef } from 'react';
|
||||
import { InputText } from 'primereact/inputtext';
|
||||
import { Button } from 'primereact/button';
|
||||
import { DataTable } from 'primereact/datatable';
|
||||
import { Column } from 'primereact/column';
|
||||
import { Toast } from 'primereact/toast';
|
||||
import { Dialog } from 'primereact/dialog';
|
||||
import { Toolbar } from 'primereact/toolbar';
|
||||
|
||||
const AdministradoresSistema = () => {
|
||||
|
||||
const [pokemones,setPokemones]=useState([]);
|
||||
const [urlFetch,setUrlFetch]=useState('http://localhost:4000/user/findAdminSistema/');
|
||||
async function fetchP(){
|
||||
let nombres=await fetch(urlFetch, {method:'GET'});
|
||||
let pokemonesRes= await nombres.json();
|
||||
setPokemones(pokemonesRes.message);
|
||||
console.log(pokemones);
|
||||
}
|
||||
useEffect(()=>{
|
||||
fetchP();
|
||||
},[])
|
||||
const [administrators, setAdministrators] = useState([]);
|
||||
const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findAdminSistema/');
|
||||
const [sysadmin, setSysAdmin] = useState(emptySysAdmin);
|
||||
const [selectedAdministrators, setSelectedAdministrators] = useState(null);
|
||||
const [globalFilter, setGlobalFilter] = useState(null);
|
||||
const [deleteAdminSystemDialog, setDeleteAdminSystemDialog] = useState(false);
|
||||
const [deleteAdminsSystemDialog, setDeleteAdminsSystemDialog] = useState(false);
|
||||
const toast = useRef(null);
|
||||
const dt = useRef(null);
|
||||
|
||||
|
||||
let emptySysAdmin = {
|
||||
_id: null,
|
||||
dni: '',
|
||||
name: '',
|
||||
last_name: '',
|
||||
email: '',
|
||||
phone: '',
|
||||
password: '',
|
||||
user_type: '1',
|
||||
status: ''
|
||||
};
|
||||
|
||||
async function fetchP() {
|
||||
let nombres = await fetch(urlFetch, { method: 'GET' });
|
||||
let adminRes = await nombres.json();
|
||||
setAdministrators(adminRes.message);
|
||||
console.log(administrators);
|
||||
}
|
||||
useEffect(() => {
|
||||
fetchP();
|
||||
}, [])
|
||||
|
||||
function registrarAdmin() {
|
||||
var data = {
|
||||
|
|
@ -29,9 +53,9 @@ const AdministradoresSistema = () => {
|
|||
user_type: "1", //1 es admin
|
||||
status: "1"
|
||||
};
|
||||
// console.log(data);
|
||||
// console.log(data);
|
||||
|
||||
fetch('http://localhost:4000/user/createAdminSystem/', {
|
||||
fetch('http://localhost:4000/user/createAdminSystem/', {
|
||||
cache: 'no-cache',
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
|
|
@ -39,36 +63,185 @@ const AdministradoresSistema = () => {
|
|||
'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) {
|
||||
if (response.status != 201)
|
||||
console.log('Ocurrió un error con el servicio: ' + response.status);
|
||||
else
|
||||
return response.json();
|
||||
}
|
||||
)
|
||||
.then(
|
||||
function (response) {
|
||||
let _administrators = [...administrators];
|
||||
let _admin = { ...response.message };;
|
||||
_administrators.push(_admin);
|
||||
setAdministrators(_administrators)
|
||||
}
|
||||
)
|
||||
.catch(
|
||||
err => console.log('Ocurrió un error con el fetch', err)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
const hideDeleteAdminSystemDialog = () => {
|
||||
setDeleteAdminSystemDialog(false);
|
||||
}
|
||||
|
||||
const hideDeleteAdminsSystemsDialog = () => {
|
||||
setDeleteAdminsSystemDialog(false);
|
||||
}
|
||||
|
||||
const confirmDeleteAdminSystem = (sysAdmin) => {
|
||||
setSysAdmin(sysAdmin);
|
||||
setDeleteAdminSystemDialog(true);
|
||||
}
|
||||
|
||||
const confirmDeleteSelected = () => {
|
||||
setDeleteAdminsSystemDialog(true);
|
||||
}
|
||||
|
||||
const deleteSysAdmin = () => {
|
||||
|
||||
fetch('http://localhost:4000/user/deleteAdminSystem/' + sysadmin._id, {
|
||||
cache: 'no-cache',
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
)
|
||||
.then(
|
||||
function (response) {
|
||||
fetchP();
|
||||
}
|
||||
)
|
||||
.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) {
|
||||
let _sysadmin = administrators.filter(val => val._id !== sysadmin._id);
|
||||
setAdministrators(_sysadmin);
|
||||
|
||||
setDeleteAdminSystemDialog(false);
|
||||
setSysAdmin(emptySysAdmin);
|
||||
|
||||
toast.current.show({ severity: 'success', summary: 'Exito', 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 deleteSelectedAdminsSystem = () => {
|
||||
let _administrators = administrators.filter(val => !selectedAdministrators.includes(val));
|
||||
selectedAdministrators.map((item) => {
|
||||
fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
|
||||
cache: 'no-cache',
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
})
|
||||
setAdministrators(_administrators);
|
||||
setDeleteAdminsSystemDialog(false);
|
||||
setSelectedAdministrators(null);
|
||||
toast.current.show({ severity: 'success', summary: 'Successful', detail: 'Products Deleted', life: 3000 });
|
||||
}
|
||||
|
||||
|
||||
const actionsAdmin = (rowData) => {
|
||||
return (
|
||||
<div className="actions">
|
||||
<Button icon="pi pi-trash" className="p-button-rounded p-button-danger mt-2" onClick={() => confirmDeleteAdminSystem(rowData)} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const leftToolbarTemplate = () => {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<div className="my-2">
|
||||
<Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedAdministrators || !selectedAdministrators.length} />
|
||||
</div>
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
||||
const rightToolbarTemplate = () => {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
||||
const header = (
|
||||
<div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
|
||||
<h5 className="m-0">Administradores del sistema</h5>
|
||||
<span className="block mt-2 md:mt-0 p-input-icon-left">
|
||||
<i className="pi pi-search" />
|
||||
<InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
|
||||
const deleteAdminSystemDialogFooter = (
|
||||
<>
|
||||
<Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminSystemDialog} />
|
||||
<Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSysAdmin} />
|
||||
</>
|
||||
);
|
||||
|
||||
const deleteAdminsSystemDialogFooter = (
|
||||
<>
|
||||
<Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminsSystemsDialog} />
|
||||
<Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedAdminsSystem} />
|
||||
</>
|
||||
);
|
||||
return (
|
||||
<div className="grid">
|
||||
<div className="col-12">
|
||||
<Toast ref={toast} />
|
||||
|
||||
<div className="card">
|
||||
<h5>Administradores del sistema</h5>
|
||||
<DataTable value={pokemones} scrollable scrollHeight="400px" scrollDirection="both" className="mt-3">
|
||||
<Column field="name" header="Nombre" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="last_name" header="Apellidos" style={{ flexGrow: 1, flexBasis: '160px' }} alignFrozen="left"></Column>
|
||||
<Column field="dni" header="Identificación" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="email" header="Correo electrónico" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="phone" header="Telefóno" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
< Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
|
||||
|
||||
<DataTable ref={dt} value={administrators} dataKey="_id" paginator rows={5} selection={selectedAdministrators} onSelectionChange={(e) => setSelectedAdministrators(e.value)}
|
||||
scrollable scrollHeight="400px" scrollDirection="both" 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} administradores del sistema"
|
||||
globalFilter={globalFilter} emptyMessage="No hay administradores del sistema registrados."
|
||||
>
|
||||
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
|
||||
<Column field="name" sortable header="👩🏻💼👨🏻💼 Nombre" style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column field="last_name" sortable header="👩🏻💼👨🏻💼 Apellidos" style={{ flexGrow: 1,flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
|
||||
<Column field="dni" sortable header="💳 Identificación" style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column field="email" sortable header="📧 Correo electrónico" style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column field="phone" sortable header="📞 Telefóno" style={{ flexGrow: 1,flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column header="Acciones" style={{ flexGrow: 1,flexBasis: '60px' }} body={actionsAdmin}></Column>
|
||||
|
||||
</DataTable>
|
||||
|
||||
<Dialog visible={deleteAdminSystemDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteAdminSystemDialog}>
|
||||
<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 eliminar a <b>{sysadmin.name}</b>?</span>}
|
||||
</div>
|
||||
</Dialog>
|
||||
<Dialog visible={deleteAdminsSystemDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsSystemDialogFooter} onHide={hideDeleteAdminsSystemsDialog}>
|
||||
<div className="flex align-items-center justify-content-center">
|
||||
<i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
|
||||
{sysadmin && <span>¿Está seguro eliminar los adminsitradores del sistema seleccionados?</span>}
|
||||
</div>
|
||||
</Dialog>
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-12">
|
||||
|
|
@ -101,8 +274,11 @@ const AdministradoresSistema = () => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
export default React.memo(AdministradoresSistema);
|
||||
const comparisonFn = function (prevProps, nextProps) {
|
||||
return prevProps.location.pathname === nextProps.location.pathname;
|
||||
};
|
||||
export default React.memo(AdministradoresSistema, comparisonFn);
|
||||
|
|
@ -238,7 +238,7 @@ const Communities = () => {
|
|||
<Column field="province" header="📍 Provincia" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="canton" header="📍 Cantón" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="district" header="📍 Distrito" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
|
||||
<Column field="phone" header="☎️ Telefóno" style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
|
||||
<Column field="phone" header="📞 Telefóno" style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
|
||||
<Column field="num_houses" header="#️⃣ Número de viviendas" style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
|
||||
<Column field="name_admin" header="👩🏻💼👨🏻💼 Administrador" style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
|
||||
</DataTable>
|
||||
|
|
|
|||
Loading…
Reference in New Issue