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 ca879bbf0..b63ddec75 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -19,6 +19,7 @@ import { SearchPage } from 'src/app/pages/search/search.page';
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 { User } from 'src/app/models/user.model';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-create-process',
@@ -72,6 +73,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;
@@ -91,11 +93,12 @@ export class CreateProcessPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
DeadlineType: '',
- SubjectTypes: ['99999844'],
+ SubjectTypes: ['99999850'],
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
-
+ //Initialize SubjectTypes Array with the value "Indefinido"
+ this.selectedTypes = ['99999850'];
this.postData.DispatchFolder = this.dispatchFolder;
this.postData.UsersSelected = this.participants;
/* By Default TypeDeadline should be 'Normal' */
@@ -110,8 +113,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(){
@@ -176,10 +196,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;
@@ -196,10 +217,12 @@ export class CreateProcessPage implements OnInit {
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;
@@ -215,19 +238,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;
@@ -246,10 +269,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;
@@ -266,10 +290,12 @@ export class CreateProcessPage implements OnInit {
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;
@@ -285,22 +311,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,19 +337,11 @@ export class CreateProcessPage implements OnInit {
},
"AttachmentList" :null,
- }
- try {
- await this.processes.CompleteTask(body).toPromise()
- this.successMessage()
- } catch (error) {
- this.badRequest()
- }
-
-
+ }
+ 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/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..a2a422460 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
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
- "ReviewerUseComment": res.data,
+ "ReviewUseComment": 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..c4af50dbb 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,
+ "ReviewUseComment": 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..e86b448c3 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,8 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskType = this.navParams.get('taskAction');
+ this.selectedTypes = ['99999850'];
+
this.postData = new Despacho();
this.participants = this.participants = new Array();
this.dispatchFolder = {
@@ -98,7 +101,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
DeadlineType: '',
- SubjectTypes: ['99999844'],
+ SubjectTypes: ['99999850'],
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -126,6 +129,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);
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..d05fbc58d 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,
+ "ReviewUseComment": res.data,
}
}
console.log(body);