peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push notificatins route bug fix

Browse Source
This commit is contained in:
Eudes Inácio
2021-02-04 09:01:58 +01:00
parent 71bc6f9dcc
commit 1942c2e7ff
190 changed files with 401 additions and 15726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/public/home-home-module-es5.js
+25 -27
View File
@@ -581,29 +581,28 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var service = notification.notification.data.service;
var object = notification.notification.data.object;
var idObject = notification.notification.data.idObject;
var folder = notification.notification.data.folder;
var publicationId = notification.notification.data.publicationId;
var processId = notification.notification.data.processId;
console.log('FOLDER PROCESS', folder.ProcessId);
console.log('Service: ', service);
console.log('Object: ', object);
console.log('idObject: ', idObject);
/* if (service === "events") {
this.router.navigate(['/home/', service, idObject, 'home']);
} else if (service === "agenda") {
this.router.navigate(['/home/', service, idObject, 'home']);
} else if (service === "gabinete-digital" && object != "expediente") {*/
// this.router.navigate(['/home/', service]);
// }
//if (service != null) {
if (service != null) {
if (service === "events") {
_this.router.navigate(['/home/', service, idObject, 'home']);
} else if (service === "agenda") {
_this.router.navigate(['/home/', service, idObject, 'home']);
} else if (service === "gabinete-digital" && object != "expediente") {
_this.router.navigate(['/home/', service]);
} else if (service === "gabinete-digital" && object === "expediente") {
_this.viewExpedientDetail(idObject);
}
} else {
if (processId || publicationId != null) {
_this.viewPublicationDetail(processId, publicationId);
}
if (notification.notification.data.folder.ProcessId != null) {
_this.viewPublications(folder);
}
if (service === "agenda") {
_this.router.navigate(['/home/', service, idObject, 'home']);
} else if (service === "gabinete-digital" && object != "expediente") {
_this.router.navigate(['/home/', service]);
} else if (service === "gabinete-digital" && object === "expediente") {
_this.viewExpedientDetail(idObject);
} else if (service === "accoes" && object === "accao") {
_this.viewPublications(idObject);
} else if (service === "accoes" && object === "publicacao") {
_this.viewPublicationDetail(idObject);
}
/*switch (service) {
case "events":
@@ -707,7 +706,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
}, {
key: "viewPublicationDetail",
value: function viewPublicationDetail(processId, publicationId) {
value: function viewPublicationDetail(folderId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
var modal;
return regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -718,8 +717,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return this.modalController.create({
component: _app_pages_publications_view_publications_publication_detail_publication_detail_page__WEBPACK_IMPORTED_MODULE_6__["PublicationDetailPage"],
componentProps: {
publicationId: publicationId,
folderId: processId
folderId: folderId
},
cssClass: 'publication-detail',
backdropDismiss: false
@@ -743,7 +741,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
}, {
key: "viewPublications",
value: function viewPublications(folder) {
value: function viewPublications(folderId) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
var modal;
return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -757,7 +755,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/* enterAnimation,
leaveAnimation, */
componentProps: {
item: folder
item: folderId
},
cssClass: 'new-action',
backdropDismiss: false