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

listar reservaciones

This commit is contained in:
Mariela 2022-08-23 11:48:55 -06:00
parent 9da33006d9
commit f3ba61f060
7 changed files with 390 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-gateway/src/app.controller.ts
View File

@ -451,6 +451,7 @@ export class AppController {
@Body('date_entry') date_entry: Date,
@Body('user_id') user_id: string,
@Body('common_area_id') common_area_id: string,
@Body('community_id') community_id: string,
) {
return this.appService.createReservation(
start_time,
@ -459,6 +460,7 @@ export class AppController {
date_entry,
user_id,
common_area_id,
community_id
);
}
@ -472,6 +474,12 @@ export class AppController {
return this.appService.findReservation(paramReservation);
}
@Get('reservation/findReservations/:id')
findReservations(@Param('id') community_id: string) {
return this.appService.findReservations(community_id);
}
// #==== API Post
@Post('post/createPost')

13
api-gateway/src/app.service.ts
View File

@ -567,11 +567,12 @@ export class AppService {
//POST parameter from API
createReservation(start_time: string, finish_time: string, status: string,
date_entry: Date, user_id: string, common_area_id: string) {
date_entry: Date, user_id: string, common_area_id: string, community_id: string) {
const pattern = { cmd: 'createReservation' };
const payload = {
start_time: start_time, finish_time: finish_time, status: status,
date_entry: date_entry, user_id: user_id, common_area_id: common_area_id
date_entry: date_entry, user_id: user_id, common_area_id: common_area_id,
community_id: community_id
};
return this.clientReservationApp
.send<string>(pattern, payload)
@ -595,6 +596,14 @@ export class AppService {
.pipe(map((message: string) => ({ message })));
}
findReservations(community_id: string) {
const pattern = { cmd: 'findReservationsByCommunity' };
const payload = { community_id: community_id };
return this.clientReservationApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
// ====================== POSTS ===============================
//POST parameter from API

6
servicio-reservaciones/src/reservations/reservations.controller.ts
View File

@ -28,6 +28,12 @@ export class ReservationsController {
return this.reservationsService.findOne(_id);
}
@MessagePattern({ cmd: 'findReservationsByCommunity' })
findReservationsByCommunity(@Payload() body: string) {
let community_id = body['community_id'];
return this.reservationsService.findReservationsByCommunity(community_id);
}
@MessagePattern({ cmd: 'updateReservation' })
update(@Payload() reservation: ReservationDocument) {
return this.reservationsService.update(reservation.id, reservation);

5
servicio-reservaciones/src/reservations/reservations.service.ts
View File

@ -49,4 +49,9 @@ export class ReservationsService {
async removeIdCommunity(community_id: string){
await this.reservationModel.updateMany({community_id: community_id}, {"$set":{"status": '-1'}});
}
async findReservationsByCommunity(community_id: string){
return this.reservationModel.find({ community_id: community_id }).exec();
}
}

3
web-ui/web-react/src/App.js
View File

@ -56,6 +56,7 @@ import AreasComunes from './components/AreasComunes';
import { useCookies } from "react-cookie";
import LogInUser from './components/LogInUser';
import Page404 from './components/Page404'
import Reservaciones from './components/Reservaciones';
const App = () => {
@ -202,6 +203,7 @@ const App = () => {
to: '/areasComunes',
},
{ label: 'Reservaciones', icon: PrimeIcons.CALENDAR, to: '/reservaciones'},
{ label: 'Comunicados', icon: PrimeIcons.COMMENTS, to: '/registroComunicado'},
]
@ -467,6 +469,7 @@ const App = () => {
<Route path="/guardasSeguridad" component={GuardasSeguridad} />
<Route path="/inquilinos" component={Inquilinos} />
<Route path="/areasComunes" component={AreasComunes} />
<Route path="/reservaciones" component={Reservaciones} />
<Route path="/registroComunicado" component={RegistroComunicado} />
</>
)

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

@ -108,8 +108,6 @@ const AdministradoresSistema = () => {
} else {
if (_admin._id) {
fetch('http://localhost:4000/user/updateAdminSystem/', {
cache: 'no-cache',
method: 'POST',
@ -145,15 +143,7 @@ const AdministradoresSistema = () => {
.catch(
err => console.log('Ocurrió un error con el fetch', err)
);
} else {
fetch('http://localhost:4000/user/createAdminSystem/', {
cache: 'no-cache',
method: 'POST',
@ -181,12 +171,6 @@ const AdministradoresSistema = () => {
);
}
}
} else {
setSubmitted(true);

353
web-ui/web-react/src/components/Reservaciones.js Normal file
View File

@ -0,0 +1,353 @@
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 { Dropdown } from 'primereact/dropdown';
import { Toast } from 'primereact/toast';
import classNames from 'classnames';
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 { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
import { faClockFour } from '@fortawesome/free-solid-svg-icons';
import { useCookies } from 'react-cookie';
const Reservations = () => {
let emptyReservation = {
_id: null,
start_time: '',
finish_time: '',
user_id: '',
user_name: '',
common_area_id: '',
common_area_name: '',
community_id: '',
status: '1',
status_text: '',
date_entry: new Date(),
};
const [reservations, setReservations] = useState([]);
const [reservation, setReservation] = useState(emptyReservation);
const [submitted, setSubmitted] = useState(false);
const [selectedReservations, setSelectedReservations] = useState(null);
const [globalFilter, setGlobalFilter] = useState(null);
const [deleteReservationDialog, setDeleteReservationDialog] = useState(false);
const [deleteReservationsDialog, setDeleteReservationsDialog] = useState(false);
const toast = useRef(null);
const dt = useRef(null);
const [cookies, setCookies] = useCookies()
const [areas, setAreas] = useState([]);
const [tenants, setTenants] = useState([]);
async function tenantsList(id) {
await fetch(`http://localhost:4000/user/findTenants/${id}`,
{ method: 'GET' })
.then((response) => response.json())
.then(data => data.message)
.then(data => {
data = data.filter(
(val) => val.status != -1,
)
data = data.map(item => {
item.password = '';
return item;
})
setTenants(data)
});
}
async function areasList(id) {
await fetch(`http://localhost:4000/commonArea/findByCommunity/${id}`,
{ method: 'GET' })
.then((response) => response.json())
.then(data => data.message)
.then(data => {
data = data.filter(
(val) => val.status != -1,
)
setAreas(data)
});
}
async function reservationList(id) {
await fetch(`http://localhost:4000/reservation/findReservations/${id}`,
{ method: 'GET' })
.then((response) => response.json())
.then(data => data.message)
.then(data => {
data = data.filter(
(val) => val.status != -1,
)
data.map((item) => {
if (item.status == '1') {
item.status_text = 'Activo';
} else if (item.status == '0') {
item.status_text = 'Inactivo';
}
tenants.find((item2) => item2._id == item.user_id);
})
setReservations(data)
});
}
useEffect(() => {
tenantsList(cookies.community_id);
}, [])
useEffect(() => {
areasList(cookies.community_id);
}, [])
tenants.map((item) => {
});
useEffect(() => {
reservationList(cookies.community_id);
}, [])
const actionsReservation = (rowData) => {
return (
<div className="actions">
<Button
icon="pi pi-trash"
className="p-button-rounded p-button-danger mt-2 mx-2"
onClick={() => confirmDeleteReservation(rowData)}
title="Eliminar Reserva"
/>
</div>
);
};
const confirmDeleteReservation = (reservation) => {
setReservation(reservation);
setDeleteReservationDialog(true);
};
const confirmDeleteSelected = () => {
setDeleteReservationsDialog(true);
};
const leftToolbarTemplate = () => {
return (
<React.Fragment>
<div className="my-2">
<Button
label="Eliminar"
icon="pi pi-trash"
className="p-button-danger"
onClick={confirmDeleteSelected}
disabled={!selectedReservations || !selectedReservations.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">
Reservaciones <i className="fal fa-user"></i>
</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 headerStartTime = (
<>
<p>
{' '}
<FontAwesomeIcon icon={faClockFour} style={{ color: '#C08135' }} />
Hora de Apertura
</p>
</>
);
const headerEndTime = (
<>
<p>
{' '}
<FontAwesomeIcon icon={faClockFour} style={{ color: '#D7A86E' }} />{' '}
Hora de Cierre
</p>
</>
);
const headerUser = (
<>
<p>
{' '}
<FontAwesomeIcon icon={faUserAlt} style={{ color: '#C08135' }} />{' '}
Usuario
</p>
</>
);
const headerArea = (
<>
<p>
{' '}
<FontAwesomeIcon icon={faHome} style={{ color: '#D7A86E' }} />{' '}
Código de Area
</p>
</>
);
const headerStatus = (
<>
<p> {' '}
<FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#C08135" }} />{' '}
Estado
</p>
</>
)
const statusBodyTemplate = (rowData) => {
return (
<>
<span
className={`status status-${rowData.status}`}
>
{rowData.status_text}
</span>
</>
);
};
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={reservations}
dataKey="_id"
paginator
rows={5}
selection={selectedReservations}
onSelectionChange={(e) => setSelectedReservations(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} reservaciones de la comunidad"
globalFilter={globalFilter}
emptyMessage="No hay reservas registradas."
>
<Column
selectionMode="multiple"
headerStyle={{ width: '3rem' }}
></Column>
<Column
field="start_time"
sortable
header={headerStartTime}
style={{
flexGrow: 1,
flexBasis: '160px',
minWidth: '160px',
wordBreak: 'break-word',
}}
></Column>
<Column
field="finish_time"
sortable
header={headerEndTime}
style={{
flexGrow: 1,
flexBasis: '160px',
minWidth: '160px',
wordBreak: 'break-word',
}}
alignFrozen="left"
></Column>
<Column
field="user_id"
header={headerUser}
style={{
flexGrow: 1,
flexBasis: '160px',
minWidth: '160px',
wordBreak: 'break-word',
}}
></Column>
<Column
field="common_area_id"
header={headerArea}
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: '80px', minWidth: '80px' }}
body={actionsReservation}
></Column>
</DataTable>
</div>
</div>
</div>
);
}
export default React.memo(Reservations);