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

Merge branch 'dev' into UH-eliminarAdminSistema

This commit is contained in:
Mariela 2022-07-22 02:27:55 -06:00
parent 62cc5443e0 6ee627229e
commit e615842953
4 changed files with 80 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-ui/web-react/postcss.config.js Normal file
View File

@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}

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

@ -266,7 +266,7 @@ const AdministradoresSistema = () => {
</div> </div>
<div className="field col-12"> <div className="field col-12">
<label htmlFor="telefono">Teléfono</label> <label htmlFor="telefono">Teléfono</label>
<InputText id="telefono" type="number" rows="4" /> <InputText type="tel" id="telefono" pattern="[0-9]{8}"/>
</div> </div>
<Button label="Registrar" onClick={registrarAdmin}></Button> <Button label="Registrar" onClick={registrarAdmin}></Button>
</div> </div>

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

@ -33,7 +33,7 @@ const Communities = () => {
const [cantonId, setCantonId] = useState(null); const [cantonId, setCantonId] = useState(null);
const [districtsList, setDistrictsList] = useState([]); const [districtsList, setDistrictsList] = useState([]);
const [districtId, setDistrictId] = useState(null); const [districtId, setDistrictId] = useState(null);
const [codeHouses, setCodeHouses] = useState(null); const [codeHouses, setCodeHouses] = useState('');
const [submitted, setSubmitted] = useState(false); const [submitted, setSubmitted] = useState(false);
const toast = useRef(null); const toast = useRef(null);
const dt = useRef(null); const dt = useRef(null);
@ -59,7 +59,7 @@ const Communities = () => {
})) }))
useEffect(() => { useEffect(() => {
@ -138,25 +138,25 @@ const Communities = () => {
let pList = await getProvinces(); let pList = await getProvinces();
let cList = await getCantons(); let cList = await getCantons();
let dList = await getDistricts(); let dList = await getDistricts();
await resJson.message.map((item) => { await resJson.message.map((item) => {
item.province = pList.find(p => p.code === item.province).name item.province = pList.find(p => p.code === item.province).name
item.canton = cList.find(p => p.code === item.canton).name item.canton = cList.find(p => p.code === item.canton).name
item.district = dList.find(p => p.code === item.district).name item.district = dList.find(p => p.code === item.district).name
if (!item.id_admin) {
item.name_admin = "Sin Administrador"
}
}) })
setCommunitiesList(await resJson.message); setCommunitiesList(await resJson.message);
} }
useEffect(() => { useEffect(() => {
getCommunites(); getCommunites();
}, []) }, [])
const saveCommunity = () => { const saveCommunity = () => {
setSubmitted(true);
if (community.name && community.num_houses > 0 && provinciaId && cantonId && districtId && community.phone ) {
if (community.name.trim()) {
let _communities = [...communitiesList]; let _communities = [...communitiesList];
let _community = { ...community }; let _community = { ...community };
_community.province = provinciaId; _community.province = provinciaId;
@ -165,12 +165,12 @@ const Communities = () => {
for (let i = 0; i < _community.num_houses; i++){ for (let i = 0; i < _community.num_houses; i++) {
_community.houses.push({ _community.houses.push({
number_house: codeHouses + (i+1), number_house: codeHouses + (i + 1),
}) })
} }
// console.log(houses) // console.log(houses)
fetch('http://localhost:4000/community/createCommunity', { fetch('http://localhost:4000/community/createCommunity', {
cache: 'no-cache', cache: 'no-cache',
method: 'POST', method: 'POST',
@ -179,40 +179,44 @@ const Communities = () => {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
}) })
.then( .then(
function (response) { function (response) {
if (response.status != 201) if (response.status != 201)
console.log('Ocurrió un error con el servicio: ' + response.status); console.log('Ocurrió un error con el servicio: ' + response.status);
else else
return response.json(); return response.json();
} }
) )
.then(() => { .then(() => {
_community.province = provincesList.find(p => p.code === _community.province).name
_community.canton = cantonsList.find(p => p.code === _community.canton).name
_community.district = districtsList.find(p => p.code === _community.district).name
_communities.push(_community); _community.province = provincesList.find(p => p.code === _community.province).name
toast.current.show({ severity: 'success', summary: 'Registro exitoso', detail: 'Comunidad de vivienda Creada', life: 3000 }); _community.canton = cantonsList.find(p => p.code === _community.canton).name
_community.district = districtsList.find(p => p.code === _community.district).name
setCommunitiesList(_communities); _communities.push(_community);
toast.current.show({ severity: 'success', summary: 'Registro exitoso', detail: 'Comunidad de vivienda Creada', life: 3000 });
setCommunitiesList(_communities);
setProvinciaId(''); setProvinciaId('');
setCantonId(''); setCantonId('');
setDistrictId(''); setDistrictId('');
setCodeHouses(''); setCodeHouses('');
setCommunity(emptyCommunity); setCommunity(emptyCommunity);
})
.catch( })
err => console.log('Ocurrió un error con el fetch', err) .catch(
); err => console.log('Ocurrió un error con el fetch', err)
);
} else {
setSubmitted(true);
} }
} }
const onInputChange = (e, name) => { const onInputChange = (e, name) => {
@ -230,32 +234,32 @@ const Communities = () => {
<h5>Comunidades de Viviendas</h5> <h5>Comunidades de Viviendas</h5>
<DataTable value={communitiesList} scrollable scrollHeight="400px" scrollDirection="both" className="mt-3"> <DataTable value={communitiesList} scrollable scrollHeight="400px" scrollDirection="both" className="mt-3">
<Column field="name" header="Nombre" style={{ flexGrow: 1, flexBasis: '160px' }}></Column> <Column field="name" header="🏘️ Nombre" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
<Column field="province" header="Provincia" style={{ flexGrow: 1, flexBasis: '160px' }}></Column> <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="canton" header="📍 Cantón" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
<Column field="district" header="Distrito" 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="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> <Column field="name_admin" header="👩🏻‍💼👨🏻‍💼 Administrador" style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
</DataTable> </DataTable>
</div> </div>
</div> </div>
<div className="col-12"> <div className="col-12">
<div className="card"> <div className="card">
<Toast ref={toast} /> <Toast ref={toast} />
<h5>Registro de comunidad de viviendas</h5> <h5>Registro de comunidad de viviendas</h5>
<div className="p-fluid formgrid grid"> <div className="p-fluid formgrid grid">
<div className="field col-12 md:col-12"> <div className="field col-12 md:col-12">
<label htmlFor="name">Nombre</label> <label htmlFor="name">Nombre</label>
<div className="p-0 col-12 md:col-12"> <div className="p-0 col-12 md:col-12">
<div className="p-inputgroup"> <div className="p-inputgroup">
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-home"></i> <i className="pi pi-home"></i>
</span> </span>
<InputText id="name" value={community.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames( submitted && community.name==='' ? 'p-invalid' : '' )} /> <InputText id="name" value={community.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({'p-invalid' : submitted && community.name === ''})} />
</div> </div>
{submitted && community.name==='' && <small className="p-invalid">Nombre es requirido.</small>} {submitted && community.name === '' && <small className="p-invalid">Nombre es requirido.</small>}
</div> </div>
</div> </div>
<div className="field col-12 md:col-6"> <div className="field col-12 md:col-6">
@ -265,7 +269,7 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-map-marker"></i> <i className="pi pi-map-marker"></i>
</span> </span>
<Dropdown placeholder="--Seleccione Provincia--" value={provinciaId} options={p} onChange={handleProvinces} required autoFocus className={classNames({ 'p-invalid': submitted && !provinciaId } )} /> <Dropdown placeholder="--Seleccione Provincia--" value={provinciaId} options={p} onChange={handleProvinces} required autoFocus className={classNames({ 'p-invalid': submitted && !provinciaId })} />
</div> </div>
{submitted && !provinciaId && <small className="p-invalid">Provincia es requirido.</small>} {submitted && !provinciaId && <small className="p-invalid">Provincia es requirido.</small>}
</div> </div>
@ -277,9 +281,9 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-map-marker"></i> <i className="pi pi-map-marker"></i>
</span> </span>
<Dropdown placeholder="--Seleccione Cantón--" value={cantonId} options={c} onChange={handleCanton} required autoFocus className={classNames({ 'p-invalid': submitted && !cantonId } )}/> <Dropdown placeholder="--Seleccione Cantón--" value={cantonId} options={c} onChange={handleCanton} required autoFocus className={classNames({ 'p-invalid': submitted && !cantonId })} />
</div> </div>
{submitted && !cantonId && <small className="p-invalid">Cantón es requirido.</small>} {submitted && !cantonId && <small className="p-invalid">Cantón es requirido.</small>}
</div> </div>
</div> </div>
<div className="field col-12 md:col-6"> <div className="field col-12 md:col-6">
@ -289,9 +293,9 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-map-marker"></i> <i className="pi pi-map-marker"></i>
</span> </span>
<Dropdown placeholder="--Seleccione Distrito--" value={districtId} options={d} onChange={handleDistrict} required autoFocus className={classNames({ 'p-invalid': submitted && !districtId } )}/> <Dropdown placeholder="--Seleccione Distrito--" value={districtId} options={d} onChange={handleDistrict} required autoFocus className={classNames({ 'p-invalid': submitted && !districtId })} />
</div> </div>
{submitted && !districtId && <small className="p-invalid">Distrito es requirido.</small>} {submitted && !districtId && <small className="p-invalid">Distrito es requirido.</small>}
</div> </div>
</div> </div>
<div className="field col-12 md:col-6"> <div className="field col-12 md:col-6">
@ -301,9 +305,9 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-phone"></i> <i className="pi pi-phone"></i>
</span> </span>
<InputText id="phone" value={community.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && community.phone==='' } )} /> <InputText id="phone" value={community.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && community.phone === '' })} />
</div> </div>
{submitted && community.phone==='' && <small className="p-invalid">Número de teléfono es requirido.</small>} {submitted && community.phone === '' && <small className="p-invalid">Número de teléfono es requirido.</small>}
</div> </div>
</div> </div>
<div className="field col-12 md:col-6"> <div className="field col-12 md:col-6">
@ -313,9 +317,9 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-hashtag"></i> <i className="pi pi-hashtag"></i>
</span> </span>
<InputText id="num_houses" value={community.num_houses} onChange={(e) => onInputChange(e, 'num_houses')} required autoFocus className={classNames({ 'p-invalid': submitted && community.num_houses < 1 } )} /> <InputText id="num_houses" value={community.num_houses} onChange={(e) => onInputChange(e, 'num_houses')} required autoFocus className={classNames({ 'p-invalid': submitted && community.num_houses < 1 })} />
</div> </div>
{submitted && community.num_houses < 1 && <small className="p-invalid">Número de viviendas es requirido y debe ser mayor que 0.</small>} {submitted && community.num_houses < 1 && <small className="p-invalid">Número de viviendas es requirido y debe ser mayor que 0.</small>}
</div> </div>
</div> </div>
<div className="field col-12 md:col-6"> <div className="field col-12 md:col-6">
@ -325,9 +329,9 @@ const Communities = () => {
<span className="p-inputgroup-addon p-button p-icon-input-khaki"> <span className="p-inputgroup-addon p-button p-icon-input-khaki">
<i className="pi pi-hashtag"></i> <i className="pi pi-hashtag"></i>
</span> </span>
<InputText id="code_houses" value={codeHouses} onChange={handleCodeHouses} required autoFocus className={classNames({ 'p-invalid': submitted && !codeHouses } )} /> <InputText id="code_houses" value={codeHouses} onChange={handleCodeHouses} autoFocus className={classNames({ 'p-invalid': submitted && codeHouses === '' })} />
</div> </div>
{submitted && !codeHouses && <small className="p-invalid">El código para las viviendas es requirido.</small>} {submitted && codeHouses === '' && <small className="p-invalid">El código para las viviendas es requirido.</small>}
</div> </div>
</div> </div>
<div className="col-12 md:col-12 py-2"> <div className="col-12 md:col-12 py-2">

10
web-ui/web-react/tailwind.config.js Normal file
View File

@ -0,0 +1,10 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
"./src/**/*.{js,jsx,ts,tsx}",
],
theme: {
extend: {},
},
plugins: [],
}