From 7eac0a7680f176287d200eb0d3ee0c7a80a32380 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 17:49:13 +0100 Subject: [PATCH 1/2] fix --- src/app/models/beast-orm.ts | 33 +++++++++++++------ .../gabinete-digital/gabinete-digital.page.ts | 5 --- .../despachos-options.page.ts | 4 +-- version/git-version.ts | 12 +++---- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 911be6322..421c75754 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -1,6 +1,7 @@ import { models } from 'beast-orm' /* import { models } from 'src/plugin/src' */ import { environment } from 'src/environments/environment' +import { DispatchDomain } from 'src/app/domain/process/DispatchDomain' const { ArrayField, JsonField} = models.indexedDB.fields export class MessageModel extends models.Model { @@ -80,16 +81,28 @@ models.register({ // gabinete export class DispatchModal extends models.Model{ - DateIndex = models.CharField() - DocumentId = models.IntegerField({unique: true}) - ProcessId = models.CharField() - Title = models.CharField() - Message = models.CharField() - DatePublication = models.CharField() - OriginalFileName = models.CharField() - FileBase64 = models.CharField() - FileExtension = models.CharField() - OrganicEntityId = models.IntegerField() + SerialNumber = models.CharField() + TaskStartDate = models.CharField() + Subject = models.CharField() + Folio = models.CharField() + Senders = models.CharField() + CreateDate = models.CharField() + DocumentsQty = models.IntegerField() + WorkflowName = models.CharField() + activityInstanceName = models.CharField() + Status = models.CharField() + Deadline = models.CharField() + TaskStatus = models.CharField() + TaskReceiveDate = models.CharField() + + // Busses logic + arquivar = DispatchDomain.arquivar + executado = DispatchDomain.executado + reexecutar = DispatchDomain.reexecutar + sendToPending = DispatchDomain.sendToPending + requestAppear = DispatchDomain.requestAppear + createTaskDispatch = DispatchDomain.createTaskDispatch + setUpMeeting = DispatchDomain.setUpMeeting } models.register({ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index dda119482..e7a7b6d59 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -264,11 +264,6 @@ export class GabineteDigitalPage implements OnInit { this.checkRoutes() this.hideRefreshButton(); - - // console.log(' this.scroll', this.scroll) - // this.scroll.nativeElement.addEventListener("scroll", ()=> { - // console.log('123') - // }); } diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 1050a11df..bf3ec8e1d 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -84,7 +84,7 @@ export class DespachosOptionsPage implements OnInit { }); } - async distartExpedientModal(){ + async distartExpedientModal() { const modal = await this.modalController.create({ @@ -276,7 +276,7 @@ export class DespachosOptionsPage implements OnInit { } - async executado(note:string, documents:any){ + async executado(note:string, documents:any) { let body = { "serialNumber": this.serialNumber, "action": "Conhecimento", diff --git a/version/git-version.ts b/version/git-version.ts index 6ce028b03..9821e969d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ffa1f34b4", - "SHA": "ffa1f34b4c00e60a4a5ea48fc82fd5822e264773", + "shortSHA": "32dfa1251", + "SHA": "32dfa1251776a77a42af72cd6efc1d90bd813f32", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 15:58:45 2023 +0100'", - "lastCommitMessage": "labels", - "lastCommitNumber": "4964", + "lastCommitTime": "'Sat Jun 10 16:44:19 2023 +0100'", + "lastCommitMessage": "fixe go back", + "lastCommitNumber": "4965", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts", + "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/gabinete-digital.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 8c34d2d7cf245c39cca00837e1bb5cd907d26f9b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 20:17:51 +0100 Subject: [PATCH 2/2] remove error --- .../despachos-options/despachos-options.page.html | 2 +- .../despachos-options/despachos-options.page.ts | 2 +- version/git-version.ts | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html index 0160c7ab8..43eb6c605 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.html +++ b/src/app/shared/popover/despachos-options/despachos-options.page.html @@ -1,5 +1,5 @@ -
+