Merge branch 'US-27-ListarAreasComunes' into US-28-EliminarÁreaComún
This commit is contained in:
commit
e59678d689
|
@ -191,6 +191,11 @@ export class AppController {
|
||||||
return this.appService.findCommonArea(paramCommonAreaId);
|
return this.appService.findCommonArea(paramCommonAreaId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('commonArea/findByCommunity/:community_id')
|
||||||
|
findByCommunity(@Param('community_id') paramCommunityId: string) {
|
||||||
|
return this.appService.findByCommunity(paramCommunityId);
|
||||||
|
}
|
||||||
|
|
||||||
// #==== API GUEST
|
// #==== API GUEST
|
||||||
//#API userService - create user
|
//#API userService - create user
|
||||||
@Post('guest/createGuest')
|
@Post('guest/createGuest')
|
||||||
|
|
|
@ -248,6 +248,16 @@ export class AppService {
|
||||||
.pipe(map((message: string) => ({ message })));
|
.pipe(map((message: string) => ({ message })));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//GET parameter from API
|
||||||
|
findByCommunity(paramCommunityId: string) {
|
||||||
|
const pattern = { cmd: 'findByCommunity' };
|
||||||
|
const payload = { community_id: paramCommunityId };
|
||||||
|
return this.clientCommonAreaApp
|
||||||
|
.send<string>(pattern, payload)
|
||||||
|
.pipe(map((message: string) => ({ message })));
|
||||||
|
}
|
||||||
|
|
||||||
// ====================== GUESTS ===============================
|
// ====================== GUESTS ===============================
|
||||||
|
|
||||||
//POST parameter from API
|
//POST parameter from API
|
||||||
|
|
|
@ -33,4 +33,10 @@ export class CommonAreasController {
|
||||||
let _id = id['_id'];
|
let _id = id['_id'];
|
||||||
return this.commonAreasService.remove(_id);
|
return this.commonAreasService.remove(_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@MessagePattern({ cmd: 'findByCommunity' })
|
||||||
|
findByCommunity(@Payload() id: string) {
|
||||||
|
let _community_id = id['community_id'];
|
||||||
|
return this.commonAreasService.findByCommunity(_community_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,4 +34,9 @@ export class CommonAreasService {
|
||||||
async remove(id: string) {
|
async remove(id: string) {
|
||||||
return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec();
|
return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async findByCommunity(community_id: string): Promise<CommonArea[]> {
|
||||||
|
return this.commonAreaModel.find({ community_id: community_id }).exec();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
"prismjs": "1.9.0",
|
"prismjs": "1.9.0",
|
||||||
"react": "^17.0.1",
|
"react": "^17.0.1",
|
||||||
"react-app-polyfill": "^1.0.6",
|
"react-app-polyfill": "^1.0.6",
|
||||||
|
"react-cookie": "^4.1.1",
|
||||||
"react-dom": "^17.0.1",
|
"react-dom": "^17.0.1",
|
||||||
"react-router-dom": "^5.2.0",
|
"react-router-dom": "^5.2.0",
|
||||||
"react-scripts": "3.4.1",
|
"react-scripts": "3.4.1",
|
||||||
|
@ -2475,6 +2476,11 @@
|
||||||
"@babel/types": "^7.3.0"
|
"@babel/types": "^7.3.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/cookie": {
|
||||||
|
"version": "0.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
|
||||||
|
"integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
|
||||||
|
},
|
||||||
"node_modules/@types/eslint-visitor-keys": {
|
"node_modules/@types/eslint-visitor-keys": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
|
||||||
|
@ -2489,6 +2495,15 @@
|
||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/hoist-non-react-statics": {
|
||||||
|
"version": "3.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
|
||||||
|
"integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/react": "*",
|
||||||
|
"hoist-non-react-statics": "^3.3.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@types/istanbul-lib-coverage": {
|
"node_modules/@types/istanbul-lib-coverage": {
|
||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
|
||||||
|
@ -2531,11 +2546,31 @@
|
||||||
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
|
||||||
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
|
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/prop-types": {
|
||||||
|
"version": "15.7.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
|
||||||
|
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
|
||||||
|
},
|
||||||
"node_modules/@types/q": {
|
"node_modules/@types/q": {
|
||||||
"version": "1.5.5",
|
"version": "1.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
||||||
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
|
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/react": {
|
||||||
|
"version": "18.0.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
|
||||||
|
"integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/prop-types": "*",
|
||||||
|
"@types/scheduler": "*",
|
||||||
|
"csstype": "^3.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@types/scheduler": {
|
||||||
|
"version": "0.16.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
|
||||||
|
"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
|
||||||
|
},
|
||||||
"node_modules/@types/stack-utils": {
|
"node_modules/@types/stack-utils": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
|
||||||
|
@ -13402,6 +13437,19 @@
|
||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/react-cookie": {
|
||||||
|
"version": "4.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
|
||||||
|
"integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/hoist-non-react-statics": "^3.0.1",
|
||||||
|
"hoist-non-react-statics": "^3.0.0",
|
||||||
|
"universal-cookie": "^4.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">= 16.3.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/react-dev-utils": {
|
"node_modules/react-dev-utils": {
|
||||||
"version": "10.2.1",
|
"version": "10.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
|
||||||
|
@ -16599,6 +16647,23 @@
|
||||||
"imurmurhash": "^0.1.4"
|
"imurmurhash": "^0.1.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/universal-cookie": {
|
||||||
|
"version": "4.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
|
||||||
|
"integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/cookie": "^0.3.3",
|
||||||
|
"cookie": "^0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/universal-cookie/node_modules/cookie": {
|
||||||
|
"version": "0.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
|
||||||
|
"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/universalify": {
|
"node_modules/universalify": {
|
||||||
"version": "0.1.2",
|
"version": "0.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
|
||||||
|
@ -19769,6 +19834,11 @@
|
||||||
"@babel/types": "^7.3.0"
|
"@babel/types": "^7.3.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@types/cookie": {
|
||||||
|
"version": "0.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
|
||||||
|
"integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
|
||||||
|
},
|
||||||
"@types/eslint-visitor-keys": {
|
"@types/eslint-visitor-keys": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
|
||||||
|
@ -19783,6 +19853,15 @@
|
||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@types/hoist-non-react-statics": {
|
||||||
|
"version": "3.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
|
||||||
|
"integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
|
||||||
|
"requires": {
|
||||||
|
"@types/react": "*",
|
||||||
|
"hoist-non-react-statics": "^3.3.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"@types/istanbul-lib-coverage": {
|
"@types/istanbul-lib-coverage": {
|
||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
|
||||||
|
@ -19825,11 +19904,31 @@
|
||||||
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
|
||||||
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
|
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
|
||||||
},
|
},
|
||||||
|
"@types/prop-types": {
|
||||||
|
"version": "15.7.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
|
||||||
|
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
|
||||||
|
},
|
||||||
"@types/q": {
|
"@types/q": {
|
||||||
"version": "1.5.5",
|
"version": "1.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
||||||
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
|
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
|
||||||
},
|
},
|
||||||
|
"@types/react": {
|
||||||
|
"version": "18.0.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
|
||||||
|
"integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
|
||||||
|
"requires": {
|
||||||
|
"@types/prop-types": "*",
|
||||||
|
"@types/scheduler": "*",
|
||||||
|
"csstype": "^3.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"@types/scheduler": {
|
||||||
|
"version": "0.16.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
|
||||||
|
"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
|
||||||
|
},
|
||||||
"@types/stack-utils": {
|
"@types/stack-utils": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
|
||||||
|
@ -28396,6 +28495,16 @@
|
||||||
"whatwg-fetch": "^3.0.0"
|
"whatwg-fetch": "^3.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"react-cookie": {
|
||||||
|
"version": "4.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
|
||||||
|
"integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
|
||||||
|
"requires": {
|
||||||
|
"@types/hoist-non-react-statics": "^3.0.1",
|
||||||
|
"hoist-non-react-statics": "^3.0.0",
|
||||||
|
"universal-cookie": "^4.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"react-dev-utils": {
|
"react-dev-utils": {
|
||||||
"version": "10.2.1",
|
"version": "10.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
|
||||||
|
@ -30926,6 +31035,22 @@
|
||||||
"imurmurhash": "^0.1.4"
|
"imurmurhash": "^0.1.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"universal-cookie": {
|
||||||
|
"version": "4.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
|
||||||
|
"integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
|
||||||
|
"requires": {
|
||||||
|
"@types/cookie": "^0.3.3",
|
||||||
|
"cookie": "^0.4.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"cookie": {
|
||||||
|
"version": "0.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
|
||||||
|
"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"universalify": {
|
"universalify": {
|
||||||
"version": "0.1.2",
|
"version": "0.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
"prismjs": "1.9.0",
|
"prismjs": "1.9.0",
|
||||||
"react": "^17.0.1",
|
"react": "^17.0.1",
|
||||||
"react-app-polyfill": "^1.0.6",
|
"react-app-polyfill": "^1.0.6",
|
||||||
|
"react-cookie": "^4.1.1",
|
||||||
"react-dom": "^17.0.1",
|
"react-dom": "^17.0.1",
|
||||||
"react-router-dom": "^5.2.0",
|
"react-router-dom": "^5.2.0",
|
||||||
"react-scripts": "3.4.1",
|
"react-scripts": "3.4.1",
|
||||||
|
|
|
@ -89,8 +89,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.p-icon-input-khaki {
|
.p-icon-input-khaki {
|
||||||
border-top-right-radius: 0!important;
|
border-top-right-radius: 0 !important;
|
||||||
border-bottom-right-radius: 0!important;
|
border-bottom-right-radius: 0 !important;
|
||||||
border-color: #C08135;
|
border-color: #C08135;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7118,3 +7118,33 @@
|
||||||
.p-button.p-button-danger:enabled:focus {
|
.p-button.p-button-danger:enabled:focus {
|
||||||
box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #f7a2a2, 0 1px 2px 0 black;
|
box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #f7a2a2, 0 1px 2px 0 black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.status {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
padding: 0.25em 0.5rem;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 12px;
|
||||||
|
letter-spacing: 0.3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status.status-1 {
|
||||||
|
background: #c8e6c9!important;
|
||||||
|
color: #256029!important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status.status-0 {
|
||||||
|
background: #ffcdd2;
|
||||||
|
color: #c63737;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status.status-2 {
|
||||||
|
background: #feedaf;
|
||||||
|
color: #8a5340;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status.status--1 {
|
||||||
|
background: #565656;
|
||||||
|
color: #f7f9f7;
|
||||||
|
}
|
|
@ -51,6 +51,7 @@ import './assets/layout/layout.scss';
|
||||||
import './App.scss';
|
import './App.scss';
|
||||||
import LogIn from './components/LogIn';
|
import LogIn from './components/LogIn';
|
||||||
import { PrimeIcons } from 'primereact/api';
|
import { PrimeIcons } from 'primereact/api';
|
||||||
|
import AreasComunes from './components/AreasComunes';
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
const [layoutMode, setLayoutMode] = useState('static');
|
const [layoutMode, setLayoutMode] = useState('static');
|
||||||
|
@ -187,7 +188,16 @@ const App = () => {
|
||||||
icon: PrimeIcons.BUILDING,
|
icon: PrimeIcons.BUILDING,
|
||||||
to: '/comunidadesViviendas',
|
to: '/comunidadesViviendas',
|
||||||
},
|
},
|
||||||
{ label: 'Inquilinos', icon: PrimeIcons.USER, to: '/inquilinos' },
|
{
|
||||||
|
label: 'Inquilinos',
|
||||||
|
icon: PrimeIcons.USER,
|
||||||
|
to: '/inquilinos'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Áreas Comunes de Comunidad',
|
||||||
|
icon: PrimeIcons.BUILDING,
|
||||||
|
to: '/areasComunes',
|
||||||
|
},
|
||||||
{ label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
|
{ label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
@ -411,6 +421,7 @@ const App = () => {
|
||||||
<Route path="/guardasSeguridad" component={GuardasSeguridad} />
|
<Route path="/guardasSeguridad" component={GuardasSeguridad} />
|
||||||
<Route path="/comunidadesViviendas" component={Communities} />
|
<Route path="/comunidadesViviendas" component={Communities} />
|
||||||
<Route path="/inquilinos" component={Inquilinos} />
|
<Route path="/inquilinos" component={Inquilinos} />
|
||||||
|
<Route path="/areasComunes" component={AreasComunes} />
|
||||||
<Route path="/logIn" component={LogIn} />
|
<Route path="/logIn" component={LogIn} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,307 @@
|
||||||
|
import React, { useEffect, useState, useRef } from 'react';
|
||||||
|
import { InputText } from 'primereact/inputtext';
|
||||||
|
import { Button } from 'primereact/button';
|
||||||
|
import { Dropdown } from 'primereact/dropdown';
|
||||||
|
import { DataTable } from 'primereact/datatable';
|
||||||
|
import { Column } from 'primereact/column';
|
||||||
|
import { Toast } from 'primereact/toast';
|
||||||
|
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 { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import { faAt } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import { faHomeAlt } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
|
||||||
|
|
||||||
|
const AreasComunes = () => {
|
||||||
|
|
||||||
|
let emptyCommonArea = {
|
||||||
|
_id: null,
|
||||||
|
dni: '',
|
||||||
|
name: '',
|
||||||
|
hourMin: '',
|
||||||
|
hourMax: '',
|
||||||
|
community_id: '',
|
||||||
|
bookable: '1',
|
||||||
|
bookable_text: '',
|
||||||
|
};
|
||||||
|
|
||||||
|
const [commonAreaList, setCommonAreaList] = useState([]);
|
||||||
|
const [commonArea, setCommonArea] = useState(emptyCommonArea);
|
||||||
|
const [selectedCommonAreas, setSelectedCommonAreas] = useState(null);
|
||||||
|
const [globalFilter, setGlobalFilter] = useState(null);
|
||||||
|
const [deleteCommonAreaDialog, setDeleteCommonAreaDialog] = useState(false);
|
||||||
|
const [deleteCommonAreasDialog, setDeleteCommonAreasDialog] = useState(false);
|
||||||
|
const [submitted, setSubmitted] = useState(false);
|
||||||
|
const toast = useRef(null);
|
||||||
|
const dt = useRef(null);
|
||||||
|
|
||||||
|
const [cookies, setCookie] = useCookies();
|
||||||
|
|
||||||
|
async function getCommonAreas() {
|
||||||
|
await fetch(`http://localhost:4000/commonArea/findByCommunity/${cookies.community_id}`, { method: 'GET' })
|
||||||
|
.then((response) => response.json())
|
||||||
|
.then(data => data.message)
|
||||||
|
.then(data => {
|
||||||
|
if(data) {
|
||||||
|
data.map(item => {
|
||||||
|
if(item.bookable == '1') {
|
||||||
|
item.bookable_text = 'Disponible';
|
||||||
|
} else{
|
||||||
|
item.bookable_text = 'Cerrado';
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
setCommonAreaList(data);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getCommonAreas();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
|
||||||
|
const deleteCommonArea = () => {
|
||||||
|
/* fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
|
||||||
|
cache: 'no-cache',
|
||||||
|
method: 'DELETE',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(
|
||||||
|
function (response) {
|
||||||
|
if (response.status != 201)
|
||||||
|
console.log('Ocurrió un error con el servicio: ' + response.status);
|
||||||
|
else
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.then(
|
||||||
|
function (response) {
|
||||||
|
|
||||||
|
let _community = communities.filter(val => val._id !== community._id);
|
||||||
|
setCommunities(_community);
|
||||||
|
setDeleteCommunityDialog(false);
|
||||||
|
setCommunity(emptyCommunity);
|
||||||
|
toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Comunidad de Viviendas Eliminada', life: 3000 });
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.catch(
|
||||||
|
err => {
|
||||||
|
console.log('Ocurrió un error con el fetch', err)
|
||||||
|
toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Comunidad de Viviendas no se pudo eliminar', life: 3000 });
|
||||||
|
}
|
||||||
|
);
|
||||||
|
*/
|
||||||
|
let _common_areas = commonAreaList.filter(
|
||||||
|
(val) => val._id !== commonArea._id,
|
||||||
|
);
|
||||||
|
setCommonAreaList(_common_areas);
|
||||||
|
setDeleteCommonAreaDialog(false);
|
||||||
|
setCommonArea(emptyCommonArea);
|
||||||
|
toast.current.show({
|
||||||
|
severity: 'success',
|
||||||
|
summary: 'Área Común Eliminada',
|
||||||
|
life: 3000,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const deleteSelectedCommonAreas = () => {
|
||||||
|
let _commonareas = commonAreaList.filter(
|
||||||
|
(val) => !selectedCommonAreas.includes(val),
|
||||||
|
);
|
||||||
|
/* selectedCommunities.map((item) => {
|
||||||
|
fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
|
||||||
|
cache: 'no-cache',
|
||||||
|
method: 'DELETE',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})*/
|
||||||
|
setCommonAreaList(_commonareas);
|
||||||
|
setDeleteCommonAreasDialog(false);
|
||||||
|
setSelectedCommonAreas(null);
|
||||||
|
toast.current.show({
|
||||||
|
severity: 'success',
|
||||||
|
summary: 'Éxito',
|
||||||
|
detail: 'Áreas Comúnes Eliminadas',
|
||||||
|
life: 3000,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const hideDeleteCommonAreaDialog = () => {
|
||||||
|
setDeleteCommonAreaDialog(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
const hideDeleteCommonAreasDialog = () => {
|
||||||
|
setDeleteCommonAreasDialog(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
const confirmDeleteCommonArea = (commonArea) => {
|
||||||
|
setCommonArea(commonArea);
|
||||||
|
setDeleteCommonAreaDialog(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const confirmDeleteSelected = () => {
|
||||||
|
setDeleteCommonAreasDialog(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const actionsCommonArea = (rowData) => {
|
||||||
|
return (
|
||||||
|
<div className="actions">
|
||||||
|
<Button
|
||||||
|
icon="pi pi-trash"
|
||||||
|
className="p-button-rounded p-button-danger mt-2"
|
||||||
|
onClick={() => confirmDeleteCommonArea(rowData)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const deleteCommonAreaDialogFooter = (
|
||||||
|
<>
|
||||||
|
<Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommonAreaDialog} />
|
||||||
|
<Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteCommonArea} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
|
||||||
|
const deleteCommonAreasDialogFooter = (
|
||||||
|
<>
|
||||||
|
<Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommonAreasDialog} />
|
||||||
|
<Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedCommonAreas} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
const leftToolbarTemplate = () => {
|
||||||
|
return (
|
||||||
|
<React.Fragment>
|
||||||
|
<div className="my-2">
|
||||||
|
<Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedCommonAreas || !selectedCommonAreas.length} />
|
||||||
|
</div>
|
||||||
|
</React.Fragment>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const rightToolbarTemplate = () => {
|
||||||
|
return (
|
||||||
|
<React.Fragment>
|
||||||
|
<Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
|
||||||
|
</React.Fragment>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const header = (
|
||||||
|
<React.Fragment>
|
||||||
|
|
||||||
|
<div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
|
||||||
|
<h5 className="m-0">Áreas Comunes</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>
|
||||||
|
</React.Fragment>
|
||||||
|
);
|
||||||
|
|
||||||
|
const headerName = (
|
||||||
|
<>
|
||||||
|
<p>{' '}
|
||||||
|
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
|
||||||
|
Nombre
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
|
||||||
|
const headerHourMin = (
|
||||||
|
<>
|
||||||
|
<p>
|
||||||
|
{' '}
|
||||||
|
<FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
|
||||||
|
Hora de apertura
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
|
||||||
|
const headerHourMax = (
|
||||||
|
<>
|
||||||
|
<p> {' '}
|
||||||
|
<FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
|
||||||
|
Hora de cierre
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
|
||||||
|
const headerBookable = (
|
||||||
|
<>
|
||||||
|
<p> {' '}
|
||||||
|
<FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
|
||||||
|
Reservable
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
const statusBodyTemplate = (rowData) => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<span
|
||||||
|
className={`status status-${rowData.bookable}`}
|
||||||
|
>
|
||||||
|
{rowData.bookable_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={commonAreaList} dataKey="_id" paginator rows={5} selection={selectedCommonAreas} onSelectionChange={(e) => setSelectedCommonAreas(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} áreas comunes"
|
||||||
|
globalFilter={globalFilter} emptyMessage="No hay áreas comunes registrados.">
|
||||||
|
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
|
||||||
|
<Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||||
|
<Column field="hourMin" header={headerHourMin} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
|
||||||
|
<Column field="hourMax" header={headerHourMax} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}> </Column>
|
||||||
|
<Column field="bookable" sortable header={headerBookable} body={statusBodyTemplate} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
|
||||||
|
<Column style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsCommonArea}></Column>
|
||||||
|
</DataTable>
|
||||||
|
<Dialog visible={deleteCommonAreaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommonAreaDialogFooter} onHide={hideDeleteCommonAreaDialog}>
|
||||||
|
<div className="flex align-items-center justify-content-center">
|
||||||
|
<i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
|
||||||
|
{commonArea && <span>¿Estás seguro que desea eliminar a <b>{commonArea.name}</b>?</span>}
|
||||||
|
</div>
|
||||||
|
</Dialog>
|
||||||
|
<Dialog visible={deleteCommonAreasDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommonAreasDialogFooter} onHide={hideDeleteCommonAreasDialog}>
|
||||||
|
<div className="flex align-items-center justify-content-center">
|
||||||
|
<i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
|
||||||
|
{selectedCommonAreas && <span>¿Está seguro eliminar las áreas comunes seleccionadas?</span>}
|
||||||
|
</div>
|
||||||
|
</Dialog>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
export default React.memo(AreasComunes);
|
Loading…
Reference in New Issue