add models

src/app/models/beast-orm.ts

@@ -1,4 +1,5 @@
-import { models } from 'beast-orm'
+// import { models } from 'beast-orm'
+import {  models } from 'src/plugin/src'
 import { environment } from 'src/environments/environment'
 const { ArrayField, JsonField}  = models.indexedDB.fields
 
@@ -48,3 +49,36 @@ models.register({
 
 
 window['MessageModel'] = MessageModel
+
+
+
+
+
+export class ActionModel  extends models.Model{
+	ProcessId = models.IntegerField({unique: true})
+	Description = models.CharField()
+	Detail = models.CharField()
+	DateBegin = models.CharField()
+	DateEnd = models.CharField()
+	ActionType = models.CharField()
+}
+
+export class PublicationModel  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()
+}
+
+models.register({
+	databaseName: 'actions'+environment.version.lastCommitNumber + environment.id,
+	type: 'indexedDB',
+	version: 14,
+	models: [PublicationModel, ActionModel]
+})

src/app/models/publication.ts

@@ -2,7 +2,7 @@
 
 export class Publication{
     DateIndex: Date | string;
-    DocumentId:string;
+    DocumentId: number;
     ProcessId:string;
     Title: string;
     Message: string;

src/app/pages/events/events.page.ts

@@ -11,7 +11,7 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { momentG } from 'src/plugin/momentG';
-import { ThemeService } from 'src/app/services/theme.service'
+import { ThemeService } from 'src/app/services/theme.service';
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
@@ -130,8 +130,8 @@ export class EventsPage implements OnInit {
     if (event) {
       setTimeout(() => {
         try {
-  event?.target?.complete();
+        event?.target?.complete();
-} catch(error) {}
+      } catch(error) {}
       }, 2000);
     }
     this.RefreshEvents();

src/app/pages/publications/publication-detail/publication-detail.page.ts

@@ -37,7 +37,7 @@ export class PublicationDetailPage implements OnInit {
       /* this.folderId = this.navParams.get('folderIdId'); */
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',

src/app/pages/publications/publications.page.ts

@@ -16,6 +16,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
+import { ActionModel } from 'src/app/models/beast-orm';
 
 
 @Component({
@@ -147,6 +148,10 @@ export class PublicationsPage implements OnInit {
       this.showLoader = false;
       const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
       
+      let publications = await ActionModel.create(folders)
+
+      console.log('publications', publications)
+      
       this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
       this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
 

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts

@@ -46,7 +46,7 @@ export class PublicationDetailPage implements OnInit {
 
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -15,6 +15,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { Storage } from '@ionic/storage';
+import { PublicationModel } from 'src/app/models/beast-orm';
 
 @Component({
   selector: 'app-view-publications',
@@ -162,20 +163,24 @@ export class ViewPublicationsPage implements OnInit {
     const folderId = this.folderId
 
     try {
-      const res = await this.publications.GetPublicationsImages(folderId).toPromise();
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
-      let publicationList = []
   
-      for (let element of res) {
+      for (let publicationId of publicationIds) {
-        let ress = await this.publications.GetPublicationById(element).toPromise();
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
-        let item: Publication = this.publicationPipe.itemList(ress)
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
-        publicationList.push(item);
+       
+        const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
+
+        if(!found) {
+          PublicationModel.create(publicationDetails)
+          this.publicationList[folderId].push(publicationDetails)
+        }
       }
   
       this.showLoader = false;
       
-      this.publicationList[folderId] = publicationList
+      this.storage.set(folderId, this.publicationList[folderId]);
-      this.storage.set(folderId, publicationList);
+      this.getpublication = this.publicationList[folderId];
-      this.getpublication = publicationList;
     } catch(error) {
       this.showLoader = false;
     }

src/app/services/publications.service.ts

@@ -95,7 +95,7 @@ export class PublicationsService  {
     return this.http.delete<any>(`${geturl}`, options);
   }
 
-  GetPublicationsImages(folder:any) {
+  GetPublicationsList(folder:any) {
     const geturl = environment.apiURL + 'presidentialActions/'+ folder +'/posts/ids';
     let params = new HttpParams();
 
@@ -105,7 +105,7 @@ export class PublicationsService  {
       headers: this.headers,
       params: params
     };
-    return this.http.get<Publication[]>(`${geturl}`, options)
+    return this.http.get<number[]>(`${geturl}`, options)
 
   }
 

src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts

@@ -37,7 +37,7 @@ export class PublicationDetailPage implements OnInit {
       /* this.folderId = this.navParams.get('folderIdId'); */
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',

src/app/shared/publication/view-publications/view-publications.page.html

@@ -20,7 +20,7 @@
           </button >
          </div>
       </div>
-      <div class="div-body width-100">
+      <div class="div-body width-100" *ngIf="publicationItem[folderId].DateBegin">
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
         <p class="item-content-date">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -12,6 +12,7 @@ import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-acti
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { PublicationModel } from 'src/app/models/beast-orm';
 
 @Component({
   selector: 'app-view-publications',
@@ -116,20 +117,24 @@ export class ViewPublicationsPage implements OnInit {
     const folderId = this.folderId
 
     try {
-      const res = await this.publications.GetPublicationsImages(folderId).toPromise();
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
-      let publicationList = []
 
-      for (let element of res) {
+      for (let publicationId of publicationIds) {
-        let ress = await this.publications.GetPublicationById(element).toPromise();
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
-        let item: Publication = this.publicationPipe.itemList(ress)
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
-        publicationList.push(item);
+       
+        const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
+
+        if(!found) {
+          PublicationModel.create(publicationDetails)
+          this.publicationList[folderId].push(publicationDetails)
+        }
       }
   
       this.showLoader = false;
       
-      this.publicationList[folderId] = publicationList
+      this.storage.set(folderId, this.publicationList[folderId]);
-      this.storage.set(folderId, publicationList);
+      this.getpublication = this.publicationList[folderId];
-      this.getpublication = publicationList;
     } catch(error) {
       this.showLoader = false;
     }

src/environments/environment.ts

@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
 import { doneITDev } from './suport/doneIt'
 
 
-export const environment: Environment = oaprDev;
+export const environment: Environment = doneITDev;

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "9a1976f54",
+  "shortSHA": "7e5039b4f",
-  "SHA": "9a1976f54373e5ed0686998c46bcc00e427d1b88",
+  "SHA": "7e5039b4fac3a44e5a039acd69dcba79b2a984b0",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 27 20:17:47 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 27 21:24:34 2023 +0100'",
-  "lastCommitMessage": "fix",
+  "lastCommitMessage": "fix slow publication",
-  "lastCommitNumber": "4844",
+  "lastCommitNumber": "4845",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/models/publication.ts\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/services/publications.service.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified:   src/environments/environment.ts",
   "changeAuthor": "peter.maquiran"
 }