diff --git a/src/app/models/beast-orm-function.ts b/src/app/models/beast-orm-function.ts index 273ce2628..1d4aadcf1 100644 --- a/src/app/models/beast-orm-function.ts +++ b/src/app/models/beast-orm-function.ts @@ -26,7 +26,10 @@ export function GET({key, localStorage, instance}) { } } else { - return JSON.parse(localStorage.getItem(prefix() + key)) + const restoredData = JSON.parse(localStorage.getItem(prefix() + key)) + Object.assign(instance, restoredData); + + return restoredData } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index fe2ba54e0..65f5946e2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -1,8 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { EventsService } from 'src/app/services/events.service'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ActivatedRoute, Router } from '@angular/router'; import { Event } from '../../../../models/event.model'; import { ModalController, PopoverController } from '@ionic/angular'; @@ -23,9 +21,6 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' import { EventTrigger } from 'src/app/services/eventTrigger.service'; - - -import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from 'src/app/services/background.service'; import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts index aaadf91b0..c8e70f673 100644 --- a/src/app/pipes/custom-task.pipe.ts +++ b/src/app/pipes/custom-task.pipe.ts @@ -10,7 +10,7 @@ export class CustomTaskPipe implements PipeTransform { let date = new Date(fullTask.taskStartDate); let month = date.getMonth() + 1; - let taskDate = date.getFullYear() + "-" + month +"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + let taskDate = date.getFullYear() + "-" + month +"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); return { "SerialNumber": fullTask.serialNumber, diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 7bb8dab5c..a192c1f61 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -44,7 +44,6 @@ export class ProcessesService { setHeader() { - // console.log('CPSession.AuthorizationJwt', CPSession.AuthorizationJwt); this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/src/app/store/documentManagement.ts b/src/app/store/documentManagement.ts index 2db3d75a5..4d06a2990 100644 --- a/src/app/store/documentManagement.ts +++ b/src/app/store/documentManagement.ts @@ -1,6 +1,6 @@ -import { models } from 'src/plugin/src' +import { models } from 'src/plugin/src'; import { DELETE, GET, SAVE } from '../models/beast-orm-function'; -const { rewriteSave, rewriteGet, rewriteDelete } = models.core.localStorage.rewrite +const { rewriteSave, rewriteGet, rewriteDelete } = models.core.localStorage.rewrite; export class CPSession extends models.LocalStorage { static UserId: number = models.preset() @@ -23,9 +23,9 @@ models.migrate({ version: 1, models: [CPSession], }) - - +// rewrite rewriteGet.connect(GET, [CPSession]) rewriteSave.connect(SAVE, [CPSession]) rewriteDelete.connect(DELETE, [CPSession]) +// get function CPSession.get() \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 00c49bd7c..882f5b754 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c6c0f84b4", - "SHA": "c6c0f84b4eaade8221dadbfe60e18a7554ed8564", + "shortSHA": "8a374730d", + "SHA": "8a374730d336317e941df3ebdeaee8823f16e616", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jul 10 12:40:11 2023 +0100'", - "lastCommitMessage": "change", - "lastCommitNumber": "5043", - "change": "diff --git a/src/app/store/documentManagement.ts b/src/app/store/documentManagement.ts\nindex 2db3d75a5..741b07082 100644\n--- a/src/app/store/documentManagement.ts\n+++ b/src/app/store/documentManagement.ts\n@@ -23,9 +23,9 @@ models.migrate({\n \tversion: 1,\n \tmodels: [CPSession],\n })\n-\n-\n+// rewrite\n rewriteGet.connect(GET, [CPSession])\n rewriteSave.connect(SAVE, [CPSession])\n rewriteDelete.connect(DELETE, [CPSession])\n+// get function\n CPSession.get()\n\\ No newline at end of file", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm-function.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/store/documentManagement.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/store/documentManagement.ts", + "lastCommitTime": "'Mon Jul 10 14:12:56 2023 +0100'", + "lastCommitMessage": "fix decrypt and encript", + "lastCommitNumber": "5044", + "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-function.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/store/documentManagement.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file