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 7546842e4..d3fc419db 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
@@ -10,6 +10,11 @@ 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 {HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { DespachoService } from 'src/app/Rules/despacho.service'
+import { AttachmentList } from 'src/app/models/Excludetask';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
@Component({
selector: 'app-diploma-assinar',
@@ -38,7 +43,8 @@ export class DiplomaAssinarPage implements OnInit {
private toastService: ToastService,
private RouteService: RouteService,
public ThemeService: ThemeService,
- private httpErroHandle: HttpErrorHandle
+ private httpErroHandle: HttpErrorHandle,
+ private despachoService: DespachoService,
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
@@ -182,6 +188,133 @@ export class DiplomaAssinarPage implements OnInit {
}
+ async openAddNoteModal(actionName: string) {
+
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'add-note-modal-no-height'
+ }
+ const modal = await this.modalController.create({
+ component: AddNotePage,
+ componentProps: {
+ showAttachmentBtn: true,
+ actionName: actionName
+ },
+ cssClass: classs,
+ backdropDismiss: true
+ });
+
+ await modal.present();
+
+ modal.onDidDismiss().then(async (res) => {
+ if (res.data) {
+
+ const DocumentToSave = res.data.documents.map((e) => {
+ return {
+ ApplicationId: e.ApplicationType,
+ SourceId: e.Id,
+ }
+ });
+
+ let docs = {
+ ProcessInstanceID: "",
+ Attachments: DocumentToSave,
+ }
+
+ if (actionName == 'Executado') {
+
+ /* await this.executado(res.data.note, docs);
+ this.goBack(); */
+ }
+ else if (actionName == 'Arquivo') {
+ await this.arquivar(res.data.note, docs);
+ this.goBack();
+ }
+ else if (actionName == 'Reexecução') {
+ /* await this.reexecute(res.data.note, docs);
+ this.goBack(); */
+ } else if(actionName == 'Gerar Diploma') {
+ /* await this.generateDiploma(res.data.note, docs);
+ this.goBack(); */
+ }
+ }
+ });
+ }
+
+ async arquivar(note: string, documents: AttachmentList) {
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
+ this.httpErroHandle.httpsSucessMessagge('Arquivar')
+ this.close();
+ } catch (error) {
+ this.httpErroHandle.httpStatusHandle(error)
+ }
+ finally {
+ loader.remove()
+ }
+
+ }
+
+ async openExpedientActionsModal(taskAction: any, task: any) {
+
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+ const modal = await this.modalController.create({
+ component: CreateProcessPage,
+ componentProps: {
+ taskAction: taskAction,
+ task: task,
+ profile: this.profile,
+ fulltask: this.fulltask
+ },
+ cssClass: classs,
+ });
+ await modal.present();
+ modal.onDidDismiss().then(async (res) => {
+
+
+ if (res['data'] == 'openDiscart') {
+ await this.distartExpedientModal();
+ }
+
+ this.goBack();
+ });
+ }
+
+ async distartExpedientModal() {
+
+ const modal = await this.modalController.create({
+ component: DiscartExpedientModalPage,
+ componentProps: {
+ serialNumber: this.fulltask.serialNumber,
+ folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+ action: 'complete',
+ },
+ cssClass: 'discart-expedient-modal',
+ backdropDismiss: false
+ });
+
+ await modal.present();
+ modal.onDidDismiss().then(res => {
+ if (res['data'] == 'close') {
+ this.close();
+ /*
+ this.close();
+ this.openMenu(); */
+ }
+
+ });
+ }
+
toDateString(e) {
return new Date(e).toDateString()
}
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 22402a999..26ddf1ef7 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
@@ -185,12 +185,12 @@ export class DiplomasGerarPage implements OnInit {
const loader = this.toastService.loading()
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
- this.toastService.successMessage()
+ this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
loader.remove()
},
error => {
loader.remove()
- this.toastService.badRequest("Processo não enviado para despacho")
+ this.httpErroHandle.httpStatusHandle(error)
});
}
@@ -309,16 +309,11 @@ export class DiplomasGerarPage 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/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index f1fb586d6..59b5d0667 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -79,8 +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 2c1c80c53..d7f2a08c4 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -16,6 +16,10 @@ 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';
+import { AttachmentList } from 'src/app/models/Excludetask';
+import { DespachoService } from 'src/app/Rules/despacho.service'
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
@Component({
@@ -52,7 +56,8 @@ export class DiplomaPage implements OnInit {
private backgroundservice: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService,
- private httpErrorHandle: HttpErrorHandle
+ private httpErrorHandle: HttpErrorHandle,
+ private despachoService: DespachoService
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -395,6 +400,9 @@ export class DiplomaPage implements OnInit {
else if (actionName == 'Concluir diploma') {
await this.finish(res.data.note, docs);
this.goBack();
+ } else if (actionName == 'Arquivo') {
+ await this.arquivar(res.data.note, docs);
+ this.goBack();
}
}
});
@@ -419,6 +427,24 @@ export class DiplomaPage implements OnInit {
modal.onDidDismiss();
}
+ async arquivar(note: string, documents: AttachmentList) {
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise()
+ this.httpErrorHandle.httpsSucessMessagge('Arquivar')
+ this.close();
+ } catch (error) {
+ this.httpErrorHandle.httpStatusHandle(error)
+ }
+ finally {
+ loader.remove()
+ }
+
+ }
+
+
close() {
this.modalController.dismiss();
}
@@ -427,5 +453,61 @@ export class DiplomaPage implements OnInit {
console.log(actionname)
}
+
+ async openExpedientActionsModal(taskAction: any, task: any) {
+
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+ const modal = await this.modalController.create({
+ component: CreateProcessPage,
+ componentProps: {
+ taskAction: taskAction,
+ task: task,
+ profile: this.profile,
+ fulltask: this.fulltask
+ },
+ cssClass: classs,
+ });
+ await modal.present();
+ modal.onDidDismiss().then(async (res) => {
+
+
+ if (res['data'] == 'openDiscart') {
+ await this.distartExpedientModal();
+ }
+
+ this.goBack();
+ });
+ }
+
+ async distartExpedientModal() {
+
+ const modal = await this.modalController.create({
+ component: DiscartExpedientModalPage,
+ componentProps: {
+ serialNumber: this.fulltask.serialNumber,
+ folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+ action: 'complete',
+ },
+ cssClass: 'discart-expedient-modal',
+ backdropDismiss: false
+ });
+
+ await modal.present();
+ modal.onDidDismiss().then(res => {
+ if (res['data'] == 'close') {
+ this.close();
+ /*
+ this.close();
+ this.openMenu(); */
+ }
+
+ });
+ }
+
}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 064445d08..5966d57ff 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -11,6 +11,7 @@ import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/e
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-approve-event-modal',
@@ -40,7 +41,8 @@ export class ApproveEventModalPage implements OnInit {
private activatedRoute: ActivatedRoute,
private iab: InAppBrowser,
private toastService: ToastService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private httpErrorHandle: HttpErrorHandle
) {
@@ -101,18 +103,13 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
- this.toastService._successMessage('Evento aprovado', ()=>{
+ this.httpErrorHandle.httpsSucessMessagge('Aprovar', ()=>{
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
})
} 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()
@@ -128,7 +125,7 @@ export class ApproveEventModalPage implements OnInit {
async rejectTask(serialNumber:string) {
- let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
+ let body = { "serialNumber": serialNumber, "action": "Descartar" }
const loader = this.toastService.loading()
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 9e07d9a5f..b34382d8d 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
@@ -299,7 +299,7 @@ export class ApproveEventPage implements OnInit {
}
async rejeitar(serialNumber: string) {
- let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
+ let body = { "serialNumber": serialNumber, "action": "Descartar" }
const loader = this.toastService.loading()
try {
@@ -384,16 +384,10 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise();
- this.toastService._successMessage();
this.goBack();
- this.toastService._successMessage('Evento enviado para revisão');
+ this.httpErrorHandle.httpsSucessMessagge('Rever')
} 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()
}
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 1daf5b31d..340dc083a 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
@@ -333,18 +333,13 @@ export class ExpedienteDetailPage 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 Pendentes')
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)
});
}
diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html
index bf1fbec43..3572ad8b9 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.html
+++ b/src/app/pages/publications/edit-action/edit-action.page.html
@@ -115,7 +115,7 @@
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index f5a680769..6cedb94d0 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -11,7 +11,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -101,8 +101,11 @@
-
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 a85c42b58..373e4bc84 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -299,7 +299,7 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.httpErrorHandle.httpsSucessMessagge('Criar publicação')
+ this.httpErrorHandle.httpsSucessMessagge('Publicação Editada')
this.close();
} catch (error) {
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index 6f986f089..41b700480 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -10,6 +10,7 @@ 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 { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-publication-detail',
@@ -29,7 +30,8 @@ export class PublicationDetailPage implements OnInit {
private toastService: ToastService,
private RouteService: RouteService,
public ThemeService: ThemeService,
- public p:PermissionService ) {
+ public p:PermissionService,
+ private httpErrorHandle: HttpErrorHandle ) {
this.publicationId = this.navParams.get('publicationId');
/* this.folderId = this.navParams.get('folderIdId'); */
@@ -95,13 +97,13 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
- this.toastService.successMessage('Publicação eliminado')
+ this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação')
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
this.close();
} catch (error) {
- this.toastService.badRequest('Publicação não eliminado')
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts
index 2e7e83c5b..8856473c9 100644
--- a/src/app/services/http-error-handle.service.ts
+++ b/src/app/services/http-error-handle.service.ts
@@ -136,6 +136,12 @@ export class HttpErrorHandle {
case 'Eliminar Acção':
this.toastService._successMessage('Acção eliminada!')
break;
+ case 'Solicitar Reapreciação':
+ this.toastService._successMessage('Solicitação enviada!')
+ break;
+ case 'Aprovar exp':
+ this.toastService._successMessage('Expediente enviado!');
+ break;
default:
this.toastService._successMessage('Processo efetuado!')
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 851f58faa..a8a900846 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -104,7 +104,7 @@ export class ApproveEventPage implements OnInit {
async rejectTask(serialNumber:string) {
- let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
+ let body = { "serialNumber": serialNumber, "action": "Descartar" }
const loader = this.toastService.loading()
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 8104ac08a..49ed2fc64 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -14,6 +14,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-opts-expediente-pr',
@@ -50,6 +51,7 @@ export class OptsExpedientePrPage implements OnInit {
private RouteService: RouteService,
public ThemeService: ThemeService,
public p: PermissionService,
+ private httpErrorHandle: HttpErrorHandle
) {
@@ -141,14 +143,9 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Aprovar exp')
} 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()
}
@@ -183,15 +180,10 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
- this.toastService._successMessage('Processo descartado');
+ this.httpErrorHandle.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.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -207,15 +199,10 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
- // this.toastService.successMessage('Processo descartado');
+ this.httpErrorHandle.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.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -227,15 +214,10 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
- this.toastService._successMessage();
+ this.httpErrorHandle.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();
- }
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
@@ -261,14 +243,9 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
- this.toastService._successMessage()
+ this.httpErrorHandle.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.httpErrorHandle.httpsSucessMessagge(error)
} finally {
loader.remove()
}
@@ -280,14 +257,10 @@ export class OptsExpedientePrPage implements OnInit {
const loader = this.toastService.loading()
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
loader.remove()
+ this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
this.close();
}, (error) => {
- 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)
loader.remove()
});
}
@@ -325,11 +298,7 @@ export class OptsExpedientePrPage implements OnInit {
// this.toastService.successMessage('Processo descartado');
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.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index bb71ed919..dca2d32bb 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -18,6 +18,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
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-opts-expediente',
@@ -48,7 +49,8 @@ export class OptsExpedientePage implements OnInit {
private attachmentsService: AttachmentsService,
private RouteService: RouteService,
private expedienteService: ExpedienteService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private httpErrorHanlde: HttpErrorHandle
) {
}
@@ -171,12 +173,7 @@ export class OptsExpedientePage implements OnInit {
this.attachmentsService.AddAttachment(body).subscribe((res)=> {
this.toastService._successMessage()
}, (error) => {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
-
- this.toastService._badRequest()
- }
+ this.httpErrorHanlde.httpStatusHandle(error)
},()=> {
loader.remove()
});
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index 0cb7f842f..9d00bd86d 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -12,6 +12,7 @@ import { PedidoService } from 'src/app/Rules/pedido.service';
import { PermissionService } from 'src/app/services/permission.service';
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { ForwardPage } from 'src/app/modals/forward/forward.page';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
@@ -37,6 +38,7 @@ export class RequestOptionsPage implements OnInit {
private toastService: ToastService,
public p: PermissionService,
private pedidoService: PedidoService,
+ private httpErrorHandle: HttpErrorHandle
) {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -88,13 +90,13 @@ export class RequestOptionsPage implements OnInit {
const loader = this.toastService.loading()
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
this.close();
loader.remove()
- }, ()=> {
+ }, (error)=> {
loader.remove()
- this.toastService._badRequest('Processo não encontrado')
+ this.httpErrorHandle.httpStatusHandle(error)
});
}
@@ -195,14 +197,9 @@ export class RequestOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Solicitar Reapreciaçã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()
@@ -270,14 +267,9 @@ export class RequestOptionsPage implements OnInit {
note
}).toPromise()
- this.toastService._successMessage('Processo arquivado')
+ this.httpErrorHandle.httpsSucessMessagge('Arquivar')
} 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 arquivado')
- }
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html
index 0c8a29b46..61664aa6e 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.html
+++ b/src/app/shared/publication/edit-action/edit-action.page.html
@@ -115,7 +115,7 @@
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index 3ca99ea16..6c0f76d61 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -22,7 +22,7 @@
-
+
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 19234a90a..029306cc8 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -95,7 +95,7 @@
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index ffee18231..3a41eb4b6 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -7,6 +7,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-publication-detail-shared',
@@ -30,6 +31,7 @@ export class PublicationDetailPage implements OnInit {
private toastService: ToastService,
public ThemeService: ThemeService,
public p:PermissionService,
+ private httpErrorHandle: HttpErrorHandle
) {
/* this.folderId = this.navParams.get('folderIdId'); */
@@ -89,14 +91,10 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
- this.toastService._successMessage("Publicação eliminado")
+ this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação')
this.goBackToViewPublications.emit();
} catch (error) {
- if(error.status == 0) {
- this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
- } else {
- this.toastService._badRequest("Publicação não eliminado")
- }
+ this.httpErrorHandle.httpStatusHandle(error)
} finally {
laoder.remove()
}
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index 4c7141eb3..758ca8335 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -11,6 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-action.page';
import { Storage } from '@ionic/storage';
import { PermissionService } from 'src/app/services/permission.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-view-publications',
@@ -44,6 +45,7 @@ export class ViewPublicationsPage implements OnInit {
private toastService: ToastService,
private storage: Storage,
public p:PermissionService,
+ private httpErrorHandle: HttpErrorHandle
) {
this.item = new PublicationFolder();
}
@@ -220,14 +222,9 @@ export class ViewPublicationsPage implements OnInit {
const loader = this.toastService.loading();
try {
await this.publications.DeletePresidentialAction(folderId).toPromise();
- this.toastService._successMessage()
+ this.httpErrorHandle.httpsSucessMessagge('Eliminar Acçã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()
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 38a854fa6..53f31b337 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt'
-export const environment: Environment = doneITProd;
\ No newline at end of file
+export const environment: Environment = oaprProd;
\ No newline at end of file
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index aaefbfe6d..10909d23b 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
-export const environment: Environment = doneITDev;
\ No newline at end of file
+export const environment: Environment = oaprDev;
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index 70195179d..51ccf2cb9 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "1487b4952",
- "SHA": "1487b49525ff98b4159b82dcc87bfaba736b9d99",
+ "shortSHA": "fcd198933",
+ "SHA": "fcd19893340c5359c9892506349adce885099066",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Mon Feb 27 09:34:36 2023 +0100'",
- "lastCommitMessage": "All changes i made",
- "lastCommitNumber": "4824",
+ "lastCommitTime": "'Mon Feb 27 09:45:31 2023 +0100'",
+ "lastCommitMessage": "Merge made with Peter changes",
+ "lastCommitNumber": "4831",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 6 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts\n\tmodified: src/app/store/presidential-actions-store.service.ts\n\tmodified: src/app/store/to-day-event-storage.service.ts\n\tmodified: src/environments/suport/doneIt.ts\n\tdeleted: src/plugin/src/connection/dbSwtich.d.ts\n\tdeleted: src/plugin/src/connection/dbSwtich.js\n\tdeleted: src/plugin/src/connection/indexedDb/connector.d.ts\n\tdeleted: src/plugin/src/connection/indexedDb/connector.js\n\tdeleted: src/plugin/src/connection/indexedDb/dynamicChange.d.ts\n\tdeleted: src/plugin/src/connection/indexedDb/dynamicChange.js\n\tdeleted: src/plugin/src/connection/indexedDb/indexedb.d.ts\n\tdeleted: src/plugin/src/connection/indexedDb/indexedb.js\n\tdeleted: src/plugin/src/connection/intreface.d.ts\n\tdeleted: src/plugin/src/connection/intreface.js\n\tdeleted: src/plugin/src/connection/worker.d.ts\n\tdeleted: src/plugin/src/connection/worker.js\n\tdeleted: src/plugin/src/connection/worker.queue.d.ts\n\tdeleted: src/plugin/src/connection/worker.queue.js\n\tdeleted: src/plugin/src/index.d.ts\n\tdeleted: src/plugin/src/index.js\n\tdeleted: src/plugin/src/models/field/allFields.d.ts\n\tdeleted: src/plugin/src/models/field/allFields.js\n\tdeleted: src/plugin/src/models/field/field.d.ts\n\tdeleted: src/plugin/src/models/field/field.js\n\tdeleted: src/plugin/src/models/field/fields.d.ts\n\tdeleted: src/plugin/src/models/field/fields.interface.d.ts\n\tdeleted: src/plugin/src/models/field/fields.interface.js\n\tdeleted: src/plugin/src/models/field/fields.js\n\tdeleted: src/plugin/src/models/field/interface.d.ts\n\tdeleted: src/plugin/src/models/field/interface.js\n\tdeleted: src/plugin/src/models/mode-migrations.d.ts\n\tdeleted: src/plugin/src/models/mode-migrations.js\n\tdeleted: src/plugin/src/models/model-from.d.ts\n\tdeleted: src/plugin/src/models/model-from.js\n\tdeleted: src/plugin/src/models/model-manager.d.ts\n\tdeleted: src/plugin/src/models/model-manager.js\n\tdeleted: src/plugin/src/models/model.d.ts\n\tdeleted: src/plugin/src/models/model.interface.d.ts\n\tdeleted: src/plugin/src/models/model.interface.js\n\tdeleted: src/plugin/src/models/model.js\n\tdeleted: src/plugin/src/models/model.reader.d.ts\n\tdeleted: src/plugin/src/models/model.reader.js\n\tdeleted: src/plugin/src/models/register-model.d.ts\n\tdeleted: src/plugin/src/models/register-model.js\n\tdeleted: src/plugin/src/sql/Operators/Object-condition-operator.d.ts\n\tdeleted: src/plugin/src/sql/Operators/Object-condition-operator.js\n\tdeleted: src/plugin/src/sql/Operators/args-attributes.d.ts\n\tdeleted: src/plugin/src/sql/Operators/args-attributes.js\n\tdeleted: src/plugin/src/sql/Operators/object-operator.d.ts\n\tdeleted: src/plugin/src/sql/Operators/object-operator.js\n\tdeleted: src/plugin/src/sql/Operators/operators.d.ts\n\tdeleted: src/plugin/src/sql/Operators/operators.js\n\tdeleted: src/plugin/src/sql/Operators/query-bulder.d.ts\n\tdeleted: src/plugin/src/sql/Operators/query-bulder.js\n\tdeleted: src/plugin/src/sql/methods/filter.d.ts\n\tdeleted: src/plugin/src/sql/methods/filter.js\n\tdeleted: src/plugin/src/sql/methods/methods.d.ts\n\tdeleted: src/plugin/src/sql/methods/methods.js\n\tdeleted: src/plugin/src/sql/query/interface.d.ts\n\tdeleted: src/plugin/src/sql/query/interface.js\n\tdeleted: src/plugin/src/sql/sqlObject/sql.d.ts\n\tdeleted: src/plugin/src/sql/sqlObject/sql.js\n\tdeleted: src/plugin/src/sql/sqlObject/sqlObject.d.ts\n\tdeleted: src/plugin/src/sql/sqlObject/sqlObject.js\n\tdeleted: src/plugin/src/utils.d.ts\n\tdeleted: src/plugin/src/utils.js",
+ "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file