From 235177a29d03eadbc0391ddee2bd5c4f554c6aa5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 16 Mar 2021 14:35:52 +0100
Subject: [PATCH] Update publication page

---
 .../new-publication/new-publication.page.ts   |  3 +-
 .../pages/publications/publications.module.ts |  2 +-
 .../pages/publications/publications.page.html | 19 +++++++--
 .../pages/publications/publications.page.ts   |  7 +++-
 .../new-publication/new-publication.page.ts   |  8 ++--
 .../publication-detail-routing.module.ts      |  0
 .../publication-detail.module.ts              |  0
 .../publication-detail.page.html              |  0
 .../publication-detail.page.scss              |  0
 .../publication-detail.page.spec.ts           |  0
 .../publication-detail.page.ts                | 39 ++++++++++++-------
 11 files changed, 53 insertions(+), 25 deletions(-)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail-routing.module.ts (100%)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail.module.ts (100%)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail.page.html (100%)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail.page.scss (100%)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail.page.spec.ts (100%)
 rename src/app/shared/publication/{ => view-publications}/publication-detail/publication-detail.page.ts (81%)

diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 729e8206c..1e9d1ac94 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -53,7 +53,8 @@ export class NewPublicationPage implements OnInit {
     private publications: PublicationsService,
     private camera: Camera,
     ) {
-     
+      
+      alert('!!!!!')
       this.publicationType = this.navParams.get('publicationType');
       this.folderId = this.navParams.get('folderId');
       this.publicationTitle = 'Nova Publicação';
diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts
index d484b04fa..6c1a454e8 100644
--- a/src/app/pages/publications/publications.module.ts
+++ b/src/app/pages/publications/publications.module.ts
@@ -10,7 +10,7 @@ import { PublicationsPage } from './publications.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { ViewPublicationsPage } from 'src/app/shared/publication/view-publications/view-publications.page';
 import { NewPublicationPage } from 'src/app/shared/publication/new-publication/new-publication.page';
-import { PublicationDetailPage } from 'src/app/shared/publication/publication-detail/publication-detail.page';
+import { PublicationDetailPage } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.page';
 import { NewActionPage } from 'src/app/shared/publication/new-action/new-action.page';
 
 
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 4d5920280..393148d7e 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -63,34 +63,45 @@
     <!-- Right -->
     <div class="d-none d-md-flex flex-grow-1 flex-column max-width-60"
       style="border-left: 1px solid #d8d8d8;">
+
+      <div class="width-100 height-100 d-flex align-center justify-center" 
+        *ngIf="(
+          desktopComponent.showViewPublication == false &&
+          desktopComponent.showAddNewPublication == false &&
+          desktopComponent.showPublicationDetail == false &&
+          desktopComponent.showAddActions == false
+        )"><div>Nenhuma publicação delecionado</div></div>
      
       <!-- View Publication -->
       <app-view-publications 
         *ngIf="desktopComponent.showViewPublication"
         [folderId]="folderId"
-        class="height-100 d-flex flex-column overflow-hidden"
+        class="height-100 d-flex flex-column overflow-hidden flex-grow-1"
         (addNewPublication)="addNewPublication($event)"
         (openPublicationDetails)="openPublicationDetails($event)"
       >
       </app-view-publications>
 
       <app-new-publication *ngIf="desktopComponent.showAddNewPublication"
-        class="height-100 d-flex flex-column overflow-hidden background-white"
+        class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1"
         [folderId]="folderId"
         [publicationType]="publicationType"
+        [publication]="publication"
         (closeDesktopComponent)="closeDesktopComponent($event)"
       >
       </app-new-publication>
 
       <app-publication-detail-shared
         *ngIf="desktopComponent.showPublicationDetail"
-        class="height-100 d-flex flex-column overflow-hidden background-white"
+        class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1"
         [publicationId]="publicationId"
+        (addNewPublication)="addNewPublication($event)"
+        (closeDesktopComponent)="closeDesktopComponent($event)"
       ></app-publication-detail-shared>
 
       <app-new-action
         *ngIf="desktopComponent.showAddActions"
-        class="height-100 d-flex flex-column overflow-hidden background-white"
+        class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1"
         (closeDesktopComponent)="closeDesktopComponent($event)"
       ></app-new-action>
 
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 5d2d83a3f..d40727070 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -40,9 +40,13 @@ export class PublicationsPage implements OnInit {
   }
 
   folderId: string;
+  // data set from child component
   publicationType: any;
   publicationId: string;
 
+  // from publication details
+  publication: object;
+
   constructor(
     private router: Router, 
     private modalController: ModalController,
@@ -178,13 +182,14 @@ export class PublicationsPage implements OnInit {
 
   }
 
-  async addNewPublication({publicationType, folderId}){
+  async addNewPublication({publicationType, folderId, publication}){
 
     this.closeDesktopComponent();
 
     // propr to add new publication
     this.publicationType = publicationType;
     this.folderId = folderId;
+    this.publication = publication;
     
     this.desktopComponent.showAddNewPublication = true;
   }
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 4a4a784a8..bf10a9720 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -24,7 +24,6 @@ import { LoadingService } from 'src/app/services/loading.service';
 })
 export class NewPublicationPage implements OnInit {
   showLoader: boolean;
-  publication: Publication;
   pub: Publication = new Publication();
   image: Image = new Image();
 
@@ -36,6 +35,7 @@ export class NewPublicationPage implements OnInit {
 
   photo: SafeResourceUrl;
 
+  @Input() publication: Publication;
   @Input() publicationType: string;
   @Input() folderId: string;
   @Output() closeDesktopComponent =  new EventEmitter<any>();
@@ -46,7 +46,6 @@ export class NewPublicationPage implements OnInit {
   capturedImage:any;
   capturedImageTitle:any;
 
-
   constructor(
     private modalController: ModalController,
     public photoService: PhotoService,
@@ -121,7 +120,7 @@ export class NewPublicationPage implements OnInit {
         console.log('Edit change image');
         console.log(this.publication);
         this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
-        this.close();
+        this.closeDesktopComponent.emit();
       }
       else{
         this.publication = {
@@ -138,7 +137,7 @@ export class NewPublicationPage implements OnInit {
         console.log('Edit - keep image');
         console.log(this.publication);
         this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
-        this.close();
+        this.closeDesktopComponent.emit();
       }
     }
     else{
@@ -178,6 +177,7 @@ export class NewPublicationPage implements OnInit {
     }
     else if(this.publicationType == '3'){
       this.publicationTitle = 'Editar Publicação';
+      this.pub = this.publication;
     }
   }
 
diff --git a/src/app/shared/publication/publication-detail/publication-detail-routing.module.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail-routing.module.ts
similarity index 100%
rename from src/app/shared/publication/publication-detail/publication-detail-routing.module.ts
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail-routing.module.ts
diff --git a/src/app/shared/publication/publication-detail/publication-detail.module.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts
similarity index 100%
rename from src/app/shared/publication/publication-detail/publication-detail.module.ts
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts
diff --git a/src/app/shared/publication/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
similarity index 100%
rename from src/app/shared/publication/publication-detail/publication-detail.page.html
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
diff --git a/src/app/shared/publication/publication-detail/publication-detail.page.scss b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss
similarity index 100%
rename from src/app/shared/publication/publication-detail/publication-detail.page.scss
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss
diff --git a/src/app/shared/publication/publication-detail/publication-detail.page.spec.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.spec.ts
similarity index 100%
rename from src/app/shared/publication/publication-detail/publication-detail.page.spec.ts
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail.page.spec.ts
diff --git a/src/app/shared/publication/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
similarity index 81%
rename from src/app/shared/publication/publication-detail/publication-detail.page.ts
rename to src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 9a4fe58e5..b97595001 100644
--- a/src/app/shared/publication/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -16,7 +16,8 @@ export class PublicationDetailPage implements OnInit {
   publication: Publication;
 
   @Input() publicationId: string;
-
+  @Output() addNewPublication =  new EventEmitter<any>();
+  
   constructor(
     private modalController: ModalController,
     private publications:PublicationsService,
@@ -85,21 +86,31 @@ export class PublicationDetailPage implements OnInit {
 
   async editPost(publicationType:any) {
     console.log(this.publication);
-    const modal = await this.modalController.create({
-      component: NewPublicationPage,
-      componentProps:{
+
+    if(window.innerHeight >= 1024){
+      const modal = await this.modalController.create({
+        component: NewPublicationPage,
+        componentProps:{
+          publicationType: publicationType,
+          publication: this.publication,
+        },
+        cssClass: 'new-publication',
+        backdropDismiss: false
+      });
+      await modal.present();
+      modal.onDidDismiss().then(()=>{
+        setTimeout(() => {
+          this.getPublicationDetail();
+      }, 5000);
+      });
+    } else {
+      this.addNewPublication.emit({
         publicationType: publicationType,
+        folderId: this.folderId,
         publication: this.publication,
-      },
-      cssClass: 'new-publication',
-      backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss().then(()=>{
-      setTimeout(() => {
-        this.getPublicationDetail();
-    }, 5000);
-    });
+      })
+    }
+
   }
 
   openPreview(imageUrl:string){