diff --git a/.gitignore b/.gitignore index 13ac95725..79d1ea2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,5 @@ cypress/videos *.rar src/app/domain -src/app/controller \ No newline at end of file +src/app/controller +src/app/models/beast-orm-pro.ts \ No newline at end of file diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 421c75754..ae03945ea 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -1,7 +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' +// import { DispatchDomain } from 'src/app/domain/process/DispatchDomain' const { ArrayField, JsonField} = models.indexedDB.fields export class MessageModel extends models.Model { @@ -80,34 +80,34 @@ models.register({ // gabinete -export class DispatchModal extends models.Model{ - 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() +// export class DispatchModal extends models.Model{ +// 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 -} +// // 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({ - databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, - type: 'indexedDB', - version: 14, - models: [DispatchModal] -}) +// models.register({ +// databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, +// type: 'indexedDB', +// version: 14, +// models: [DispatchModal] +// }) diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index cbeca82ec..c7991737e 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -153,6 +153,7 @@ export class NotificationsService { this.storageService.get("Notifications").then((store) => { + console.log(notification) store.push(notification) this.storageService.store("Notifications", store) }).catch((error) => { @@ -178,6 +179,7 @@ export class NotificationsService { PushNotifications.addListener('pushNotificationActionPerformed', (notification: ActionPerformed) => { this.active = true + console.log(notification) /* this.DataArray.push(notification.notification) this.storageService.store("Notifications", this.DataArray) diff --git a/version/git-version.ts b/version/git-version.ts index 101c0f1c6..f89a9533b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9d4a50866", - "SHA": "9d4a50866aa0129d2e8dfd4070ffe80620eb0218", + "shortSHA": "f51c51c00", + "SHA": "f51c51c00535a2bf030861e0c293eff4326113c9", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Sat Jun 10 17:06:45 2023 +0100'", - "lastCommitMessage": "Pull made", - "lastCommitNumber": "4980", + "lastCommitTime": "'Sat Jun 10 21:16:58 2023 +0100'", + "lastCommitMessage": "pull made", + "lastCommitNumber": "4983", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 15 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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.html\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 16 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/services/notifications.service.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file