diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 26a799fe8..0fa726144 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -252,65 +252,71 @@ export class GabineteDigitalPage implements OnInit {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('GabineteProcess').then((allprocess: any[]) => {
- allprocess.forEach(element => {
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
+ if(allprocess.forEach) {
+ allprocess.forEach(element => {
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ //"CreateDate": taskDate,
+ "CreateDate": new Date(element.taskStartDate),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DispatchDocId,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ "Agenda": element.workflowInstanceDataFields.Agenda,
+ "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
+ }
+
+ this.allProcessesList.push(task);
+ this.allProcessesList = removeDuplicate(this.allProcessesList);
+ this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+
+ });
+ }
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- //"CreateDate": taskDate,
- "CreateDate": new Date(element.taskStartDate),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DispatchDocId,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
- "Agenda": element.workflowInstanceDataFields.Agenda,
- "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
- }
-
- this.allProcessesList.push(task);
- this.allProcessesList = removeDuplicate(this.allProcessesList);
- this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
- });
})
} else {
this.sqliteservice.getAllProcess().then((allprocess: any[]) => {
- allprocess.forEach(element => {
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+ if(allprocess.forEach) {
+ allprocess.forEach(element => {
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+
+ var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": workflowInstanceDataFields.Subject,
+ "Senders": workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": workflowInstanceDataFields.ViewerRequest,
+ "Remetente": workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": workflowInstanceDataFields.DispatchDocId,
+ "FolderID": workflowInstanceDataFields.FolderID,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": workflowInstanceDataFields.Status,
+ "Agenda": workflowInstanceDataFields.Agenda,
+ "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
+ }
+
+ this.allProcessesList.push(task);
+ this.allProcessesList = removeDuplicate(this.allProcessesList)
+ this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+
+ });
+ }
- var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
-
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": workflowInstanceDataFields.Subject,
- "Senders": workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": workflowInstanceDataFields.ViewerRequest,
- "Remetente": workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": workflowInstanceDataFields.DispatchDocId,
- "FolderID": workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": workflowInstanceDataFields.Status,
- "Agenda": workflowInstanceDataFields.Agenda,
- "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
- }
-
- this.allProcessesList.push(task);
- this.allProcessesList = removeDuplicate(this.allProcessesList)
- this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
- });
})
}
@@ -535,7 +541,7 @@ export class GabineteDigitalPage implements OnInit {
this.showLoader = true
try {
- expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
+ expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
this.loadCount = true;
this.showLoader = false;
} catch(error) {
@@ -543,7 +549,7 @@ export class GabineteDigitalPage implements OnInit {
this.loadCount = true;
}
- expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
+ expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active")
expedientes = expedientes.filter((item) => {
return item.activityInstanceName != 'Retificar Expediente'
diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html
index 4ffe27433..88a12aaf3 100644
--- a/src/app/pages/inactivity/inactivity.page.html
+++ b/src/app/pages/inactivity/inactivity.page.html
@@ -42,7 +42,7 @@
-
+
Entrar com senha
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index f41170d55..7c726214f 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -16,6 +16,7 @@ import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-co
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service';
import { Platform } from '@ionic/angular';
+import { SqliteService } from 'src/app/services/sqlite.service';
@@ -53,6 +54,7 @@ export class LoginPage implements OnInit {
public ChatSystemService: ChatSystemService,
private ChatService: ChatService,
private platform: Platform,
+ private sqliteservice: SqliteService,
) {}
ngOnInit() {
@@ -140,6 +142,7 @@ export class LoginPage implements OnInit {
} else {
+ this.sqliteservice.deleteAllTables();
this.RochetChatConnectorService.logout();
this.clearStoreService.clear();
this.ChatSystemService.clearChat();
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 8e58da4a8..5c632b74f 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -44,40 +44,7 @@
-
-
-
+
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index ef37a5d4d..5e6e561c4 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -28,9 +28,9 @@ export class PublicationsPage implements OnInit {
publicationFolder: PublicationFolder;
publication: Publication;
- publicationsEventFolderList: PublicationFolder[];
+ publicationsEventFolderList: PublicationFolder[] = [];
actionsListStorage: PublicationFolder[] = new Array();
- publicationsTravelFolderList: PublicationFolder[];
+ publicationsTravelFolderList: PublicationFolder[] = [];
theDate: any;
theEndDate: any;
@@ -91,10 +91,6 @@ export class PublicationsPage implements OnInit {
});
this.hideRefreshButton();
- /* this.backgroundservice.registerBackService('Online', () => {
- this.getActions();
- }) */
-
}
@@ -142,55 +138,67 @@ export class PublicationsPage implements OnInit {
return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear()
}
+ loadList = false
+
getActions() {
- this.showLoader = true;
- this.skeletonLoader = true;
- this.getFromDB()
- this.publications.GetPublicationFolderList().subscribe(async res => {
-
-
-
- let publicationsEventFolderList = new Array();
- let publicationsTravelFolderList = new Array();
-
- res.forEach(data => {
- let folder: PublicationFolder = {
- ProcessId: data.ProcessId,
- Description: data.Description,
- Detail: data.Detail,
- DateBegin: data.DateBegin,
- DateEnd: data.DateEnd,
- ActionType: data.ActionType,
+ if(this.loadList == false) {
+ this.loadList = true
+ this.showLoader = true;
+ this.skeletonLoader = true;
+ this.getFromDB()
+ this.publications.GetPublicationFolderList().subscribe(async res => {
+
+
+
+ let publicationsEventFolderList = new Array();
+ let publicationsTravelFolderList = new Array();
+
+ res.forEach(data => {
+ let folder: PublicationFolder = {
+ ProcessId: data.ProcessId,
+ Description: data.Description,
+ Detail: data.Detail,
+ DateBegin: data.DateBegin,
+ DateEnd: data.DateEnd,
+ ActionType: data.ActionType,
+ }
+
+ this.addActionToDB(folder)
+
+ if (data.ActionType == "Evento") {
+
+ publicationsEventFolderList.push(folder);
+ }
+ else {
+
+ publicationsTravelFolderList.push(folder);
+ }
+
+
+ });
+
+ if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+ await this.storage.set('actionsEvents', publicationsEventFolderList);
+ await this.storage.set('actionsViagens', publicationsTravelFolderList);
+ this.getFromDB()
+ } else {
+ this.getFromDB()
}
-
- this.addActionToDB(folder)
-
- if (data.ActionType == "Evento") {
-
- publicationsEventFolderList.push(folder);
- }
- else {
-
- publicationsTravelFolderList.push(folder);
- }
-
-
+
+ this.showLoader = false;
+ this.skeletonLoader = false;
+ this.loadList = false
+
+ }, (error) => {
+ // this.getFromDB();
+ this.showLoader = false;
+ this.skeletonLoader = false;
+ this.loadList = false
});
+ }
- if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- await this.storage.set('actionsEvents', publicationsEventFolderList);
- await this.storage.set('actionsViagens', publicationsTravelFolderList);
- this.getFromDB()
- } else {
- this.getFromDB()
- }
- this.showLoader = false;
- }/* , (error) => {
- this.getFromDB();
- } */);
- this.skeletonLoader = false;
}
addActionToStorage(events, viagens) {
@@ -253,7 +261,7 @@ export class PublicationsPage implements OnInit {
});
} else {
- this.sqliteservice.getAllActions().then((actions: any[]) => {
+ this.sqliteservice.getAllActions().then((actions: any[] = []) => {
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 9b69eb327..68c2d62d1 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -67,26 +67,33 @@ export class EventListPage implements OnInit {
async LoadToApproveEvents() {
this.showLoader = true;
- if(this.segment == 'MDGPR') {
- let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
- let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+ try {
+ if(this.segment == 'MDGPR') {
+ let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+ let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+
+ let allEvents = mdEventsOficial.concat(mdEventsPessoal);
+ if(allEvents.length > 0) {
+ this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
+ }
+ this.showLoader = false;
+ }
+ else if(this.segment == 'PR') {
+ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
+ let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+ let allEvents = prEventsOficial.concat(prEventsPessoal);
+
+ if(allEvents.length > 0) {
+ this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
+ }
+ this.showLoader = false;
+ }
- let allEvents = mdEventsOficial.concat(mdEventsPessoal);
- if(allEvents.length > 0) {
- this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
- }
- this.showLoader = false;
- }
- else if(this.segment == 'PR') {
- let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
- let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
- let allEvents = prEventsOficial.concat(prEventsPessoal);
-
- if(allEvents.length > 0) {
- this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
- }
+ } catch(erro) {
this.showLoader = false;
}
+
+
}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
index affd0d80f..2da1413da 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
@@ -64,9 +64,9 @@
Lista vazia
-
+
-
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index affd0d80f..45472bc3c 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -64,9 +64,8 @@
Lista vazia
-