Merge branch 'dev' into US-27-ListarAreasComunes
This commit is contained in:
commit
d4beea04aa
|
@ -32,7 +32,9 @@ export class CommonAreasService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
|
||||
async findByCommunity(community_id: string): Promise<CommonArea[]> {
|
||||
|
|
|
@ -56,7 +56,9 @@ export class CommunitiesService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.communityModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
|
||||
async findCommunityAdmin(community: string, user_type: string) {
|
||||
|
|
|
@ -33,6 +33,8 @@ export class PostCommentsService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.commentModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.commentModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,6 +32,8 @@ export class GuestsService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.guestModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.guestModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,6 +31,9 @@ export class ReportsService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.reportModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.reportModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,6 +41,8 @@ export class ReservationsService {
|
|||
}
|
||||
|
||||
async remove(id: string) {
|
||||
return this.reservationModel.findByIdAndRemove({ _id: id }).exec();
|
||||
return this.reservationModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,8 +76,14 @@ export class UsersService {
|
|||
});
|
||||
}
|
||||
|
||||
async remove(id: string) {
|
||||
/* async remove(id: string) {
|
||||
return this.userModel.findByIdAndRemove({ _id: id }).exec();
|
||||
}*/
|
||||
|
||||
async remove(id: string) {
|
||||
return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
|
||||
//inicio de sesion
|
||||
|
@ -142,7 +148,9 @@ export class UsersService {
|
|||
}
|
||||
|
||||
async deleteAdminSystem(id: string) {
|
||||
return this.userModel.deleteOne({ _id: id }).exec();
|
||||
return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
|
||||
new: true,
|
||||
});
|
||||
}
|
||||
|
||||
async validateEmail(email: string) {
|
||||
|
|
|
@ -345,15 +345,7 @@ const AdministradoresComunidad = () => {
|
|||
</>
|
||||
)
|
||||
|
||||
const headerOptions = (
|
||||
<>
|
||||
<p>
|
||||
{' '}
|
||||
<FontAwesomeIcon icon={faEllipsis} size="2x" style={{ color: "#C08135" }} />{' '}
|
||||
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const onInputChange = (e, name) => {
|
||||
const val = (e.target && e.target.value) || '';
|
||||
|
@ -389,9 +381,9 @@ 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" sortable header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column field="community_name" header={headerCommuntiy} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column header={headerOptions} style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdminCommunity}></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>
|
||||
</DataTable>
|
||||
<Dialog visible={deleteAdminCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminCommunityDialogFooter} onHide={hideDeleteAdminCommunityDialog}>
|
||||
<div className="flex align-items-center justify-content-center">
|
||||
|
|
|
@ -313,15 +313,6 @@ const AdministradoresSistema = () => {
|
|||
</>
|
||||
);
|
||||
|
||||
const headerOptions = (
|
||||
<>
|
||||
<p>
|
||||
Opciones{' '}
|
||||
<FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
|
||||
</p>
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="grid">
|
||||
<div className="col-12">
|
||||
|
@ -402,7 +393,6 @@ const AdministradoresSistema = () => {
|
|||
></Column>
|
||||
<Column
|
||||
field="phone"
|
||||
sortable
|
||||
header={headerPhone}
|
||||
style={{
|
||||
flexGrow: 1,
|
||||
|
@ -412,7 +402,7 @@ const AdministradoresSistema = () => {
|
|||
}}
|
||||
></Column>
|
||||
<Column
|
||||
header={headerOptions}
|
||||
|
||||
style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
|
||||
body={actionsAdmin}
|
||||
></Column>
|
||||
|
|
|
@ -432,7 +432,7 @@ const Communities = () => {
|
|||
icon={faMapLocationDot}
|
||||
style={{ color: '#D7A86E' }}
|
||||
/>{' '}
|
||||
Pronvincia
|
||||
Provincia
|
||||
</p>
|
||||
</>
|
||||
);
|
||||
|
@ -493,15 +493,6 @@ const Communities = () => {
|
|||
</>
|
||||
);
|
||||
|
||||
const headerOptions = (
|
||||
<>
|
||||
<p>
|
||||
Opciones{' '}
|
||||
<FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
|
||||
</p>
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="grid">
|
||||
<div className="col-12">
|
||||
|
@ -537,21 +528,25 @@ const Communities = () => {
|
|||
></Column>
|
||||
<Column
|
||||
field="name"
|
||||
sortable
|
||||
header={headerName}
|
||||
style={{ flexGrow: 1, flexBasis: '160px' }}
|
||||
></Column>
|
||||
<Column
|
||||
field="province"
|
||||
sortable
|
||||
header={headerProvince}
|
||||
style={{ flexGrow: 1, flexBasis: '160px' }}
|
||||
></Column>
|
||||
<Column
|
||||
field="canton"
|
||||
sortable
|
||||
header={headerCanton}
|
||||
style={{ flexGrow: 1, flexBasis: '160px' }}
|
||||
></Column>
|
||||
<Column
|
||||
field="district"
|
||||
sortable
|
||||
header={headerDistrict}
|
||||
style={{ flexGrow: 1, flexBasis: '160px' }}
|
||||
></Column>
|
||||
|
@ -562,15 +557,16 @@ const Communities = () => {
|
|||
></Column>
|
||||
<Column
|
||||
field="num_houses"
|
||||
sortable
|
||||
header={headerNumberHouses}
|
||||
style={{ flexGrow: 1, flexBasis: '180px' }}
|
||||
></Column>
|
||||
<Column
|
||||
field="name_admin"
|
||||
header={headerAdministrator}
|
||||
sortable
|
||||
style={{ flexGrow: 1, flexBasis: '180px' }}
|
||||
></Column>
|
||||
<Column header={headerOptions} body={actionsCommunity}></Column>
|
||||
<Column body={actionsCommunity}></Column>
|
||||
</DataTable>
|
||||
<Dialog
|
||||
visible={deleteCommunityDialog}
|
||||
|
|
|
@ -218,39 +218,49 @@ console.log('ssss');
|
|||
|
||||
const headerName = (
|
||||
<>
|
||||
<p>Nombre</p>
|
||||
<p>{' '}
|
||||
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
|
||||
Nombre
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const headerLastName = (
|
||||
<>
|
||||
<p>Apellidos</p>
|
||||
<p>
|
||||
{' '}
|
||||
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
|
||||
Apellido(s)
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const headerDNI = (
|
||||
<>
|
||||
<p>Identificación</p>
|
||||
</>
|
||||
<p> {' '}
|
||||
<FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
|
||||
Identificación
|
||||
</p>
|
||||
)
|
||||
|
||||
const headerEmail = (
|
||||
<>
|
||||
<p>Correo Electrónico</p>
|
||||
<p> {' '}
|
||||
<FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
|
||||
Correo Electrónico
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const headerPhone = (
|
||||
<>
|
||||
<p>Teléfono</p>
|
||||
<p>
|
||||
{' '}
|
||||
<FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
|
||||
Teléfono
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
|
||||
const headerOptions = (
|
||||
<>
|
||||
<p>Opciones</p>
|
||||
</>
|
||||
)
|
||||
|
||||
return (
|
||||
<div className="grid">
|
||||
|
@ -270,8 +280,8 @@ console.log('ssss');
|
|||
<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" sortable header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column header={headerOptions} style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdmin}></Column>
|
||||
<Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||
<Column style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdmin}></Column>
|
||||
</DataTable>
|
||||
<Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}>
|
||||
<div className="flex align-items-center justify-content-center">
|
||||
|
|
Loading…
Reference in New Issue