diff --git a/src/app/models/despacho.model.ts b/src/app/models/despacho.model.ts index 4fd87c0b6..50366f37f 100644 --- a/src/app/models/despacho.model.ts +++ b/src/app/models/despacho.model.ts @@ -5,6 +5,7 @@ export class Despacho{ DistributionType: string; CountryCode: string; Priority: string; + SubjectTypeId:string; UserEmail: string; UsersSelected: Participant[]; DispatchFolder: Folder; 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 859a0bbb5..9a5c970e9 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 @@ -32,6 +32,18 @@ +
+
+
+ +
+
+ + {{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 57cac3fbe..6d2b48927 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 @@ -34,6 +34,7 @@ export class ExpedientTaskModalPage implements OnInit { taskDescription: string; user: string; loadedAttachments:any; + subjectTypes:any; postData: Despacho; dispatchFolder: Folder; @@ -65,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit { this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ this.postData.Priority = '99999861'; + /* By Default TypeDeadline should be 'Economia' */ + this.postData.SubjectTypeId = '99999844'; /* Initialize 'Subject' with the title of the expedient */ this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio; } @@ -79,7 +82,9 @@ export class ExpedientTaskModalPage implements OnInit { console.log(this.task.serialNumber); this.getAttachments(); - + + console.log(this.getSubjectType()); + } close(){ @@ -89,6 +94,12 @@ export class ExpedientTaskModalPage implements OnInit { cancelTask(){ this.modalController.dismiss(null); } + getSubjectType(){ + this.processes.GetSubjectType().subscribe(res=>{ + console.log(res); + this.subjectTypes = res; + }); + } saveTask(){ console.log(this.taskType); @@ -100,6 +111,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, UsersSelected: this.participants, DispatchFolder: this.dispatchFolder, } @@ -113,6 +125,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, UsersSelected: this.participants, DispatchFolder: this.dispatchFolder, } @@ -124,6 +137,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, UsersSelected: this.participants, DispatchFolder: this.dispatchFolder, } @@ -201,6 +215,7 @@ export class ExpedientTaskModalPage implements OnInit { } async distartExpedientModal(){ + console.log(this.task.serialNumber); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0b2b68c98..dbc919389 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -92,7 +92,7 @@ export class ProcessesService { let options = { headers: this.headers, - params: params + params: params, }; return this.http.get(`${geturl}`, options); }