diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 2a05fb7e1..23d9c0e38 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -318,10 +318,10 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
- this.toastService.successMessage('Processo descartado')
+ this.toastService._successMessage('Processo descartado')
this.close();
} catch (error) {
- this.toastService.badRequest("Processo não descartado")
+ this.toastService._badRequest("Processo não descartado")
}
finally {
loader.remove()
@@ -371,10 +371,10 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.close();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -390,10 +390,10 @@ export class DespachoPage implements OnInit {
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
- this.toastService.successMessage()
+ this.toastService._successMessage()
},
error => {
- this.toastService.badRequest("Processo não enviado para despacho")
+ this.toastService._badRequest("Processo não enviado para despacho")
});
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 3c977a90f..c9e4d395a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -549,7 +549,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.loadCount = true;
}
- let allProcessesList = allPreocesses_;
+ let allProcessesList = allPreocesses_ || [];
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 10ef64bf8..57fcdc490 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -310,6 +310,8 @@ export class PublicationsPage implements OnInit {
async AddPublicationFolder(item?: any) {
this.closeDesktopComponent();
+ this.idSelected = '';
+
if (window.innerWidth < 701) {
const modal = await this.modalController.create({
@@ -462,7 +464,19 @@ export class PublicationsPage implements OnInit {
showAddActions: false,
showEditActions: false,
}
- this.idSelected = "";
+
+
+ setTimeout(()=>{
+ if(this.desktopComponent.showViewPublication == false &&
+ this.desktopComponent.showAddNewPublication == false &&
+ this.desktopComponent.showPublicationDetail == false &&
+ this.desktopComponent.showAddActions == false &&
+ this.desktopComponent.showEditActions == false) {
+ this.idSelected = "";
+ }
+ }, 10)
+
+
}
async openOptions(id?: string) {
@@ -514,10 +528,4 @@ export class PublicationsPage implements OnInit {
});
}
- // this.crop.crop('path/to/image.jpg', {quality: 75})
- // .then(
- // newImage =>
- // error => console.error('Error cropping image', error)
- // );
-
}
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index f07821ef6..14d36e70a 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -141,15 +141,6 @@ export class ViewPublicationsPage implements OnInit {
this.publicationList = new Array();
- /* for(let i = 0; i < res.length; i++) {
- this.publications.GetPublicationById(res[i]).subscribe(ress => {
-
- let item: Publication = this.publicationPipe.itemList(ress)
-
- this.publicationList.push(item);
- })
- } */
-
res.forEach(element => {
this.publications.GetPublicationById(element).subscribe(ress => {
@@ -167,17 +158,6 @@ export class ViewPublicationsPage implements OnInit {
this.getpublication = this.publicationList;
this.showLoader = false;
- /* this.publicationList = new Array();
-
- res.forEach(element => {
-
- let item: Publication = this.publicationPipe.itemList(element)
- this.publicationList.push(item);
- });
- this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
-
- this.publicationListStorage.add(folderId, this.publicationList)
- this.getpublication = this.publicationList; */
}, (error) => {
this.getFromDB()
});
@@ -234,15 +214,6 @@ export class ViewPublicationsPage implements OnInit {
this.sqliteservice.getActionById(this.folderId).then((publications) => {
- /* let item = {
- ActionType: publications[0].ActionType,
- DateBegin: publications[0].DateBegin,
- DateEnd: publications[0].DateEnd,
- Description: publications[0].Description,
- Detail: publications[0].Detail,
- ProcessId: publications[0].ProcessId
- }
- this.publicationDitails = item; */
this.item = this.isJson(publications[0].publicationsDetails);
let publicationArray = [];
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 9aba6682d..99d34dc0d 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -151,8 +151,6 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
- min="{{minDate}}"
- max="2025"
>
@@ -160,7 +158,6 @@