eduardo
/
katoikia-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into US-28-EliminarÁreaComún

This commit is contained in:
Mariela 2022-08-01 18:35:10 -06:00
parent eed7af0274 b4dd2a7eb1
commit 8fa7e4a76f
4 changed files with 73 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web-ui/web-react/src/components/AdministradoresComunidad.js
View File

@ -345,15 +345,7 @@ const AdministradoresComunidad = () => {
</> </>
) )
const headerOptions = (
<>
<p>
{' '}
<FontAwesomeIcon icon={faEllipsis} size="2x" style={{ color: "#C08135" }} />{' '}
</p>
</>
)
const onInputChange = (e, name) => { const onInputChange = (e, name) => {
const val = (e.target && e.target.value) || ''; 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 field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
</Column> </Column>
<Column field="email" sortable header={headerEmail} 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="phone" 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 field="community_name" sortable 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 style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdminCommunity}></Column>
</DataTable> </DataTable>
<Dialog visible={deleteAdminCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminCommunityDialogFooter} onHide={hideDeleteAdminCommunityDialog}> <Dialog visible={deleteAdminCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminCommunityDialogFooter} onHide={hideDeleteAdminCommunityDialog}>
<div className="flex align-items-center justify-content-center"> <div className="flex align-items-center justify-content-center">

12
web-ui/web-react/src/components/AdministradoresSistema.js
View File

@ -313,15 +313,6 @@ const AdministradoresSistema = () => {
</> </>
); );
const headerOptions = (
<>
<p>
Opciones{' '}
<FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
</p>
</>
);
return ( return (
<div className="grid"> <div className="grid">
<div className="col-12"> <div className="col-12">
@ -402,7 +393,6 @@ const AdministradoresSistema = () => {
></Column> ></Column>
<Column <Column
field="phone" field="phone"
sortable
header={headerPhone} header={headerPhone}
style={{ style={{
flexGrow: 1, flexGrow: 1,
@ -412,7 +402,7 @@ const AdministradoresSistema = () => {
}} }}
></Column> ></Column>
<Column <Column
header={headerOptions}
style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
body={actionsAdmin} body={actionsAdmin}
></Column> ></Column>

20
web-ui/web-react/src/components/ComunidadViviendas.js
View File

@ -432,7 +432,7 @@ const Communities = () => {
icon={faMapLocationDot} icon={faMapLocationDot}
style={{ color: '#D7A86E' }} style={{ color: '#D7A86E' }}
/>{' '} />{' '}
Pronvincia Provincia
</p> </p>
</> </>
); );
@ -493,15 +493,6 @@ const Communities = () => {
</> </>
); );
const headerOptions = (
<>
<p>
Opciones{' '}
<FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
</p>
</>
);
return ( return (
<div className="grid"> <div className="grid">
<div className="col-12"> <div className="col-12">
@ -537,21 +528,25 @@ const Communities = () => {
></Column> ></Column>
<Column <Column
field="name" field="name"
sortable
header={headerName} header={headerName}
style={{ flexGrow: 1, flexBasis: '160px' }} style={{ flexGrow: 1, flexBasis: '160px' }}
></Column> ></Column>
<Column <Column
field="province" field="province"
sortable
header={headerProvince} header={headerProvince}
style={{ flexGrow: 1, flexBasis: '160px' }} style={{ flexGrow: 1, flexBasis: '160px' }}
></Column> ></Column>
<Column <Column
field="canton" field="canton"
sortable
header={headerCanton} header={headerCanton}
style={{ flexGrow: 1, flexBasis: '160px' }} style={{ flexGrow: 1, flexBasis: '160px' }}
></Column> ></Column>
<Column <Column
field="district" field="district"
sortable
header={headerDistrict} header={headerDistrict}
style={{ flexGrow: 1, flexBasis: '160px' }} style={{ flexGrow: 1, flexBasis: '160px' }}
></Column> ></Column>
@ -562,15 +557,16 @@ const Communities = () => {
></Column> ></Column>
<Column <Column
field="num_houses" field="num_houses"
sortable
header={headerNumberHouses} header={headerNumberHouses}
style={{ flexGrow: 1, flexBasis: '180px' }} style={{ flexGrow: 1, flexBasis: '180px' }}
></Column> ></Column>
<Column <Column
field="name_admin" field="name_admin"
header={headerAdministrator} sortable
style={{ flexGrow: 1, flexBasis: '180px' }} style={{ flexGrow: 1, flexBasis: '180px' }}
></Column> ></Column>
<Column header={headerOptions} body={actionsCommunity}></Column> <Column body={actionsCommunity}></Column>
</DataTable> </DataTable>
<Dialog <Dialog
visible={deleteCommunityDialog} visible={deleteCommunityDialog}

38
web-ui/web-react/src/components/GuardasSeguridad.js
View File

@ -218,39 +218,49 @@ console.log('ssss');
const headerName = ( const headerName = (
<> <>
<p>Nombre</p> <p>{' '}
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
Nombre
</p>
</> </>
) )
const headerLastName = ( const headerLastName = (
<> <>
<p>Apellidos</p> <p>
{' '}
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
Apellido(s)
</p>
</> </>
) )
const headerDNI = ( const headerDNI = (
<> <p> {' '}
<p>Identificación</p> <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
</> Identificación
</p>
) )
const headerEmail = ( const headerEmail = (
<> <>
<p>Correo Electrónico</p> <p> {' '}
<FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
Correo Electrónico
</p>
</> </>
) )
const headerPhone = ( const headerPhone = (
<> <>
<p>Teléfono</p> <p>
{' '}
<FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
Teléfono
</p>
</> </>
) )
const headerOptions = (
<>
<p>Opciones</p>
</>
)
return ( return (
<div className="grid"> <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 field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
</Column> </Column>
<Column field="email" sortable header={headerEmail} 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="phone" 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 style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdmin}></Column>
</DataTable> </DataTable>
<Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}> <Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}>
<div className="flex align-items-center justify-content-center"> <div className="flex align-items-center justify-content-center">