This commit is contained in:
Eudes Inácio
2023-06-11 00:07:10 +01:00
4 changed files with 40 additions and 37 deletions
+1
View File
@@ -86,3 +86,4 @@ cypress/videos
src/app/domain src/app/domain
src/app/controller src/app/controller
src/app/models/beast-orm-pro.ts
+30 -30
View File
@@ -1,7 +1,7 @@
import { models } from 'beast-orm' import { models } from 'beast-orm'
/* import { models } from 'src/plugin/src' */ /* import { models } from 'src/plugin/src' */
import { environment } from 'src/environments/environment' 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 const { ArrayField, JsonField} = models.indexedDB.fields
export class MessageModel extends models.Model { export class MessageModel extends models.Model {
@@ -80,34 +80,34 @@ models.register({
// gabinete // gabinete
export class DispatchModal extends models.Model{ // export class DispatchModal extends models.Model{
SerialNumber = models.CharField() // SerialNumber = models.CharField()
TaskStartDate = models.CharField() // TaskStartDate = models.CharField()
Subject = models.CharField() // Subject = models.CharField()
Folio = models.CharField() // Folio = models.CharField()
Senders = models.CharField() // Senders = models.CharField()
CreateDate = models.CharField() // CreateDate = models.CharField()
DocumentsQty = models.IntegerField() // DocumentsQty = models.IntegerField()
WorkflowName = models.CharField() // WorkflowName = models.CharField()
activityInstanceName = models.CharField() // activityInstanceName = models.CharField()
Status = models.CharField() // Status = models.CharField()
Deadline = models.CharField() // Deadline = models.CharField()
TaskStatus = models.CharField() // TaskStatus = models.CharField()
TaskReceiveDate = models.CharField() // TaskReceiveDate = models.CharField()
// Busses logic // // Busses logic
arquivar = DispatchDomain.arquivar // arquivar = DispatchDomain.arquivar
executado = DispatchDomain.executado // executado = DispatchDomain.executado
reexecutar = DispatchDomain.reexecutar // reexecutar = DispatchDomain.reexecutar
sendToPending = DispatchDomain.sendToPending // sendToPending = DispatchDomain.sendToPending
requestAppear = DispatchDomain.requestAppear // requestAppear = DispatchDomain.requestAppear
createTaskDispatch = DispatchDomain.createTaskDispatch // createTaskDispatch = DispatchDomain.createTaskDispatch
setUpMeeting = DispatchDomain.setUpMeeting // setUpMeeting = DispatchDomain.setUpMeeting
} // }
models.register({ // models.register({
databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, // databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id,
type: 'indexedDB', // type: 'indexedDB',
version: 14, // version: 14,
models: [DispatchModal] // models: [DispatchModal]
}) // })
@@ -153,6 +153,7 @@ export class NotificationsService {
this.storageService.get("Notifications").then((store) => { this.storageService.get("Notifications").then((store) => {
console.log(notification)
store.push(notification) store.push(notification)
this.storageService.store("Notifications", store) this.storageService.store("Notifications", store)
}).catch((error) => { }).catch((error) => {
@@ -178,6 +179,7 @@ export class NotificationsService {
PushNotifications.addListener('pushNotificationActionPerformed', PushNotifications.addListener('pushNotificationActionPerformed',
(notification: ActionPerformed) => { (notification: ActionPerformed) => {
this.active = true this.active = true
console.log(notification)
/* this.DataArray.push(notification.notification) /* this.DataArray.push(notification.notification)
this.storageService.store("Notifications", this.DataArray) this.storageService.store("Notifications", this.DataArray)
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "9d4a50866", "shortSHA": "f51c51c00",
"SHA": "9d4a50866aa0129d2e8dfd4070ffe80620eb0218", "SHA": "f51c51c00535a2bf030861e0c293eff4326113c9",
"branch": "feature/gabinete-search", "branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'", "lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Sat Jun 10 17:06:45 2023 +0100'", "lastCommitTime": "'Sat Jun 10 21:16:58 2023 +0100'",
"lastCommitMessage": "Pull made", "lastCommitMessage": "pull made",
"lastCommitNumber": "4980", "lastCommitNumber": "4983",
"change": "", "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" "changeAuthor": "eudes.inacio"
} }