Merge branch 'dev' of github.com:DeimosPr4/katoikia-app into 172-issue-arreglar-registro-inquilino
This commit is contained in:
commit
dd54ee2ce5
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,12 +112,17 @@ 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) {
|
||||
let pid = body['id'];
|
||||
|
|
|
|||
|
|
@ -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) => {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
"@fullcalendar/interaction": "^5.7.2",
|
||||
"@fullcalendar/react": "^5.7.0",
|
||||
"@fullcalendar/timegrid": "^5.7.2",
|
||||
"axios": "^0.19.0",
|
||||
"axios": "^0.19.2",
|
||||
"bootstrap": "^5.2.0",
|
||||
"chart.js": "3.3.2",
|
||||
"classnames": "^2.2.6",
|
||||
"cors": "^2.8.5",
|
||||
|
|
@ -2288,6 +2289,16 @@
|
|||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/@popperjs/core": {
|
||||
"version": "2.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
|
||||
"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
|
||||
"peer": true,
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/popperjs"
|
||||
}
|
||||
},
|
||||
"node_modules/@svgr/babel-plugin-add-jsx-attribute": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
|
||||
|
|
@ -4210,6 +4221,24 @@
|
|||
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
|
||||
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
|
||||
},
|
||||
"node_modules/bootstrap": {
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz",
|
||||
"integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/twbs"
|
||||
},
|
||||
{
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/bootstrap"
|
||||
}
|
||||
],
|
||||
"peerDependencies": {
|
||||
"@popperjs/core": "^2.11.5"
|
||||
}
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
|
|
@ -19688,6 +19717,12 @@
|
|||
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
|
||||
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
|
||||
},
|
||||
"@popperjs/core": {
|
||||
"version": "2.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
|
||||
"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
|
||||
"peer": true
|
||||
},
|
||||
"@svgr/babel-plugin-add-jsx-attribute": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
|
||||
|
|
@ -21217,6 +21252,12 @@
|
|||
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
|
||||
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
|
||||
},
|
||||
"bootstrap": {
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz",
|
||||
"integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==",
|
||||
"requires": {}
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
"@fullcalendar/interaction": "^5.7.2",
|
||||
"@fullcalendar/react": "^5.7.0",
|
||||
"@fullcalendar/timegrid": "^5.7.2",
|
||||
"axios": "^0.19.0",
|
||||
"axios": "^0.19.2",
|
||||
"bootstrap": "^5.2.0",
|
||||
"chart.js": "3.3.2",
|
||||
"classnames": "^2.2.6",
|
||||
"cors": "^2.8.5",
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@ import GuardasSeguridad from './components/GuardasSeguridad';
|
|||
import Communities from './components/ComunidadViviendas';
|
||||
import Inquilinos from './components/Inquilinos';
|
||||
import InquilinosCompletar from "./components/InquilinosCompletar.js";
|
||||
import RegistroComunicado from './components/RegistroComunicado';
|
||||
import "../node_modules/bootstrap/dist/css/bootstrap.min.css";
|
||||
|
||||
import Crud from './pages/Crud';
|
||||
import EmptyPage from './pages/EmptyPage';
|
||||
|
|
@ -200,6 +202,9 @@ const App = () => {
|
|||
icon: PrimeIcons.BUILDING,
|
||||
to: '/areasComunes',
|
||||
},
|
||||
|
||||
{ label: 'Comunicados', icon: PrimeIcons.COMMENTS, to: '/registroComunicado'},
|
||||
|
||||
]
|
||||
},
|
||||
]
|
||||
|
|
@ -440,7 +445,6 @@ const App = () => {
|
|||
<>
|
||||
|
||||
<Route path="/login" exact component={LogInUser} />
|
||||
|
||||
</>
|
||||
|
||||
)
|
||||
|
|
@ -453,7 +457,6 @@ const App = () => {
|
|||
<Route path="/administradoresSistema" component={AdministradoresSistema} />
|
||||
<Route path="/administradoresComunidad" component={AdministradoresComunidad} />
|
||||
<Route path="/comunidadesViviendas" component={Communities} />
|
||||
<Route to="*" exact component={Page404} />
|
||||
</>
|
||||
|
||||
)
|
||||
|
|
@ -465,8 +468,7 @@ const App = () => {
|
|||
<Route path="/guardasSeguridad" component={GuardasSeguridad} />
|
||||
<Route path="/inquilinos" component={Inquilinos} />
|
||||
<Route path="/areasComunes" component={AreasComunes} />
|
||||
<Route to="*" exact component={Page404} />
|
||||
|
||||
<Route path="/registroComunicado" component={RegistroComunicado} />
|
||||
</>
|
||||
)
|
||||
} else {
|
||||
|
|
@ -479,7 +481,6 @@ const App = () => {
|
|||
return (
|
||||
<>
|
||||
<Route path="/" exact render={() => <Dashboard colorMode={layoutColorMode} location={location} />} />
|
||||
|
||||
<Route path="/formlayout" component={FormLayoutDemo} />
|
||||
<Route path="/input" component={InputDemo} />
|
||||
<Route path="/floatlabel" component={FloatLabelDemo} />
|
||||
|
|
@ -502,8 +503,6 @@ const App = () => {
|
|||
<Route path="/crud" component={Crud} />
|
||||
<Route path="/empty" component={EmptyPage} />
|
||||
<Route path="/documentation" component={Documentation} />
|
||||
|
||||
|
||||
</>
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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 resList = await response.json();
|
||||
let list = await resList.message;
|
||||
let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' })
|
||||
.then((response) => response.json())
|
||||
.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,7 +117,7 @@ const AdministradoresComunidad = () => {
|
|||
|
||||
|
||||
const deleteAdminCommunity = () => {
|
||||
/* fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
|
||||
fetch('http://localhost:4000/user/deleteAdminCommunity/' + adminCommunity._id, {
|
||||
cache: 'no-cache',
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
|
|
@ -112,46 +135,38 @@ const AdministradoresComunidad = () => {
|
|||
.then(
|
||||
function (response) {
|
||||
|
||||
let _community = communities.filter(val => val._id !== community._id);
|
||||
setCommunities(_community);
|
||||
setDeleteCommunityDialog(false);
|
||||
setCommunity(emptyCommunity);
|
||||
toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Comunidad de Viviendas Eliminada', life: 3000 });
|
||||
}
|
||||
)
|
||||
.catch(
|
||||
err => {
|
||||
console.log('Ocurrió un error con el fetch', err)
|
||||
toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Comunidad de Viviendas 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,
|
||||
});
|
||||
toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Administrador Comunidad Eliminada', life: 3000 });
|
||||
}
|
||||
)
|
||||
.catch(
|
||||
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 });
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
};
|
||||
|
||||
const deleteSelectedAdminsCommunity = () => {
|
||||
let _admins = listaAdmins.filter(
|
||||
(val) => !selectedAdminsCommunities.includes(val),
|
||||
);
|
||||
/* selectedCommunities.map((item) => {
|
||||
fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
|
||||
selectedAdminsCommunities.map((item) => {
|
||||
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,6 +443,15 @@ const AdministradoresComunidad = () => {
|
|||
</>
|
||||
)
|
||||
|
||||
const headerStatus = (
|
||||
<>
|
||||
<p> {' '}
|
||||
<FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#C08135" }} />{' '}
|
||||
Estado
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
|
||||
|
||||
const onInputChange = (e, name) => {
|
||||
|
|
@ -360,6 +468,18 @@ const AdministradoresComunidad = () => {
|
|||
console.log(getCommunityValue)
|
||||
}
|
||||
|
||||
const statusBodyTemplate = (rowData) => {
|
||||
return (
|
||||
<>
|
||||
<span
|
||||
className={`status status-${rowData.status}`}
|
||||
>
|
||||
{rowData.status_text}
|
||||
</span>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
|
||||
|
||||
|
|
@ -382,6 +502,7 @@ const AdministradoresComunidad = () => {
|
|||
<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="community_name" sortable header={headerCommuntiy} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></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}>
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -708,7 +708,11 @@ const Communities = () => {
|
|||
|
||||
const tenantsBodyTemplate = (rowData) => {
|
||||
let tenants = rowData.tenants;
|
||||
let name = findNameTenant(tenants.tenant_id);
|
||||
let name = 'Sin inquilino';
|
||||
if (rowData.tenants) {
|
||||
name = findNameTenant(tenants.tenant_id);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{name}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,165 @@
|
|||
import React, { useEffect, useState, useRef } from 'react';
|
||||
import { InputText } from 'primereact/inputtext';
|
||||
import { Button } from 'primereact/button';
|
||||
import { InputTextarea } from 'primereact/inputtextarea';
|
||||
import { useCookies } from "react-cookie";
|
||||
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';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
|
||||
import { faCommentAlt } 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 { faHomeAlt } from '@fortawesome/free-solid-svg-icons';
|
||||
import { Dropdown } from 'primereact/dropdown';
|
||||
import classNames from 'classnames';
|
||||
const RegistroComunicado = () => {
|
||||
|
||||
let emptyComunicado = {
|
||||
_id: null,
|
||||
post: '',
|
||||
user_id: '',
|
||||
community_id: ''
|
||||
};
|
||||
|
||||
useEffect(()=>{
|
||||
listaComunis();
|
||||
},[])
|
||||
|
||||
|
||||
const [comunicado, setComunicado] = useState(emptyComunicado);
|
||||
const [comunicados,setComuicados]=useState([]);
|
||||
const [comunicadoId, setComunicadoId] = useState(null);
|
||||
const [submitted, setSubmitted] = useState(false);
|
||||
const toast = useRef(null);
|
||||
const dt = useRef(null);
|
||||
const [cookies, setCookie] = useCookies();
|
||||
const [globalFilter, setGlobalFilter] = useState(null);
|
||||
|
||||
async function listaComunis() {
|
||||
let comunicadosA=await fetch('http://localhost:4000/post/allPosts', {method:'GET'});
|
||||
let comunicadosRes= await comunicadosA.json();
|
||||
setComuicados(comunicadosRes.message);
|
||||
console.log(comunicadosRes.message);
|
||||
}
|
||||
|
||||
|
||||
const saveComunicado = () => {
|
||||
var data = {
|
||||
post: document.getElementById('txt_comunicado').value,
|
||||
user_id: cookies.id,
|
||||
community_id: cookies.community_id
|
||||
};
|
||||
|
||||
fetch('http://localhost:4000/post/createPost', {
|
||||
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) {
|
||||
|
||||
}
|
||||
)
|
||||
.catch(
|
||||
err => console.log('Ocurrió un error con el fetch', err)
|
||||
);
|
||||
}
|
||||
|
||||
const header = (
|
||||
<React.Fragment>
|
||||
|
||||
<div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
|
||||
<h5 className="m-0">Comunicados de la comunidad</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>
|
||||
</React.Fragment>
|
||||
);
|
||||
const headerPost = (
|
||||
<>
|
||||
<p>
|
||||
{' '}
|
||||
<FontAwesomeIcon icon={faCommentAlt} style={{ color: "#D7A86E" }} />{' '}
|
||||
Descripción comunicado</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const leftToolbarTemplate = () => {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<div className="my-2">
|
||||
<Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" />
|
||||
</div>
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
||||
const rightToolbarTemplate = () => {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="grid">
|
||||
<div className="col-12">
|
||||
<Toast ref={toast} />
|
||||
<div className="card">
|
||||
<Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
|
||||
<DataTable ref={dt} value={comunicados} dataKey="_id" paginator rows={5}
|
||||
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 de comunidades de viviendas"
|
||||
globalFilter={globalFilter} emptyMessage="No hay administradores de comunidades registrados.">
|
||||
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
|
||||
<Column field="post" sortable header={headerPost} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
|
||||
</DataTable>
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-12">
|
||||
<div className="card">
|
||||
<h5>Registro de un comunicado para la comunidad</h5>
|
||||
<div className="p-fluid formgrid grid">
|
||||
<div className="field col-12 md:col-12">
|
||||
<label htmlFor="name">Contenido del comunicado</label>
|
||||
<div className="p-0 col-12 md:col-12">
|
||||
<div className="p-inputgroup">
|
||||
<span className="p-inputgroup-addon p-button p-icon-input-khaki">
|
||||
<i className="pi pi-pencil"></i>
|
||||
</span>
|
||||
<InputTextarea id="txt_comunicado" rows="4"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Button label="Registrar" onClick={saveComunicado} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default React.memo(RegistroComunicado);
|
||||
Loading…
Reference in New Issue