diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 8a11e6799..4b8f33e43 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -43,9 +43,15 @@
-
+
+ Tipo de assunto
+
{{type.Description}}
+
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index be914e1cb..2be19b4eb 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -20,6 +20,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { User } from 'src/app/models/user.model';
import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-create-process',
@@ -73,6 +74,7 @@ export class CreateProcessPage implements OnInit {
private authService: AuthService,
private userAuth: AuthService,
private animationController: AnimationController,
+ private toastService: ToastService,
) {
this.loggeduser = userAuth.ValidatedUser;
this.user = environment.defaultuser +'@'+ environment.domain;
@@ -84,6 +86,9 @@ export class CreateProcessPage implements OnInit {
this.postData = new Despacho();
this.participants = this.participants = new Array();
+ //Initialize SubjectTypes Array with the value "Indefinido"
+ this.selectedTypes = ['99999850'];
+
this.dispatchFolder = {
Nad: 30,
Subject: '',
@@ -92,7 +97,7 @@ export class CreateProcessPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
DeadlineType: '',
- SubjectTypes: ['99999844'],
+ SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -111,8 +116,25 @@ export class CreateProcessPage implements OnInit {
}
ngOnInit() {
+ console.log(this.postData.DispatchFolder.SubjectTypes);
this.taskDate = new Date(this.task.taskStartDate);
this.getSubjectType();
+
+ if(this.selectedTypes.length > 1){
+ console.log('Yes');
+
+ }
+ }
+
+ onSelectedTypesChanged(ev:any){
+ console.log(ev);
+ if(ev.length > 1){
+ console.log(ev.filter(data => data != '99999850'));
+ this.selectedTypes = ev.filter(data => data != '99999850');
+ }
+ if(ev.length == 0){
+ this.selectedTypes = ["99999850"];
+ }
}
close(){
@@ -177,10 +199,11 @@ export class CreateProcessPage implements OnInit {
console.log('this.postData', this.postData, this.taskType);
try {
- await this.processes.postDespatcho(this.postData).toPromise()
- //this.successMessage('')
+ await this.processes.postDespatcho(this.postData).toPromise();
+ this.FinalizarDespacho();
+ this.toastService.badRequest('Despacho criado');
} catch (error) {
- this.badRequest()
+ this.toastService.badRequest('Processo não efectuado');
}
break;
@@ -194,13 +217,14 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
- await this.processes.postParecer(this.postData).toPromise()
try {
- await this.processes.postParecer(this.postData).toPromise()
- // this.successMessage()
- } catch (error) {
- this.badRequest()
+ await this.processes.postParecer(this.postData).toPromise();
+ this.FinalizarParecer();
+ this.toastService.successMessage('Pedido de Parecer criado');
+ }
+ catch (error) {
+ this.toastService.badRequest('Processo não efectuado');
}
break;
@@ -216,19 +240,19 @@ export class CreateProcessPage implements OnInit {
console.log(this.postData);
try {
- await this.processes.postDeferimento(this.postData).toPromise()
- // this.successMessage()
- } catch (error) {
- this.badRequest()
+ await this.processes.postDeferimento(this.postData).toPromise();
+ this.executado();
+ this.toastService.successMessage('Pedido de Deferimento criado');
+ }
+ catch (error) {
+ this.toastService.badRequest('Processo não efectuado');
}
-
break;
}
- this.executado();
this.modalController.dismiss();
}
else {
- this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
+ this.toastService.badRequest('Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.');
}
break;
@@ -247,10 +271,11 @@ export class CreateProcessPage implements OnInit {
console.log('this.postData', this.postData, this.taskType);
try {
- await this.processes.postDespatcho(this.postData).toPromise()
- // this.successMessage()
+ await this.processes.postDespatcho(this.postData).toPromise();
+ this.executado();
+ this.toastService.successMessage('Despacho criado');
} catch (error) {
- this.badRequest()
+ this.toastService.badRequest('Processo não efectuado');
}
break;
@@ -264,13 +289,14 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
- await this.processes.postParecer(this.postData).toPromise()
try {
- await this.processes.postParecer(this.postData).toPromise()
- // this.successMessage()
- } catch (error) {
- this.badRequest()
+ await this.processes.postParecer(this.postData).toPromise();
+ this.executado();
+ this.toastService.successMessage('Pedido de Parecer criado');
+ }
+ catch (error) {
+ this.toastService.badRequest('Processo não efectuado');
}
break;
@@ -286,22 +312,22 @@ export class CreateProcessPage implements OnInit {
console.log(this.postData);
try {
- await this.processes.postDeferimento(this.postData).toPromise()
- // this.successMessage()
- } catch (error) {
- this.badRequest()
+ await this.processes.postDeferimento(this.postData).toPromise();
+ this.executado();
+ this.toastService.successMessage('Pedido de Deferimento criado');
+ }
+ catch (error) {
+ this.toastService.badRequest('Processo não efectuado');
}
break;
}
- this.executado();
this.modalController.dismiss();
break;
}
-
-
}
+
async executado() {
let body = {
"serialNumber": this.task.serialNumber,
@@ -311,20 +337,37 @@ export class CreateProcessPage implements OnInit {
"ReviewUserComment": '',
},
"AttachmentList" :null,
+ }
+ await this.processes.CompleteTask(body).toPromise();
+ }
- }
- try {
- await this.processes.CompleteTask(body).toPromise()
- this.successMessage()
- } catch (error) {
- this.badRequest()
- }
-
+ async FinalizarDespacho() {
+ let body = {
+ "serialNumber": this.task.serialNumber,
+ "action": "Despacho",
+ "ActionTypeId": 94,
+ "dataFields": {
+ "ReviewUserComment": '',
+ },
+ "AttachmentList" :null,
+ }
+ await this.processes.CompleteTask(body).toPromise();
+ }
+ async FinalizarParecer() {
+ let body = {
+ "serialNumber": this.task.serialNumber,
+ "action": "Parecer",
+ "ActionTypeId": 92,
+ "dataFields": {
+ "ReviewUserComment": '',
+ },
+ "AttachmentList" :null,
+ }
+ await this.processes.CompleteTask(body).toPromise();
}
async addParticipants() {
- /* console.log('HERES'); */
this.adding = "intervenient";
this.contacts = this.taskParticipants;
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 229d22fdb..58bf4807c 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -219,87 +219,9 @@ export class ViewEventPage implements OnInit {
});
}
- // async openBookMeetingModal() {
-
- // const doc = this.loadedAttachments[ this.dicIndex];
-
- // let task = {
- // serialNumber: doc.SourceId,
- // taskStartDate: doc.CreateDate,
- // isEvent: true,
- // workflowInstanceDataFields: {
- // FsId: doc.ApplicationId,
- // FolderID: null,
- // DocId: doc.SourceId,
- // Subject: doc.SourceName
- // },
- // }
-
- // let classs;
- // if( window.innerWidth <= 800){
- // classs = 'book-meeting-modal modal modal-desktop'
- // } else {
- // classs = 'modal modal-desktop showAsideOptions'
- // }
- // const modal = await this.modalController.create({
- // component: BookMeetingModalPage,
- // componentProps: {
- // task: task,
- // },
- // cssClass: classs,
- // backdropDismiss: false
- // });
- // await modal.present();
- // modal.onDidDismiss();
- // }
-
- // async openExpedientActionsModal(taskAction: any) {
- // //this.modalController.dismiss();
- // let classs;
- // if( window.innerWidth <= 800){
- // classs = 'modal modal-desktop'
- // } else {
- // classs = 'modal modal-desktop showAsideOptions'
- // }
-
- // const doc = this.loadedAttachments[ this.dicIndex];
-
- // let task = {
- // serialNumber: doc.SourceId,
- // taskStartDate: doc.CreateDate,
- // isEvent: true,
- // workflowInstanceDataFields: {
- // FsId: doc.ApplicationId,
- // FolderID: null,
- // DocId: doc.SourceId,
- // Subject: doc.SourceName
- // },
- // }
-
- // const modal = await this.modalController.create({
- // component: ExpedientTaskModalPage,
- // componentProps: {
- // taskAction: taskAction,
- // task: task,
- // profile: this.profile,
- // },
- // cssClass: classs,
- // });
- // await modal.present();
- // modal.onDidDismiss().then(res=>{
- // console.log(res['data']);
- // if(res['data']=='openDiscart'){
- // console.log('open discart');
- // // this.distartExpedientModal();
- // }
-
- // });
- // }
-
-
async openTaskOptions() {
- const doc = this.loadedAttachments[ this.dicIndex];
+ const doc = this.loadedAttachments[this.dicIndex];
let customTask = {
serialNumber: doc.SourceId,
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 49ae7cc44..998d67550 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -220,7 +220,7 @@ export class DespachoPage implements OnInit {
}
- async reexecute(note:string, documents:any) {
+ async reencaminhar(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
@@ -230,6 +230,25 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.successMessage()
+ this.close();
+ } catch (error) {
+ this.badRequest()
+ }
+ }
+
+ async reexecute(note:string, documents:any) {
+ let body = {
+ "serialNumber": this.serialnumber,
+ "action": "Reexecução",
+ "ActionTypeId": 100000010,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList" :documents,
+ }
try {
await this.processes.CompleteTask(body).toPromise()
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 805251e85..49c8d84c6 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 { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-approve-event-modal',
@@ -41,6 +42,7 @@ export class ApproveEventModalPage implements OnInit {
private activatedRoute: ActivatedRoute,
private iab: InAppBrowser,
private animationController: AnimationController,
+ private toastService: ToastService,
) {
@@ -129,13 +131,11 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
- this.successMessage('Evento rejeitado', () =>{
+ this.toastService.successMessage('Evento rejeitado', () =>{
this.router.navigate(['/home/gabinete-digital/event-list']);
})
-
-
} catch (error) {
- this.badRequest('Evento não rejeitado')
+ this.toastService.badRequest('Evento não rejeitado')
}
this.modalController.dismiss(null);
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
- "ReviewerUseComment": res.data,
+ "ReviewUserComment": res.data,
}
}
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 981b159d6..10dcecb64 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
@@ -189,7 +189,7 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
- "ReviewerUseComment": res.data,
+ "ReviewUserComment": res.data,
}
}
console.log(body);
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 0fb9d0476..048c8da40 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -43,9 +43,12 @@
-
- Tipos de assunto
-
+
+ Tipo de assunto
+
{{type.Description}}
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 10021e2db..ec60e0b5a 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
@@ -20,6 +20,7 @@ import { EventAttachment } from 'src/app/models/attachment.model';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-expedient-task-modal',
@@ -76,11 +77,11 @@ export class ExpedientTaskModalPage implements OnInit {
private alertController: AlertService,
private authService: AuthService,
private userAuth: AuthService,
- private animationController: AnimationController) {
-
+ private animationController: AnimationController,
+ private toastService: ToastService,
+ ) {
this.loggeduser = userAuth.ValidatedUser;
-
this.user = environment.defaultuser +'@'+ environment.domain;
this.task = this.navParams.get('task');
@@ -88,6 +89,9 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskType = this.navParams.get('taskAction');
+ //Initialize SubjectTypes Array with the value "Indefinido"
+ this.selectedTypes = ['99999850'];
+
this.postData = new Despacho();
this.participants = this.participants = new Array();
this.dispatchFolder = {
@@ -98,7 +102,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
DeadlineType: '',
- SubjectTypes: ['99999844'],
+ SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -126,6 +130,17 @@ export class ExpedientTaskModalPage implements OnInit {
this.getSubjectType();
}
+ onSelectedTypesChanged(ev:any){
+ console.log(ev);
+ if(ev.length > 1){
+ console.log(ev.filter(data => data != '99999850'));
+ this.selectedTypes = ev.filter(data => data != '99999850');
+ }
+ if(ev.length == 0){
+ this.selectedTypes = ["99999850"];
+ }
+ }
+
close(){
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);
@@ -191,7 +206,6 @@ export class ExpedientTaskModalPage implements OnInit {
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
- //SubjectTypes: [],
}
try {
let action_despacho = {
@@ -205,11 +219,12 @@ export class ExpedientTaskModalPage implements OnInit {
console.log(this.postData);
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
- this.modalController.dismiss(action_despacho);
- //await this.successMessage('Processo efetuado');
+ await this.toastService.successMessage('Processo efetuado', () =>{
+ this.modalController.dismiss(action_despacho);
+ });
} catch (error) {
- await this.badRequest('Processo não efetuado')
+ await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -235,10 +250,11 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postParecer(this.postData).toPromise();
- this.modalController.dismiss(action_parecer);
- //await this.successMessage('Processo efetuado')
+ await this.toastService.successMessage('Processo efetuado', () =>{
+ this.modalController.dismiss(action_parecer);
+ });
} catch (error) {
- await this.badRequest('Processo não efetuado')
+ await this.toastService.badRequest('Processo não efetuado')
}
break;
case '2':
@@ -262,10 +278,11 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
- this.modalController.dismiss(action_deferimento);
- //await this.successMessage('Processo efetuado')
+ await this.toastService.successMessage('Processo efetuado', () =>{
+ this.modalController.dismiss(action_deferimento);
+ });
} catch (error) {
- await this.badRequest('Processo não efetuado')
+ await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -299,10 +316,12 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
- this.modalController.dismiss(action_despacho_pr);
- //await this.successMessage('Processo efetuado')
+
+ await this.toastService.successMessage('Processo efetuado', () =>{
+ this.modalController.dismiss(action_despacho_pr);
+ });
} catch (error) {
- await this.badRequest('Processo não efetuado')
+ await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -328,10 +347,12 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
- this.modalController.dismiss(action_parecer_pr);
- //await this.successMessage('Processo efetuado')
+
+ await this.toastService.badRequest('Processo efetuado', () =>{
+ this.modalController.dismiss(action_parecer_pr);
+ })
} catch (error) {
- await this.badRequest('Processo não efetuado')
+ await this.toastService.badRequest('Processo não efetuado')
}
break;
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
index d05e043cd..e015a7eb4 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
@@ -34,7 +34,6 @@
//DIV
ion-item{
- border: 1px solid blue;
margin: 0 !important;
padding: 0 !important;
--background: none;
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 321717fb4..9926f8951 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -180,7 +180,7 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
- "ReviewerUseComment": res.data,
+ "ReviewUserComment": res.data,
}
}
console.log(body);
diff --git a/src/global.scss b/src/global.scss
index 37ea09951..adb2c8b8a 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -632,7 +632,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
// center
app-approve-event ion-content .main-content,
-app-view-event ion-content .main-content{
+app-view-event ion-content .main-content,
+app-expediente-pr .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}