From 57b4f0880084a1ab1005660d19cb603fa7b279ad Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 10 Mar 2023 15:10:37 +0100
Subject: [PATCH 1/2] improve publication

---
 .../view-publications/view-publications.page.html    |  4 ++--
 .../view-publications/view-publications.page.ts      |  3 +--
 .../view-publications/view-publications.page.html    |  4 ++--
 .../view-publications/view-publications.page.ts      |  2 --
 version/git-version.ts                               | 12 ++++++------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index eab5ca99e..623bb0ea2 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -7,10 +7,10 @@
         <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </div>
-      <div *ngIf="publicationItem[folderId]" class="div-title flex-grow-1">
+      <div *ngIf="publicationItem[folderId]?.DateBegin != null" class="div-title flex-grow-1">
         <ion-label class="title">{{publicationItem[folderId].Description}}</ion-label>
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
-        <p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
+        <p class="item-content-date" >{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
       <div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationItem[folderId]" class="actions-icon cursor-pointer" (click)="AddPublication('2',publicationItem[folderId].ProcessId)">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 7c5715daf..117b59617 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -133,10 +133,9 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   getPublicationDetail() {
-    this.showLoader = true;
     const folderId = this.folderId
     this.publications.GetPresidentialAction(folderId).subscribe(res =>{ 
-      this.showLoader = false;
+      
       this.publicationItem[folderId] = res
       this.storage.set(folderId+"name", res)
     }, (error) => {
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 9c677e644..45b94bf0e 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -20,9 +20,9 @@
           </button >
          </div>
       </div>
-      <div class="div-body width-100" *ngIf="publicationItem[folderId].DateBegin">
+      <div class="div-body width-100" *ngIf="publicationItem[folderId]?.DateBegin != null">
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
-        <p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
+        <p class="item-content-date">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
 
     </div>
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index e5579fb3a..aad1bc377 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -105,10 +105,8 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   getPublicationDetail() {
-    this.showLoader = true;
     const folderId = this.folderId
     this.publications.GetPresidentialAction(folderId).subscribe(res=>{
-      this.showLoader = false;
       this.publicationItem[folderId] = res
       this.storage.set(folderId+"name", res)
     }, (error) => {
diff --git a/version/git-version.ts b/version/git-version.ts
index 06f40ae70..edb588f7c 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "e11a66d9c",
-  "SHA": "e11a66d9c2a6230e4bd16e4e73c3a0f9edf8a6f7",
+  "shortSHA": "5b0606420",
+  "SHA": "5b060642036e92e97d14f9926b9e49e29257fd43",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Mar 10 11:47:53 2023 +0100'",
-  "lastCommitMessage": "fix merge",
-  "lastCommitNumber": "4865",
+  "lastCommitTime": "'Fri Mar 10 14:30:50 2023 +0100'",
+  "lastCommitMessage": "update actions",
+  "lastCommitNumber": "4866",
   "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/view-publications/view-publications.page.ts\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/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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 2b4b879970ce902dee81bc6046d08b6e5fe29bc8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 10 Mar 2023 15:46:37 +0100
Subject: [PATCH 2/2] remove duplication from publication

---
 .../pages/publications/publications.page.ts   | 68 ++++++-------------
 version/git-version.ts                        | 12 ++--
 2 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 8a9402f82..8ce820f8e 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -89,7 +89,6 @@ export class PublicationsPage implements OnInit {
     });
 
     this.hideRefreshButton();
-    this.getFromDB()
 
   }
 
@@ -148,38 +147,22 @@ 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')
 
-      if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-        await this.storage.set('actionsEvents', this.publicationsEventFolderList);
-        await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
-      } else {
-        folders.forEach((folder)=> {
-          this.addActionToDB(folder);
-        })
-      }
+      await this.storage.set('actionsEvents', this.publicationsEventFolderList);
+      await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
 
       this.showLoader = false;
 
     }, (error) => {
       this.showLoader = false;
+      this.getFromDB()
     });
 
   }
 
-  // addActionToStorage(events, viagens) {
-    
-  //   if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-  //     this.storage.set('actionsEvents', events);
-  //     this.storage.set('actionsViagens', viagens);
-  //   }
-  // }
-
-
   addActionToDB(folder) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
     } else {
@@ -202,39 +185,26 @@ export class PublicationsPage implements OnInit {
   }
 
   getFromDB() {
-
-    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.get('actionsEvents').then((events = []) => {
+    this.storage.get('actionsEvents').then((events = []) => {
         
-        if(Array.isArray(events)) {
-          const folders: PublicationFolder[] = this.getPublicationFolderMap(events)
+      if(Array.isArray(events)) {
+        const folders: PublicationFolder[] = this.getPublicationFolderMap(events)
 
-          this.showLoader = false;
-          this.publicationsEventFolderList = folders
-        } 
-
-      });
-      this.storage.get('actionsViagens').then((viagens = []) => {
-        
-        if(Array.isArray(viagens)) {
-          const folders: PublicationFolder[] = this.getPublicationFolderMap(viagens)
-
-          this.publicationsTravelFolderList = folders
-          this.showLoader = false;
-        }
-        
-      });
-    } else {
-      this.sqliteservice.getAllActions().then((actions: any[] = []) => {
-
-        const folders: PublicationFolder[] = this.getPublicationFolderMap(actions)
-
-        this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
-        this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
         this.showLoader = false;
+        this.publicationsEventFolderList = folders
+      } 
 
-      })
-    }
+    });
+    this.storage.get('actionsViagens').then((viagens = []) => {
+      
+      if(Array.isArray(viagens)) {
+        const folders: PublicationFolder[] = this.getPublicationFolderMap(viagens)
+
+        this.publicationsTravelFolderList = folders
+        this.showLoader = false;
+      }
+      
+    });
   }
 
   async editAction(folderId?: string) {
diff --git a/version/git-version.ts b/version/git-version.ts
index edb588f7c..05772e481 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "5b0606420",
-  "SHA": "5b060642036e92e97d14f9926b9e49e29257fd43",
+  "shortSHA": "57b4f0880",
+  "SHA": "57b4f0880084a1ab1005660d19cb603fa7b279ad",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Mar 10 14:30:50 2023 +0100'",
-  "lastCommitMessage": "update actions",
-  "lastCommitNumber": "4866",
+  "lastCommitTime": "'Fri Mar 10 15:10:37 2023 +0100'",
+  "lastCommitMessage": "improve publication",
+  "lastCommitNumber": "4867",
   "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/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/pages/publications/publications.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file