Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

src/app/shared/agenda/edit-event/edit-event.component.ts

@@ -39,14 +39,15 @@ export class EditEventComponent implements OnInit {
     private modalController: ModalController,
     private eventsService: EventsService,
     public alertController: AlertController,
-  ) { 
-   
-
+  ) 
+  { 
+    
   }
 
   ngOnInit() {
-    let innerHtml :string = this.postEvent.Body.Text;
-    this.postEvent.Body.Text = innerHtml;
+    if(this.postEvent){
+      this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+    }
     console.log(this.postEvent);
     
     this.isEventEdited = false;

src/app/shared/agenda/view-event/view-event.page.html

@@ -44,10 +44,12 @@
           </ion-label>
         </ion-item>
       </div>
-      <h5>Detalhes</h5>
-      <ion-item lines="none" class="ion-no-margin ion-no-padding">
-          <ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
-      </ion-item>
+      <div *ngIf="loadedEvent.Body.Text">
+        <h5>Detalhes</h5>
+        <ion-item lines="none" class="ion-no-margin ion-no-padding">
+          <div [innerHTML]="loadedEvent.Body.Text"></div>
+        </ion-item>
+      </div>
     </div>
     <div class="line"></div>
   

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

@@ -13,7 +13,8 @@
       </div>
       <div class="actions-icon">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
-        <ion-icon (click)="AddPublication('2',item.ProcessId)" slot="end" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="AddPublication('2',item.ProcessId)" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
       </div>
     </div>
   </div>
@@ -49,7 +50,10 @@
           </div>
         </div>
       </div>
-      <div *ngIf="!publicationList" class="post-item">
+      <div *ngIf="!publicationList">
+        <p>{{error}}</p>
+      </div>
+      <div hidden *ngIf="!publicationList" class="post-item">
         <div class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>

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

@@ -107,15 +107,21 @@
   }
   
   .actions-icon{
-    width: 92px;
-    float: right;
+    display: flex;
     overflow: auto;
+    align-items: top;
+    justify-content: flex-end;
+    padding: 0 !important;
   }
   .actions-icon ion-icon{
-      margin-left: 10px;
+      margin-left: 5px;
       font-size: 35px;
       float: right;
+      padding: 0 !important;
   }
+  /* .title-icon{
+    font-size: 40px !important;
+  } */
   .item-content-date{
     color: #797979;
     font-size: 13px;

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

@@ -19,6 +19,8 @@ export class ViewPublicationsPage implements OnInit {
   publicationList: Publication[];
   item: PublicationFolder;
 
+  error: any;
+
   @Input() folderId: string;
   @Output() addNewPublication =  new EventEmitter<any>();
   @Output() openPublicationDetails= new EventEmitter<any>();
@@ -95,6 +97,13 @@ export class ViewPublicationsPage implements OnInit {
       });
       console.log(this.publicationList);
       this.showLoader = false;
+    },
+    (error)=>{
+      if(error.status == '404'){
+        console.log('NOT FOUND');
+        this.error = 'Sem publicações disponíveis!';
+      }
+      
     });
     
   }