-
+
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 0226a201e..b8705f592 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -23,6 +23,7 @@ import { Platform } from '@ionic/angular';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
@@ -66,6 +67,7 @@ export class DespachoPage implements OnInit {
private platform: Platform,
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
+ private httpErrorHandle: HttpErrorHandle
) {
@@ -154,7 +156,7 @@ export class DespachoPage implements OnInit {
} catch (e) {
this.RouteService.goBack();
}
- this.toastService.badRequest('Processo não encontrado')
+ this.httpErrorHandle.httpStatusHandle(error)
}
});
}
@@ -279,15 +281,10 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.executado(note, documents, this.serialnumber).toPromise();
- this.toastService._successMessage('Processo criado')
+ this.httpErrorHandle.httpsSucessMessagge('Executado')
this.close();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest("Processo não criado")
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -300,15 +297,10 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
- this.toastService._successMessage('Processo descartado')
+ this.httpErrorHandle.httpsSucessMessagge('Arquivar')
this.close();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest("Processo não descartado")
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -331,16 +323,11 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Reexecução')
this.close();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -363,15 +350,10 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Gerar Diploma')
this.close();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHandle.httpStatusHandle(error);
} finally {
loader.remove()
}
@@ -388,17 +370,17 @@ export class DespachoPage implements OnInit {
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
loader.remove()
- this.toastService.successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
},
error => {
loader.remove()
- this.toastService.badRequest("Processo não enviado para despacho")
+ this.httpErrorHandle.httpStatusHandle(error)
});
// loader.remove()
}
tstemethod(value: string) {
- alert(value)
+
}
async openAddNoteModal(actionName: string) {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 6eb81fabd..7546842e4 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -9,6 +9,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
+import {HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-diploma-assinar',
@@ -36,7 +37,8 @@ export class DiplomaAssinarPage implements OnInit {
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
private RouteService: RouteService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private httpErroHandle: HttpErrorHandle
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
@@ -110,21 +112,12 @@ export class DiplomaAssinarPage implements OnInit {
}, (error)=>{
try {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
this.goBack()
} catch (e) {
window.history.back();
} finally {
- if(error.status == 0) {
- this.toastService._badRequest('Não é possível visualizar este processo no modo offline')
- } else {
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
});
@@ -177,16 +170,11 @@ export class DiplomaAssinarPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService._successMessage(false, ()=>{
+ this.httpErroHandle.httpsSucessMessagge('Assinado',() => {
this.goBack();
})
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
finally {
loader.remove()
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
index 380d50899..22402a999 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -13,6 +13,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
@Component({
selector: 'app-diplomas-gerar',
@@ -43,7 +44,8 @@ export class DiplomasGerarPage implements OnInit {
private RouteService: RouteService,
public ThemeService: ThemeService,
private despachoService: DespachoService,
- ) {
+ private httpErroHandle: HttpErrorHandle
+ ) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
@@ -118,16 +120,12 @@ export class DiplomasGerarPage implements OnInit {
}, (error)=>{
try {
- this.toastService._badRequest('Processo não encontrado')
+ this.httpErroHandle.httpStatusHandle(error)
this.goBack()
} catch (e) {
window.history.back();
} finally {
- if(error.status == 0) {
- this.toastService._badRequest('Não é possível visualizar este processo no modo offline')
- } else {
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
});
@@ -250,15 +248,10 @@ export class DiplomasGerarPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.modalController.dismiss('sucess');
- this.toastService._successMessage();
+ this.httpErroHandle.httpsSucessMessagge('Gerar Diploma')
this.goBack()
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest();
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index 30062f8df..f1fb586d6 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -79,6 +79,8 @@
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 0aa97c549..2c1c80c53 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -15,6 +15,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
@@ -50,7 +51,8 @@ export class DiplomaPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
private platform: Platform,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private httpErrorHandle: HttpErrorHandle
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -162,12 +164,7 @@ export class DiplomaPage implements OnInit {
} catch (e) {
window.history.back();
}
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
});
@@ -286,17 +283,12 @@ export class DiplomaPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService._successMessage(false, () => {
+ this.httpErrorHandle.httpsSucessMessagge('Solicitar Assinatura',() => {
this.close();
})
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -317,14 +309,9 @@ export class DiplomaPage implements OnInit {
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Solicitar alteração')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -348,14 +335,9 @@ export class DiplomaPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
- this.toastService._successMessage('Processo concluído')
+ this.httpErrorHandle.httpsSucessMessagge('Concluir')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -441,5 +423,9 @@ export class DiplomaPage implements OnInit {
this.modalController.dismiss();
}
+ tempMethod(actionname) {
+ console.log(actionname)
+ }
+
}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index b34cf6c01..9e07d9a5f 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -17,6 +17,7 @@ import { OfflineManagerService } from 'src/app/services/offline-manager.service'
import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import config from 'capacitor.config';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-approve-event',
@@ -58,7 +59,8 @@ export class ApproveEventPage implements OnInit {
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
private offlineManager: OfflineManagerService,
- private storage: Storage
+ private storage: Storage,
+ private httpErrorHandle: HttpErrorHandle
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -216,7 +218,11 @@ export class ApproveEventPage implements OnInit {
}
}, (error) => {
- this.getProcessFromDB();
+ if(error.status == 0) {
+ this.getProcessFromDB();
+ } else {
+ this.httpErrorHandle.httpStatusHandle(error)
+ }
})
}
@@ -229,15 +235,10 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.goBack();
- this.toastService._successMessage('Evento aprovado')
+ this.httpErrorHandle.httpsSucessMessagge('Evento aprovação')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Evento não aprovado')
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -280,15 +281,10 @@ export class ApproveEventPage implements OnInit {
this.offlineManager.storeRequestData('event-listRever', body);
});
- this.toastService._successMessage('Evento enviado para revisão');
+ this.httpErrorHandle.httpsSucessMessagge('Rever')
this.goBack();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Evento não enviado para revisão');
- }
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -308,15 +304,10 @@ export class ApproveEventPage implements OnInit {
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise();
- await this.toastService._successMessage('Processo rejeitado');
+ this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
this.goBack();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Evento não rejeitado')
- }
+ this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index dc3c94984..8baba1ccd 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -19,7 +19,7 @@
-
+
Minha agenda
Agenda do PR
Agenda do MD
@@ -40,14 +40,14 @@
-
-
-
+
+
+
+ *ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)">
-
+
{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
@@ -65,51 +65,19 @@
-
-
-
-
-
-
-
-
{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
-
{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
-
-
-
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
-
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}
-
{{event.workflowInstanceDataFields.Subject}}
-
-
{{ event.activityInstanceName }}
-
-
-
-
-
-
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 21365a0f8..84b5acbd5 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -16,6 +16,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import { EventsService } from 'src/app/services/events.service';
+import { SessionStore } from 'src/app/store/session.service';
@Component({
selector: 'app-event-list',
@@ -36,8 +37,9 @@ export class EventListPage implements OnInit {
serialnumber: string;
skeletonLoader = true
- eventaprovacaostore = EventoAprovacaoStore;
eventoaprovacaostore = EventoAprovacaoStore;
+ eventsList: any = []
+ color: 'pr' | 'mdgpr'
constructor(
private processes: ProcessesService,
@@ -56,7 +58,13 @@ export class EventListPage implements OnInit {
ngOnInit() {
- this.segment = 'MDGPR';
+ if(!this.segment) {
+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+ this.segment = 'Meu calendario';
+ } else {
+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+ }
+ }
const location = window.location
const pathname = location.pathname + location.search
@@ -150,47 +158,53 @@ export class EventListPage implements OnInit {
}
async LoadToApproveEvents() {
- // this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => {
- this.showLoader = true;
- this.skeletonLoader = true
+ this.showLoader = true;
+ this.skeletonLoader = true
+ const segment = this.segment
+
+ if(this.segment == 'Meu calendario') {
+ // color
+ if(SessionStore.user.Profile == 'PR') {
+ this.color = 'pr'
+ } else {
+ this.color = 'mdgpr'
+ }
+
+ let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise();
+ try {
+ this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
+ } catch (error) {
+ this.eventsList = [];
+ }
+
+ this.eventoaprovacaostore.save(segment, this.eventsList)
- if (this.segment != 'PR') {
- let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
- this.eventsMDGPRList = mdEventsOficial
+ } else {
- this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
- this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
- this.eventoaprovacaostore.resetmd(this.eventsMDGPRList);
-
- this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
-
- })
-
- }
- else if (this.segment == 'PR') {
- let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+ this.color = 'pr'
- this.eventsPRList = prEventsOficial
-
- this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
- this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
- this.eventoaprovacaostore.resetpr(this.eventsPRList);
-
- this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
-
- })
-
+ let allEvents = await this.processes.eventsToApprove(segment).toPromise()
+ try {
+ this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
+ } catch(error) {
+ this.eventsList = []
}
+
+ this.eventsList = this.eventsList
+ this.eventsList = this.eventsList
this.showLoader = false;
- this.skeletonLoader = false
+ this.eventoaprovacaostore.save(segment, this.eventsList)
+ }
+
+ this.showLoader = false;
+ this.skeletonLoader = false
- // }, (error) => {
- // this.getEventToAproveFromDB();
- // })
}
-
+ toDateString(e) {
+ return new Date(e).toDateString()
+ }
async openApproveModal(eventSerialNumber, event) {
const modal = await this.modalController.create({
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 3a31233c5..85448edb6 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -61,7 +61,7 @@
-
+
@@ -314,7 +314,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 7926b8b76..9f226b297 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -20,6 +20,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { RoleIdService } from 'src/app/services/role-id.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
const moment = _rollupMoment || _moment;
@@ -120,7 +121,8 @@ export class BookMeetingModalPage implements OnInit {
private toastService: ToastService,
public ThemeService: ThemeService,
public eventService: EventsService,
- public RoleIdService: RoleIdService
+ public RoleIdService: RoleIdService,
+ private httpErroHandle: HttpErrorHandle
) {
@@ -304,15 +306,10 @@ export class BookMeetingModalPage implements OnInit {
await this.calendarService.genericPostExpedientEvent(this.task.DocId, this.postData, "",this.task.SerialNumber, this.task.FsId, CalendarId).toPromise();
this.modalController.dismiss();
- this.toastService._successMessage('Reunião criada');
+ this.httpErroHandle.httpsSucessMessagge('Marcar Reunião')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Reunião não criada')
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
finally {
loader.remove()
@@ -329,14 +326,10 @@ export class BookMeetingModalPage implements OnInit {
await this.calendarService.genericCreateTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "",this.task.SerialNumber, this.task.FsId, CalendarId).toPromise();
this.close();
- this.toastService._successMessage('Reunião criada');
+ this.httpErroHandle.httpsSucessMessagge('Marcar Reunião')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
- this.toastService._badRequest()
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 85196ed05..764ca5962 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -24,6 +24,7 @@ import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -111,6 +112,7 @@ export class ExpedientTaskModalPage implements OnInit {
private despachoService: DespachoService,
public ThemeService: ThemeService,
public p: PermissionService,
+ private httpErroHandle: HttpErrorHandle,
) {
this.loggeduser = SessionStore.user;
@@ -325,16 +327,11 @@ export class ExpedientTaskModalPage implements OnInit {
try {
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
- await this.toastService._successMessage('Processo efetuado');
+ await this.httpErroHandle.httpsSucessMessagge('Efetuar Despacho')
this.modalController.dismiss(action_despacho);
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- await this.toastService._badRequest('Processo não efetuado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -364,16 +361,12 @@ export class ExpedientTaskModalPage implements OnInit {
try {
this.taskResult = await this.processes.postParecer(this.postData).toPromise();
- await this.toastService._successMessage('Pedido enviado');
+ await this.httpErroHandle.httpsSucessMessagge('Solicitar Parecer')
+
this.modalController.dismiss(action_parecer);
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- await this.toastService._badRequest('Processo não efetuado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -401,15 +394,10 @@ export class ExpedientTaskModalPage implements OnInit {
try {
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
- this.toastService._successMessage('Processo efetuado');
+ this.httpErroHandle.httpsSucessMessagge('Pedido de Deferimento')
this.modalController.dismiss(action_deferimento);
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- await this.toastService._badRequest('Processo não efetuado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -444,15 +432,10 @@ export class ExpedientTaskModalPage implements OnInit {
if(this.postData.DispatchFolder.Message){
try {
this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
- await this.toastService._successMessage('Processo efetuado');
+ await this.httpErroHandle.httpsSucessMessagge('Efetuar Despacho')
this.modalController.dismiss(action_despacho_pr);
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- await this.toastService._badRequest('Processo não efetuado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
//loader.remove()
}
@@ -486,15 +469,10 @@ export class ExpedientTaskModalPage implements OnInit {
try {
this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
- await this.toastService._successMessage('Pedido enviado');
+ await this.httpErroHandle.httpsSucessMessagge('Solicitar Parecer')
this.modalController.dismiss(action_parecer_pr);
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- await this.toastService._badRequest('Processo não efetuado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 31eac214b..1daf5b31d 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -35,6 +35,7 @@ import { Storage } from '@ionic/storage';
import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-expediente-detail',
@@ -88,6 +89,7 @@ export class ExpedienteDetailPage implements OnInit {
private dataService: DataService,
private storage: Storage,
private userAuth: AuthService,
+ private httpErroHandle: HttpErrorHandle
) {
this.loggeduser = SessionStore.user
console.log('SessionStore', SessionStore)
@@ -242,14 +244,9 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
- this.toastService._successMessage('Processo aprovado')
+ this.httpErroHandle.httpsSucessMessagge('Avaliação Superiror')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não aprovado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -272,14 +269,9 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService._successMessage()
+ this.httpErroHandle.httpsSucessMessagge('Rever')
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -402,17 +394,12 @@ export class ExpedienteDetailPage implements OnInit {
this.getFromDB();
} else {
try {
- this.toastService._badRequest('Processo não encontrado')
+ this.httpErroHandle.httpStatusHandle(error)
this.goBack()
} catch (e) {
window.history.back();
}
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
});
@@ -545,12 +532,7 @@ export class ExpedienteDetailPage implements OnInit {
await this.processes.CompleteTask(body).toPromise();
this.goBack();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não descartado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 7bd3d7fc1..1c03e8fa5 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-expediente-pr',
@@ -60,7 +61,8 @@ export class ExpedientePrPage implements OnInit {
private toastService: ToastService,
private attachmentsService: AttachmentsService,
private RouteService: RouteService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private httpErroHandle: HttpErrorHandle
) {
this.loggeduser = SessionStore.user;
@@ -137,18 +139,13 @@ export class ExpedientePrPage implements OnInit {
const loader = this.toastService.loading()
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
- this.toastService._successMessage('Processo enviado para pendentes')
+ this.httpErroHandle.httpsSucessMessagge('Enviar para Pendente')
this.goBack();
loader.remove()
},
(error)=>{
loader.remove()
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não enviado para pendentes')
- }
+ this.httpErroHandle.httpStatusHandle(error)
});
}
@@ -193,16 +190,12 @@ export class ExpedientePrPage implements OnInit {
}, (error)=>{
try {
- this.toastService._badRequest('Processo não encontrado')
+ this.httpErroHandle.httpStatusHandle(error)
this.goBack()
} catch (e) {
window.history.back();
} finally {
- if(error.status == 0) {
- this.toastService._badRequest('Não é possível visualizar este processo no modo offline')
- } else {
- this.toastService._badRequest('Processo não encontrado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
}
});
}
@@ -312,14 +305,9 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
- this.toastService._successMessage('Processo aprovado')
+ this.httpErroHandle.httpsSucessMessagge('Aprovar')
} catch(error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não aprovado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -342,14 +330,9 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService._successMessage()
+ this.httpErroHandle.httpsSucessMessagge('Rever')
} catch(error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -468,15 +451,10 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
- this.toastService._successMessage('Processo descartado');
+ this.httpErroHandle.httpsSucessMessagge('Arquivar')
this.goBack();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Processo não descartado')
- }
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index a6e2e9f6a..660d05984 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -242,7 +242,7 @@
Eventos para Aprovação
-
{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos
+
{{eventoaprovacaostore.countAll}} Documentos
-
+
diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts
index 6c8a08d17..c230a1790 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.ts
+++ b/src/app/pages/publications/edit-action/edit-action.page.ts
@@ -5,6 +5,7 @@ import * as moment from 'moment';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
+import { HttpErrorHandle} from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-edit-action',
@@ -41,6 +42,7 @@ export class EditActionPage implements OnInit {
private toastService: ToastService,
private navParams: NavParams,
private modalController: ModalController,
+ private httpErrorHandle: HttpErrorHandle
) {
this.folder = new PublicationFolder();
this.folderId = this.navParams.get('folderId');
@@ -117,14 +119,9 @@ export class EditActionPage implements OnInit {
await this.publicationsService.UpdatePresidentialAction(body).toPromise()
this.close();
this.updateDesktopComponent.emit();
- this.toastService._successMessage('Acção presidencial atualizada')
+ this.httpErrorHandle.httpsSucessMessagge('Editar publicação');
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest('Não foi possivel atualizar a acção presidencial')
- }
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index a0dff27e8..637db6e74 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -88,7 +88,7 @@
-
+
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index 575f1121d..0dba0fed6 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -7,6 +7,7 @@ import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -65,7 +66,8 @@ export class NewActionPage implements OnInit {
constructor(
private modalController: ModalController,
private publication: PublicationsService,
- private toastService: ToastService
+ private toastService: ToastService,
+ private httpErroHandle: HttpErrorHandle
) {
@@ -138,11 +140,11 @@ export class NewActionPage implements OnInit {
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise();
- this.toastService._successMessage("Acção criada");
+ this.httpErroHandle.httpsSucessMessagge('Acção criada')
this.close();
} catch (error) {
- this.toastService._badRequest("Acção não criada");
+ this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index a773b5cf9..a85c42b58 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -18,6 +18,7 @@ import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera
import { Filesystem, Directory } from '@capacitor/filesystem';
import { NgxImageCompressService } from "ngx-image-compress";
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
const IMAGE_DIR = 'stored-images';
@@ -85,6 +86,7 @@ export class NewPublicationPage implements OnInit {
private platform: Platform,
private loadingCtrl: LoadingController,
public imageCompress: NgxImageCompressService,
+ private httpErrorHandle: HttpErrorHandle
) {
this.publicationType = this.navParams.get('publicationType');
@@ -198,14 +200,14 @@ export class NewPublicationPage implements OnInit {
this.Form = new FormGroup({
Subject: new FormControl(this.pub.Title, [
- //Validators.required,
+ Validators.required,
// Validators.minLength(4)
]),
capturedImage: new FormControl(this.capturedImage, [
]),
Message: new FormControl(this.pub.Message, [
- // Validators.required
+ Validators.required,
Validators.maxLength(1000)
])
@@ -241,11 +243,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService._successMessage("Publicação editada")
+ this.httpErrorHandle.httpsSucessMessagge('Publicação Editada')
this.close();
} catch (error) {
- this.toastService._badRequest("Publicação não editada")
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -269,11 +271,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService._successMessage("Publicação criado")
+ this.httpErrorHandle.httpsSucessMessagge('Criar publicação')
this.close();
} catch (error) {
- this.toastService._badRequest("Publicação não criado")
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -297,11 +299,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService._successMessage("Publicação criado")
+ this.httpErrorHandle.httpsSucessMessagge('Criar publicação')
this.close();
} catch (error) {
- this.toastService._badRequest("Publicação não criado")
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -333,12 +335,12 @@ export class NewPublicationPage implements OnInit {
await this.publications.CreatePublication(this.folderId, this.publication).toPromise();
this.close();
- this.toastService._successMessage("Publicação criado")
+ this.httpErrorHandle.httpsSucessMessagge('Criar publicação')
this.close();
} catch (error) {
- this.toastService._badRequest("Publicação não criado")
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index b0080a8f8..5564037c1 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -9,6 +9,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-publication-detail',
@@ -30,6 +31,7 @@ export class PublicationDetailPage implements OnInit {
private RouteService: RouteService,
public ThemeService: ThemeService,
public p:PermissionService,
+ private httpErrorHandle: HttpErrorHandle
) {
this.activatedRoute.paramMap.subscribe(params => {
@@ -87,6 +89,9 @@ export class PublicationDetailPage implements OnInit {
FileExtension: 'jpeg',
}
this.showLoader = false;
+ }, (error) => {
+ this.httpErrorHandle.httpStatusHandle(error)
+ this.goBack();
});
}
@@ -109,7 +114,7 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
- this.toastService._successMessage('Publicação removida')
+ this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação')
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
@@ -117,7 +122,7 @@ export class PublicationDetailPage implements OnInit {
this.goBack();
} catch (error) {
- this.toastService._badRequest('Publicaçao não removida')
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
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 44951aa3a..ea2a2a2dd 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -13,6 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { forkJoin } from 'rxjs';
import { ToastService } from 'src/app/services/toast.service';
import { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-view-publications',
@@ -44,7 +45,8 @@ export class ViewPublicationsPage implements OnInit {
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
private toastService: ToastService,
- public p: PermissionService,) {
+ public p: PermissionService,
+ private httpErroHandle: HttpErrorHandle) {
this.item = new PublicationFolder();
this.activatedRoute.paramMap.subscribe(params => {
@@ -119,6 +121,8 @@ export class ViewPublicationsPage implements OnInit {
this.item = res;
this.sqliteservice.updatePublicationsDetails(this.folderId, JSON.stringify(res));
+ }, (error) => {
+ this.httpErroHandle.httpStatusHandle(error)
});
}
@@ -161,7 +165,12 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = false;
}, (error) => {
- this.getFromDB()
+ if(error.status == 0) {
+ this.getFromDB()
+ } else {
+ this.httpErroHandle.httpStatusHandle(error)
+ }
+
});
}
@@ -196,6 +205,8 @@ export class ViewPublicationsPage implements OnInit {
if (error.status == '404') {
this.error = 'Sem publicações disponíveis!';
this.publicationList = [];
+ } else {
+ this.httpErroHandle.httpStatusHandle(error)
}
this.showLoader = false;
});
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index ebb78c083..453e3869d 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -13,6 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { Router } from '@angular/router';
import { environment } from 'src/environments/environment';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-search',
@@ -65,7 +66,8 @@ export class SearchPage implements OnInit {
private modalCtrl: ModalController,
private navParams: NavParams,
public ThemeService: ThemeService,
- private router: Router)
+ private router: Router,
+ private httpErrorhandle: HttpErrorHandle)
{
this.ordinance = "recent";
this.currentPath= window.location.pathname;
@@ -287,6 +289,7 @@ export class SearchPage implements OnInit {
},error => {
this.showLoader = false;
// this.searchResult = "Registo não encontrado"
+ this.httpErrorhandle.httpStatusHandle(error)
console.log(error)
});
}
@@ -334,7 +337,6 @@ export class SearchPage implements OnInit {
this.loadWordCloud();
},error => {
this.searchResult = "Registo não encontrado"
-
counter++;
console.log('application 8 failed', error)
if(counter ==2) {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index b1184a9a1..aaa96fa2a 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
import { LoginUserRespose, UserForm, UserSession } from '../models/user.model';
import { environment } from 'src/environments/environment';
import { BehaviorSubject } from 'rxjs';
-import { AuthConnstants } from '../config/auth-constants';
import { AlertController } from '@ionic/angular';
import { SessionStore } from '../store/session.service';
import { AESEncrypt } from '../services/aesencrypt.service';
@@ -141,7 +140,6 @@ export class AuthService {
const formData = message.temporaryData
try {
- // alert('upload try')
let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
message.file.guid = guid.path
@@ -217,7 +215,6 @@ export class AuthService {
SessionStore.setInativity(false)
SessionStore.setUrlBeforeInactivity(this.router.url);
setTimeout(() => {
- // alert('logout')
this.router.navigateByUrl('/', { replaceUrl: true });
}, 100)
diff --git a/src/app/services/clear-store.service.ts b/src/app/services/clear-store.service.ts
index c2343892a..21e195e39 100644
--- a/src/app/services/clear-store.service.ts
+++ b/src/app/services/clear-store.service.ts
@@ -20,9 +20,8 @@ export class ClearStoreService {
clear() {
+ EventoAprovacaoStore.clear();
DespachoStore.reset([])
- EventoAprovacaoStore.resetmd([])
- EventoAprovacaoStore.resetpr([])
ExpedienteGdStore.reset([])
PendentesStore.reset([])
PedidosStore.resetdeferimento([])
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 6805fa35b..b7cf27744 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -258,10 +258,12 @@ export class EventsService {
this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName
if(!this.calendarNamesAry.find(x => x.Role == e.Role)) {
-
+
+
let objectShared = {
"Fullname": e.FullName,
"Role": e.Role,
+ "OwnerUserId": sharedCalendar.OwnerUserId,
"RoleId": sharedCalendar.CalendarRoleId
}
@@ -864,16 +866,17 @@ export class EventsService {
let options: any;
- const headers = [
- this.headerSharedOficial,
- this.headerSharedPessoal,
- this.headerOwnPessoal,
- this.headerOwnOficial
- ]
-
- const header = headers.find((header)=> {
- return header?.get('CalendarId')?.includes(CalendarId)
+ const Selectedcalendar = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars).find((calendar) =>{
+ return calendar.CalendarId == CalendarId
})
+
+ let header = new HttpHeaders();
+
+ header = header.set('Authorization',SessionStore.user.BasicAuthKey);
+ header = header.set('CalendarId', Selectedcalendar.CalendarId);
+ header = header.set('CalendarRoleId', Selectedcalendar.CalendarRoleId);
+
+ console.log(Selectedcalendar)
options = {
headers: header,
diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts
index d47d95c60..d8ee507ea 100644
--- a/src/app/services/functions/sort.service.ts
+++ b/src/app/services/functions/sort.service.ts
@@ -9,6 +9,10 @@ export class SortService {
constructor(private ObjectService: ObjectService) { }
sortArrayISODate(myArray: any) {
+
+ if(!Array.isArray(myArray)) {
+ myArray = []
+ }
if(myArray.length > 0){
return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
@@ -17,7 +21,9 @@ export class SortService {
}
sortArrayByDate(myArray: any) {
-
+ if(!Array.isArray(myArray)) {
+ myArray = []
+ }
if(myArray.length > 0){
return myArray.sort(function (a, b) {
return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0);
@@ -26,7 +32,10 @@ export class SortService {
}
sortDate(array = [], path: string) {
-
+ if(!Array.isArray(array)) {
+ array = []
+ }
+
return array.sort( (a,b)=> {
return (new Date(this.ObjectService.deepFind(a, path)) < new Date(this.ObjectService.deepFind(b, path))) ? -1 : ((new Date(this.ObjectService.deepFind(a, path)) > new Date(this.ObjectService.deepFind(b, path))) ? 1 : 0);
diff --git a/src/app/services/http-error-handle.service.spec.ts b/src/app/services/http-error-handle.service.spec.ts
new file mode 100644
index 000000000..bfc153cdd
--- /dev/null
+++ b/src/app/services/http-error-handle.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HttpErrorHandle } from './http-error-handle.service';
+
+describe('HttpErrorHandle.ServiceService', () => {
+ let service: HttpErrorHandle;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(HttpErrorHandle);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts
new file mode 100644
index 000000000..2e7e83c5b
--- /dev/null
+++ b/src/app/services/http-error-handle.service.ts
@@ -0,0 +1,145 @@
+import { Injectable } from '@angular/core';
+import { ToastService } from 'src/app/services/toast.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class HttpErrorHandle {
+
+ constructor(
+ private toastService: ToastService
+ ) { }
+
+ httpStatusHandle(error) {
+ switch (error.status
+ ) {
+ case 0:
+ this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+ break;
+ case 400:
+ this.toastService._badRequest('Lamentamos, mas houve um problema com sua solicitação. Por favor, tente novamente')
+ break;
+ case 401:
+ this.toastService._badRequest('Ocorreu um problema, por favor valide o username e password');
+ break;
+ case 403:
+ this.toastService._badRequest('Lamentamos, você não tem permissão para acessar este serviço.')
+ break;
+ case 404:
+ this.toastService._badRequest('Lamentamos, não encontramos o que procura.')
+ break;
+ case 500:
+ this.toastService._badRequest('Lamentamos, mas houve um erro interno do servidor. Por favor, tente novamente mais tarde.')
+ break;
+ case 502:
+ this.toastService._badRequest('Lamentamos, houve um problema com o servidor. Por favor, tente novamente mais tarde.')
+ break;
+ case 503:
+ this.toastService._badRequest('Lamentamos, o serviço está indisponível no momento. Por favor, tente novamente mais tarde.')
+ break
+ default:
+ break;
+ }
+ }
+
+ httpsSucessMessagge(service: string, callback?: any) {
+ switch (service) {
+ case 'new event':
+ this.toastService._successMessage('Evento criado!')
+ break;
+ case 'Editar evento':
+ this.toastService._successMessage('Evento editado!')
+ break
+ case 'delete event':
+ this.toastService._successMessage('Evento eliminado!')
+ break;
+ case 'Executado':
+ this.toastService._successMessage('Despacho executado!')
+ break;
+ case 'Gerar Diploma':
+ this.toastService._successMessage('Diploma gerado!')
+ break;
+ case 'Efetuar Despacho':
+ this.toastService._successMessage('Despacho efetuado!')
+ break;
+ case 'Solicitar Parecer':
+ this.toastService._successMessage('Pedido de parecer solicitado!')
+ break;
+ case 'Delegar':
+ this.toastService._successMessage('Tarefa delegada!')
+ break;
+ case 'Marcar Reunião':
+ this.toastService._successMessage('Evento criado!')
+ break;
+ case 'Enviar para Pendentes':
+ this.toastService._successMessage('Enviado com sucesso!')
+ break;
+ case 'Aprovar':
+ this.toastService._successMessage('Evento aprovado!')
+ break;
+ case 'Rever':
+ this.toastService._successMessage('Evento enviado para revisão!')
+ break;
+ case 'Avaliação Superiror':
+ this.toastService._successMessage('Enviado para avaliação!')
+ break;
+ case 'Mandar para Revisão':
+ this.toastService._successMessage('Enviado para revisão!')
+ break;
+ case 'Pedido de Deferimento':
+ this.toastService._successMessage('Enviado com sucesso!')
+ break;
+ case 'Arquivar':
+ this.toastService._successMessage('Tarefa Arquivada!')
+ break
+ case 'Concluir':
+ this.toastService._successMessage('Diploma concluido')
+ case 'Reexecução':
+ this.toastService._successMessage('Enviado para reexecução!')
+ break;
+ case 'Assinado':
+ this.toastService._successMessage('Diploma assinado!')
+ break;
+ case 'Solicitar Assinatura':
+ this.toastService._successMessage('Solicitação enviada!')
+ break;
+ case 'Solicitar alteração':
+ this.toastService._successMessage('Solicitação enviada!')
+ break;
+ case 'Evento aprovação':
+ this.toastService._successMessage('Evento aprovado!')
+ break;
+ case 'Rejeitar':
+ this.toastService._successMessage('Evento Rejeitado!')
+ break;
+ case 'Dar o meu Parecer':
+ this.toastService._successMessage('Parecer enviado!')
+ break;
+ case 'Reencaminhar':
+ this.toastService._successMessage('Reencaminhado!')
+ break;
+ case 'Eliminar publicação':
+ this.toastService._successMessage('Publicação Eliminada!')
+ break;
+ case 'Editar publicação':
+ this.toastService._successMessage('Publicação Editada!')
+ break;
+ case 'Criar publicação':
+ this.toastService._successMessage('Publicação criada!')
+ break;
+ case 'Acção criada':
+ this.toastService._successMessage('Acção criada!')
+ break;
+ case 'Editar Acção':
+ this.toastService._successMessage('Acção editada!')
+ break;
+ case 'Eliminar Acção':
+ this.toastService._successMessage('Acção eliminada!')
+ break;
+
+ default:
+ this.toastService._successMessage('Processo efetuado!')
+ break;
+ }
+ }
+}
diff --git a/src/app/services/inativity.service.ts b/src/app/services/inativity.service.ts
index 9dcf0bd69..70d173509 100644
--- a/src/app/services/inativity.service.ts
+++ b/src/app/services/inativity.service.ts
@@ -23,7 +23,6 @@ export class InativityService {
function userIsNotActive() {
// your function for too long inactivity goes here
SessionStore.setInativity(false)
- // alert('go out')
try {
window['inactivity/function']()
} catch (error) {}
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index d952907d7..408439772 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -69,6 +69,22 @@ export class ProcessesService {
return this.http.get
(`${geturl}`, options);
}
+ eventsToApprove(userid) {
+ const geturl = environment.apiURL + 'tasks/events-to-approve';
+ let params = new HttpParams();
+
+ params = params.set("pageNum", 1);
+ params = params.set("pageSize", 500);
+ params = params.set("userid", userid);
+
+ let options = {
+ headers: this.headers,
+ params: params
+ };
+
+ return this.http.get(`${geturl}`, options);
+ }
+
GetTaskListExpediente(onlycount1): Observable {
const processname = "Expediente"
const onlycount = false
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 04622212f..73418d32c 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
@@ -38,7 +38,7 @@