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

Merge branch 'agregar-campos-area-nombre' into US-32-ListarReservas

This commit is contained in:
Mariela 2022-08-23 23:46:48 -06:00
parent 328265cb8c 149e07bc88
commit 0e9c92f744
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,8 @@ export class AppController {
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
@Body('user_id') user_id: string, @Body('user_id') user_id: string,
@Body('common_area_id') common_area_id: string, @Body('common_area_id') common_area_id: string,
@Body('community_id') community_id: string, @Body('common_area_name') common_area_name: string,
@Body('communty_id') communty_id: string,
) { ) {
return this.appService.createReservation( return this.appService.createReservation(
start_time, start_time,
@ -490,7 +491,8 @@ export class AppController {
date_entry, date_entry,
user_id, user_id,
common_area_id, common_area_id,
community_id common_area_name,
communty_id,
); );
} }

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

@ -598,12 +598,13 @@ export class AppService {
//POST parameter from API //POST parameter from API
createReservation(start_time: string, finish_time: string, status: string, createReservation(start_time: string, finish_time: string, status: string,
date_entry: Date, user_id: string, common_area_id: string, community_id: string) { date_entry: Date, user_id: string, common_area_id: string,
common_area_name: string, communty_id: string) {
const pattern = { cmd: 'createReservation' }; const pattern = { cmd: 'createReservation' };
const payload = { const payload = {
start_time: start_time, finish_time: finish_time, status: status, 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 common_area_name: common_area_name, communty_id: communty_id
}; };
return this.clientReservationApp return this.clientReservationApp
.send<string>(pattern, payload) .send<string>(pattern, payload)

7
servicio-reservaciones/src/schemas/reservation.schema.ts
View File

@ -20,6 +20,13 @@ export class Reservation {
@Prop() @Prop()
common_area_id: string; common_area_id: string;
@Prop()
common_area_name: string;
@Prop()
community_id: string;
@Prop() @Prop()
user_id: string; user_id: string;

4
web-ui/web-react/public/assets/themes/khaki/theme.css
View File

@ -7163,4 +7163,8 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
}
.layout-config-button{
display: none!important;
} }