Merge branch 'feature/calendar' into feature/chat

src/app/shared/agenda/approve-event/approve-event.component.html

@@ -1,9 +1,9 @@
-<ion-header class="ion-no-border">
-  <div class="header-content">
+<ion-header class="ion-no-border px-20">
+  <div class="header-content d-flex justify-space-between">
     <div class="header-icon-left">
       <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
     </div>
-    <div class="header-title">
+    <div class="header-title flex-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
     </div>
     <div class="header-icon-right">
@@ -37,7 +37,7 @@
 
 <ion-content id="main-content">
   <div class="upper-content">
-    <div class="content-location">
+    <div class="content-location d-flex justify-space-between">
       <div class="location-detail">
         <ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
       </div>

src/app/shared/agenda/approve-event/approve-event.component.scss

@@ -8,8 +8,6 @@ ion-content{
     --height: 225px;
   }
   .header-content{
-    width: 360px;
-    overflow: auto;
     margin: 25px auto;
   }
   .header-icon-left{
@@ -19,7 +17,6 @@ ion-content{
     float: left;
   }
   .header-title{
-    width: 264px;
     font-family: Roboto;
     font-size: 25px;
     margin: 0 5px 0 5px;
@@ -31,18 +28,14 @@ ion-content{
     width: 45px;
     font-size: 45px;
     float: left;
-    overflow: auto;
   }
   .upper-content{
     margin-left: 50px;
-    overflow: auto;
     font-size: 18px;
   
     .content-location{
-      width: 360px;
       margin: 0 auto;
       padding: 0;
-      overflow: auto;
     }
   
     .location-detail{

src/app/shared/agenda/event-list/event-list.component.html

@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border">
+<ion-header class="ion-no-border px-20">
   <div class="header-content">
     <div class="header-icon-left">
       <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
@@ -59,7 +59,7 @@
     <ion-list *ngSwitchCase="'PR'">
       <div *ngIf="eventsPRList">
         <ion-item-sliding>
-          <ion-item class="Rectangle" lines="none" 
+          <ion-item class="Rectangle width-100" lines="none" 
               *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}}">
                 <div class="approve-event-time">

src/app/shared/agenda/event-list/event-list.component.scss

@@ -1,17 +1,15 @@
 .header-content{
-    width: 360px;
     overflow: auto;
     margin: 0 auto;
     padding-top: 25px;
   }
   .header-icon-left{
-    width: 36px;
     font-size: 33px;
     color: #42b9fe;
     float: left;
   }
   .header-title{
-    width: 300px;
+
     font-family: Roboto;
     font-size: 25px;
     margin: 0 5px 0 5px;
@@ -23,36 +21,30 @@
     margin-top: 5px;
   }
   .Rectangle {
-    width: 360px;
     border-radius: 15px;
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
     border: solid 1px #e9e9e9;
     background-color: var(--white);
-    margin: 0 auto;
     padding: 10px;
     margin-bottom: 10px;
     overflow: auto;
   }
   .content-mdgpr-Oficial{
-    width: 340px;
     border-radius: 5px;
     border-right: 5px solid #99e47b;
     overflow: auto;
   }
   .content-mdgpr-Pessoal{
-    width: 340px;
     border-radius: 5px;
     border-right: 5px solid #958bfc;
     overflow: auto;
   }
   .content-pr-Oficial{
-    width: 340px;
     border-radius: 5px;
     border-right: 5px solid #ffb703;
     overflow: auto;
   }
   .content-pr-Pessoal{
-    width: 340px;
     border-radius: 5px;
     border-right: 5px solid #f05d5e;
     overflow: auto;
@@ -79,7 +71,6 @@
     margin-left: 10px;
   }
   .approve-event-detail p{
-    width: 250px;
     font-family: Roboto;
     font-size: 13px;
     font-weight: normal;
@@ -92,7 +83,6 @@
     padding: 0;
   }
   .approve-event-detail h3{
-    width: 250px;
     font-family: Roboto;
     font-size: 15px;
     font-weight: bold;

src/app/shared/agenda/new-event/new-event.component.html

@@ -16,11 +16,11 @@
       <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
@@ -32,11 +32,11 @@
     </div>
   
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-select  placeholder="Selecione agenda"
           selectedText="{{postEvent.CalendarName}}" 
           [(ngModel)]="postEvent.CalendarName" 
@@ -50,11 +50,11 @@
     </div>
 
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-select  placeholder="Selecione tipo" 
           [(ngModel)]="postEvent.Categories[0]" 
           interface="action-sheet" 
@@ -69,11 +69,11 @@
     </div>
   
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-datetime 
             placeholder="Início"
             [(ngModel)]="postEvent.StartDate"
@@ -90,11 +90,11 @@
     </div>
     
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-datetime 
             placeholder="Fim"
             [(ngModel)]="postEvent.EndDate"
@@ -111,11 +111,11 @@
     </div>
     
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-select placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
             <ion-select-option value="false">Não se repete</ion-select-option>
             <ion-select-option value="true">Repete</ion-select-option>
@@ -125,11 +125,11 @@
     </div>
     
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div (click)="openAttendees()" class="ion-input-class-no-height">
+        <div (click)="openAttendees()" class="ion-input-class-no-height flex-grow-1">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
@@ -146,11 +146,11 @@
     </div>
     
     <div hidden class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
         </div>
-        <div class="ion-input-class-no-height">
+        <div class="ion-input-class flex-grow-1-no-height">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
@@ -167,11 +167,11 @@
     </div>
     
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class flex-grow-1">
           <ion-input placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text"></ion-input>
         </div>
       </div>
@@ -203,8 +203,8 @@
     </div> 
   </div>    
 </ion-content>
-<ion-footer class="ion-no-border d-flex justify-center">
-  <ion-toolbar class="btn-div ">
+<ion-footer class="ion-no-border px-20">
+  <ion-toolbar class="d-flex justify-space-between">
     <ion-buttons slot="start">
       <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>

src/app/shared/agenda/new-event/new-event.component.scss

@@ -18,7 +18,6 @@ ion-content{
   transform: translate3d(0, 1px, 0);
   
   .title-content{
-    width: 360px;
     margin: 0px auto;
     overflow: auto;
     padding: 0 !important;
@@ -46,7 +45,6 @@ ion-content{
   padding: 15px 20px 0 20px;
 
   .ion-item-container{
-      width: 360px;
       margin: 15px auto;
       border: 1px solid #ebebeb;
       border-radius: 5px;
@@ -63,7 +61,6 @@ ion-content{
       overflow: auto;
     }
     .ion-item-class-2{
-      width: 360px;
       margin: 0px auto;
     }
     .ion-icon-class{
@@ -78,7 +75,6 @@ ion-content{
       margin-left: 0;
     }
     .ion-input-class{
-      width: 315px;
       height: 45px;
       border: 1px solid #ebebeb;
       border-radius: 5px;

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

@@ -1,11 +1,11 @@
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
-    <div class="main-header">
-      <div class="title-content">
+    <div class="main-header px-20">
+      <div class="title-content d-flex"  >
         <div class="left">
           <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
         </div>
-        <div class="middle">
+        <div class="middle flex-grow-1">
           <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
         </div>
         <div class="div-icon">
@@ -20,7 +20,7 @@
 <ion-content>
   <div class="main-content">
     <div class="upper-content">
-      <div class="content-location">
+      <div class="content-location d-flex justify-space-between ">
         <div class="location-detail">
           <ion-label >{{loadedEvent.Location}}</ion-label>
         </div>

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

@@ -25,9 +25,7 @@ ion-menu{
     transform: translate3d(0, 1px, 0);
     
     .title-content{
-      width: 360px;
       margin: 0px auto;
-      overflow: auto;
       padding: 0 !important;
       background: #fff;
 
@@ -79,37 +77,31 @@ ion-menu{
     font-family: Roboto;
     margin: 0 auto;
     background-color: #fff;
-    overflow:auto;
     padding: 15px 0px 0 0px;
 
     .upper-content{
         margin-left: 50px;
-        overflow: auto;
         font-size: 18px;
       
         .content-location{
           width: 100%;
           margin: 0 auto;
           padding: 0;
-          overflow: auto;
         }
       
         .location-detail{
-          width: 210px;
           font-weight: 700;
           font-size: 18px;
           float: left;
           margin: 5px 5px 5px 0px;
         }
         .button-mdgpr-Oficial{
-            width: 91px;
             --border-radius: 20px;
             --background: #ffb703;
             margin-left: 5px;
             float: left;
         }
         .button-mdgpr-Pessoal{
-          width: 91px;
           --border-radius: 20px;
           --background: #f05d5e;
           margin-left: 5px;
@@ -153,7 +145,6 @@ ion-menu{
       }
       
       .bottom-content{
-        width: 360px;
         margin: 0 auto;
         
         .bottom-content h3{

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

@@ -55,6 +55,12 @@ export class ViewEventPage implements OnInit {
     this.getAttachments();
     
   }
+  
+  ngOnChanges(changes: any): void {
+    this.loadEvent();
+    this.getAttachments();
+  }
+
   close(){
     console.log(this.isEventEdited);
     

src/app/shared/publication/new-publication/new-publication.page.html

@@ -1,8 +1,8 @@
 <ion-header class="ion-no-border background-white px-20 pt-25">
   <div class="title-content d-flex">
-    <div class="back-icon">
+<!--     <div class="back-icon">
       <ion-icon class="font-35" (click)="goBack()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-    </div>
+    </div> -->
     <div class="div-title">
       <ion-label class="title">{{publicationTitle}}</ion-label>
     </div>
@@ -16,7 +16,9 @@
     <ion-input [(ngModel)]="pub.Title" name="title" ngDefaultControl placeholder="Título" ></ion-input>
   </div>
 
-  <div *ngIf="publicationType!='1'" class="container-div">
+ 
+
+  <div *ngIf="publicationType!='1'" class="container-div pb-20">
     <div class="ion-item-class-2 d-flex">
       <div class="ion-icon-class">
         <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
@@ -26,6 +28,23 @@
       </div>
     </div>
   </div>
+  
+  <div class="container-title py-10">Fotografia Anexada</div>
+
+  <div class="picture d-flex pb-5" *ngIf="publication.FileBase64.length > 10">
+    <div  class="post-img">
+      <img src="{{publication.FileBase64}}" alt="image" >
+    </div>
+    <div class="d-flex flex-column pl-10"> 
+      <div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
+      <div class="size">75 Kb</div>
+    </div>
+    <div class="flex-grow-1 d-flex align-center justify-end">
+      <div style="color: red;">X</div>
+    </div>
+    
+  </div>
+
   <div *ngIf="capturedImage != ''" class="ion-item-container-no-border">
     <ion-label class="attached-title">Fotografia Anexada</ion-label>
     <ion-item lines="none">

src/app/shared/publication/new-publication/new-publication.page.scss

@@ -73,6 +73,7 @@ font-size: 25px;
   .container-div{
     margin-bottom: 15px;
     overflow: auto;
+    border-bottom: 1px solid #ebebeb;
   }
   .ion-item-container{
     margin: 15px auto;
@@ -131,4 +132,24 @@ font-size: 25px;
   line-height: normal;
   letter-spacing: normal;
   color: #000;
-  }
+  }
+
+
+.picture{
+  .post-img{
+    width: 60px;
+  }
+  .picture-file-name{
+    font-size: 15px;
+    color: #0d89d1;
+  }
+  .size{
+    color: #cecece;
+    font-size: 13px;
+  }
+}
+
+.container-title{
+  font-size: 15px;
+  font-weight: bold;
+}

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -39,8 +39,9 @@ export class NewPublicationPage implements OnInit {
   @Input() publicationType: string;
   @Input() folderId: string;
   @Output() closeDesktopComponent =  new EventEmitter<any>();
-  @Output() goBacktoPublicationDetails = new EventEmitter();
-
+  @Output() openPublicationDetails = new EventEmitter<any>();
+  @Output() goBackToViewPublications = new EventEmitter<any>();
+  @Output()  goBacktoPublicationDetails = new EventEmitter<any>();
   
   guestPicture:any;
 
@@ -121,7 +122,7 @@ export class NewPublicationPage implements OnInit {
         console.log('Edit change image');
         console.log(this.publication);
         this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
-        this.closeDesktopComponent.emit();
+        this.goBack();
       }
       else{
         this.publication = {
@@ -138,7 +139,7 @@ export class NewPublicationPage implements OnInit {
         console.log('Edit - keep image');
         console.log(this.publication);
         this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
-        this.closeDesktopComponent.emit();
+        this.goBack();
       }
     }
     else{
@@ -164,7 +165,7 @@ export class NewPublicationPage implements OnInit {
 
 
   close(){
-    this.closeDesktopComponent.emit('!???____!!');
+    this.goBack();
   }
   clear(){
     this.capturedImage = '';
@@ -183,8 +184,13 @@ export class NewPublicationPage implements OnInit {
   }
 
   async goBack(){
-
-    this.goBacktoPublicationDetails.emit();
+    
+    if(this.publicationType == '2'){
+      this.goBackToViewPublications.emit();
+    } else {
+      this.goBacktoPublicationDetails.emit();
+    }
+   
   }
 
   /* async openGallery() {

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

@@ -74,7 +74,6 @@
   }
   .post-img{
     width: 100%;
-    height: 400px;
     margin: 0 auto;
     border-radius: 0px!important;
     overflow: hidden;
@@ -85,7 +84,6 @@
     object-fit: cover;
 }
 .post-description{
-  width: 360px;
   margin: 0 auto;
   margin-bottom: 35px;
 }

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

@@ -89,7 +89,7 @@ export class PublicationDetailPage implements OnInit {
   async editPost(publicationType:any) {
     console.log(this.publication);
 
-    if(window.innerHeight >= 1024){
+    if(window.innerWidth <= 1024){
       const modal = await this.modalController.create({
         component: NewPublicationPage,
         componentProps:{

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

@@ -2,11 +2,11 @@
 
 <ion-header class="ion-no-border">
   <div class="main-header">
-    <div class="title-content">
-      <div class="back-icon" (click)="goBack()">
+    <div class="title-content d-flex flex-end">
+    <!--   <div class="back-icon" (click)="goBack()">
         <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-      </div>
-      <div class="div-title">
+      </div> -->
+      <div class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
         <p class="item-content-detail">{{item.Detail}}</p>
         <p class="item-content-date">{{item.DateBegin}}</p>

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

@@ -149,9 +149,5 @@ export class ViewPublicationsPage implements OnInit {
 
   }
 
-  async goBack(){
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-    this.goBacktoPublicationDetails.emit();
-  }
 
 }