From bc53c4f0199184957fef3d968d7a72a16f221550 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 11 Jun 2023 08:22:02 +0100 Subject: [PATCH 1/2] remove name --- .gitignore | 6 +++++- .../popover/opts-expediente/opts-expediente.page.ts | 4 ++-- version/git-version.ts | 12 ++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 79d1ea2e5..1cab0dc50 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,8 @@ cypress/videos src/app/domain src/app/controller -src/app/models/beast-orm-pro.ts \ No newline at end of file +src/app/models/beast-orm-pro.ts + + +src/app/pipes/process.service.spec.ts +src/app/pipes/process.service.ts \ No newline at end of file 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 7f51b582c..27172e68e 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -63,7 +63,7 @@ export class OptsExpedientePage implements OnInit { } - async openNewGroupPage(){ + async openNewGroupPage() { const modal = await this.modalController.create({ @@ -225,7 +225,7 @@ export class OptsExpedientePage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.TaskService.loadExpedientes() this.goBack(); - },(error)=>{ + },(error) => { if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { diff --git a/version/git-version.ts b/version/git-version.ts index 8e1ff7987..9a0b5f9e6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0ec1341cd", - "SHA": "0ec1341cd6f01ace6e3332c609278d4faee2f440", + "shortSHA": "1af0b1f3f", + "SHA": "1af0b1f3f4a4a04a027130454b9792b7d088b250", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 21:18:46 2023 +0100'", - "lastCommitMessage": "commit", - "lastCommitNumber": "4969", + "lastCommitTime": "'Sat Jun 10 22:57:03 2023 +0100'", + "lastCommitMessage": "improve update list", + "lastCommitNumber": "4970", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 223eae1a835c1b1d890c78f7c8c876acf3082b57 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 11 Jun 2023 10:02:51 +0100 Subject: [PATCH 2/2] add to igingore --- .gitignore | 3 ++- src/app/models/dailyworktask.model.ts | 1 + version/git-version.ts | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1cab0dc50..2e8147eaf 100644 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,5 @@ src/app/models/beast-orm-pro.ts src/app/pipes/process.service.spec.ts -src/app/pipes/process.service.ts \ No newline at end of file +src/app/pipes/process.service.ts +src/app/controller/process/dispatch-controller \ No newline at end of file diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 0760b364b..21c00621a 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -96,6 +96,7 @@ export interface fullTaskList { totalDocuments: number; deadline: string; taskStatus: string; + taskReceiveDate?: string; workflowInstanceDataFields: { Subject: string; Sender: string; diff --git a/version/git-version.ts b/version/git-version.ts index 9a0b5f9e6..d4640dcbe 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1af0b1f3f", - "SHA": "1af0b1f3f4a4a04a027130454b9792b7d088b250", + "shortSHA": "bc53c4f01", + "SHA": "bc53c4f0199184957fef3d968d7a72a16f221550", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 22:57:03 2023 +0100'", - "lastCommitMessage": "improve update list", - "lastCommitNumber": "4970", + "lastCommitTime": "'Sun Jun 11 08:22:02 2023 +0100'", + "lastCommitMessage": "remove name", + "lastCommitNumber": "4971", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/dailyworktask.model.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file