From 27fd1d8765a87f2c043934044e9259f9bc59a283 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 18 Apr 2023 14:38:32 +0100 Subject: [PATCH] fix --- src/app/modals/create-process/create-process.page.ts | 6 ++++++ .../despachos-pr/despacho-pr/despacho-pr.page.ts | 7 +++++-- .../gabinete-digital/diplomas/diplomas.page.html | 2 -- version/git-version.ts | 12 ++++++------ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 390feffbe..75525d97e 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -283,6 +283,7 @@ export class CreateProcessPage implements OnInit { this.dispatchFolder.SubjectTypes = this.selectedTypes; const loader = this.toastService.loading() + console.log(this.fulltask, 'fulltask') if (this.fulltask.activityInstanceName == "Assinar Diploma") { this.postData = { @@ -307,6 +308,7 @@ export class CreateProcessPage implements OnInit { } } else { + console.log('1') if (this.loggeduser.Profile != 'PR') { switch (this.taskType) { case '0': // Despacho @@ -394,6 +396,7 @@ export class CreateProcessPage implements OnInit { } else if (this.loggeduser.Profile == 'PR') { switch (this.taskType) { case '0': // Despacho PR + console.log('12') this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -424,6 +427,8 @@ export class CreateProcessPage implements OnInit { loader.remove(); break; case '1': // Pedido de Parecer + + console.log('13') this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -455,6 +460,7 @@ export class CreateProcessPage implements OnInit { break; case '2': // Pedido de Deferimento + console.log('123') this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index a1dedcee5..7ded154ef 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -130,8 +130,9 @@ export class DespachoPrPage implements OnInit { "TaskStartDate": res.taskStartDate } this.fulltask = res; + this.updateProcessOnDB(res); - + console.log('this.fulltask', this.fulltask) let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]); @@ -416,13 +417,15 @@ export class DespachoPrPage implements OnInit { } else { classs = 'modal modal-desktop showAsideOptions' } + + // console.log('this.fulltask send', this.fulltask) const modal = await this.modalController.create({ component: CreateProcessPage, componentProps: { taskAction: taskAction, task: task, profile: this.profile, - fulltak: this.fulltask + fulltask: this.fulltask }, cssClass: classs, }); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 955719629..bb6ffa725 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -65,7 +65,6 @@
- {{ task.taskStatus || task.TaskStatus }} {{ task.Folio }}
@@ -103,7 +102,6 @@
- {{ task.taskStatus || task.TaskStatus }} {{ task.Folio }}
diff --git a/version/git-version.ts b/version/git-version.ts index 551a56fb4..afc17b8bc 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a87f46196", - "SHA": "a87f4619639be1cbd650c1744a828a3854e5d5e3", + "shortSHA": "45a401430", + "SHA": "45a4014307bb15795eb55a4b84de2f9e9c84f5ed", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Apr 18 09:37:41 2023 +0100'", - "lastCommitMessage": "fix gabinete labels", - "lastCommitNumber": "4917", + "lastCommitTime": "'Tue Apr 18 11:51:56 2023 +0100'", + "lastCommitMessage": "fix variables", + "lastCommitNumber": "4918", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file