Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/home/home.page.html

@@ -10,7 +10,7 @@
     <ion-tab-button tab="agenda">
       <!-- <ion-icon name="calendar"></ion-icon> -->
       <ion-icon class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
-      <ion-label>Agenda</ion-label>
+      <ion-label class="overflow-visible">Agenda</ion-label>
     </ion-tab-button>
     <ion-tab-button tab="gabinete-digital">
       <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->

src/app/home/home.page.ts

@@ -1,4 +1,4 @@
-///<reference path="../../../plugins/cordova-plugin-mfp/typings/worklight.d.ts" />
+//<reference path="../../../plugins/cordova-plugin-mfp/typings/worklight.d.ts" />
 import { Component, OnInit, NgZone } from '@angular/core';
 import { EventsService } from '../services/events.service';
 import { Event } from '../models/event.model';
@@ -12,9 +12,9 @@ import { Router } from '@angular/router';
 import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 import { ViewEventPage } from '../pages/agenda/view-event/view-event.page';
 import { ExpedienteDetailPage } from '../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
-import { PublicationDetailPage } from '../pages/publications/publication-detail/publication-detail.page';
 import { ViewPublicationsPage } from '../pages/publications/view-publications/view-publications.page';
 import { ApproveEventModalPage } from '../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
+import { PublicationDetailPage } from '../pages/publications/view-publications/publication-detail/publication-detail.page';
 
 /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */
 
@@ -76,33 +76,33 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
 
-     this.pushCordova();
+    //Add a test
-         //Initialize profile as mdgpr
+    //this.pushCordova();
-    
+    //Initialize profile as mdgpr
-        /* let date = new Date();
+
-        date.setMonth(date.getMonth() + 1);
+    let date = new Date();
-        let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+    date.setMonth(date.getMonth() + 1);
-        let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
+    let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-    
+    let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
-        this.profile = "mdgpr";
+
-        if (this.profile == "mdgpr") {
+    this.profile = "mdgpr";
-          this.eventService.getAllMdEvents(start, end).subscribe(res => {
+    if (this.profile == "mdgpr") {
-            this.eventsList = res;
+      this.eventService.getAllMdEvents(start, end).subscribe(res => {
-            this.totalEvent = this.eventsList.length;
+        this.eventsList = res;
-          });
+        this.totalEvent = this.eventsList.length;
-        }
+      });
-        else {
+    }
-          this.eventService.getAllPrEvents(start, end).subscribe(res => {
+    else {
-            this.eventsList = res;
+      this.eventService.getAllPrEvents(start, end).subscribe(res => {
-            this.totalEvent = this.eventsList.length;
+        this.eventsList = res;
-          });
+        this.totalEvent = this.eventsList.length;
-    
+      });
-        }
+
-        this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
+    }
-          this.totalExpediente = result; 
+
-        });*/
-        
   }
+
+  
   pushCordova() {
 
     if(this.platform.is('desktop')) {

src/app/pages/agenda/agenda.page.ts

@@ -863,26 +863,29 @@ export class AgendaPage implements OnInit {
   selectFirstEventOfTheDay(){
     
     setTimeout(()=>{
+      
+      if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){
+        let sortedDate = this.eventSource.sort((a,b) =>{
+          return (b.startTime) -(a.startTime);
+        });
   
-      let sortedDate = this.eventSource.sort((a,b) =>{
+  
-        return (b.startTime) -(a.startTime);
+        let filterDate =  sortedDate.filter((e) => {
-      });
+          return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
-
+        });
-
+  
-      let filterDate =  sortedDate.filter((e) => {
+        const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
-        return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
+  
-      });
+        const scrollContainer = document.querySelector('.timeline-wrapper');
-
-      const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
-
-      const scrollContainer = document.querySelector('.timeline-wrapper');
-
-      scrollContainer.scroll({
-        top: firstEventStartHours*60,
-        left: 0, 
-        behavior: 'smooth' 
-      })
     
+        scrollContainer.scroll({
+          top: firstEventStartHours*60,
+          left: 0, 
+          behavior: 'smooth' 
+        })
+      
+      }
+      
     }, 500);
 
   }
@@ -1147,8 +1150,6 @@ export class AgendaPage implements OnInit {
     this.postEvent = false;
   }
 
-  
-
   async changeSegment(segments: "Combinado" |  "Pessoal" | "Oficial") {
     this.segment =  segments;
 
@@ -1159,5 +1160,4 @@ export class AgendaPage implements OnInit {
     }
   }
 
-
 }

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

@@ -109,20 +109,13 @@ export class ViewEventPage implements OnInit {
 
   async editEventDetail() {
 
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal'
-    } else  {
-      classs = 'modal modal-desktop'
-    }
-
     const modal = await this.modalController.create({
       component: EditEventPage,
       componentProps: {
         eventId: this.loadedEvent.EventId,
         profile: this.profile,
       },
-      cssClass: classs,
+      cssClass: 'modal modal-desktop',
     });
 
   }
@@ -131,7 +124,7 @@ export class ViewEventPage implements OnInit {
 
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal'
+      classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }
@@ -151,6 +144,7 @@ export class ViewEventPage implements OnInit {
       if(res){
         setTimeout(() => {
           /* this.loadEvent(); */
+          this.loadEvent()
           this.getAttachments();
         }, 250);
         this.isEventEdited = true;

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -28,12 +28,11 @@ export class EventListPage implements OnInit {
     private modalController: ModalController,
     private router: Router,
     private navParams: NavParams,
-    ) { }
+  ) { }
 
   ngOnInit() {
     this.profile = this.navParams.get('profile');
-    console.log(this.profile);
+      
-    
     /* console.log(this.navParams.get('md')); */
     if(this.profile == "mdgpr"){
       this.profile = 'MDGPR'
@@ -53,7 +52,7 @@ export class EventListPage implements OnInit {
 
     window.onresize = (event) => {
       // if not mobile remove all component
-      if( window.innerWidth <= 1024){
+      if( window.innerWidth <= 800){
         this.modalController.dismiss();
       }
     };
@@ -73,21 +72,15 @@ export class EventListPage implements OnInit {
     });
   }
 
-
   async openApproveModal(eventSerialNumber){
-    let classs;
+
-    if( window.innerWidth <= 1024){
-      classs = 'cal-modal  modal modal-desktop'
-    } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
-    }
 
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,
       componentProps:{
         serialNumber: eventSerialNumber,
       },
-      cssClass: 'event-list',
+      cssClass: 'event-list cal-modal  modal modal-desktop',
       backdropDismiss: false
     });
 

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -61,7 +61,7 @@
                 </ion-list>
               </ion-item>
             </div>
-            <div class="add-people" (click)="addParticipants(); showAttendees='true'">
+            <div class="add-people" (click)="addParticipants();">
               <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
             </div>
           </div>
@@ -82,7 +82,7 @@
                 </ion-list>
               </ion-item>
             </div>
-            <div class="add-people" (click)="addParticipantsCc(); showAttendees='true'">
+            <div class="add-people" (click)="addParticipantsCc();">
               <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
             </div>
           </div>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -113,6 +113,7 @@ export class ExpedientTaskModalPage implements OnInit {
     
   }
   saveTask(){
+    
     let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
     attendees = attendees.map(function(val) {
       return {
@@ -120,6 +121,7 @@ export class ExpedientTaskModalPage implements OnInit {
         UserType:  val.IsRequired?"I": "CC"
       };
     })
+
     if(this.taskParticipants.length > 0){
       switch (this.taskType){
         case '0':
@@ -185,7 +187,10 @@ export class ExpedientTaskModalPage implements OnInit {
     this.adding = "intervenient";
     this.contacts =  this.taskParticipants;
 
-    if(window.innerWidth <=1024){
+    if(window.innerWidth <=800){
+      
+      this.showAttendees=false;
+
       const modal = await this.modalController.create({
         component: AddParticipantsModalPage,
          componentProps: {
@@ -214,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit {
         console.log(this.postData);
       });
     } else {
-
+      this.showAttendees=true
     }
   }
   
@@ -223,7 +228,9 @@ export class ExpedientTaskModalPage implements OnInit {
     this.adding = "CC";
     this.contacts = this.taskParticipantsCc;
 
-    if(window.innerWidth <=1024){
+    if(window.innerWidth <=800){
+      this.showAttendees=false;
+
       const modal = await this.modalController.create({
         component: AddParticipantsCcModalPage,
          componentProps: {
@@ -251,6 +258,8 @@ export class ExpedientTaskModalPage implements OnInit {
         this.postData.UsersSelected = this.participants;
         console.log(this.postData);
       });
+    } else {
+      this.showAttendees=true
     }
 
   }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -141,7 +141,7 @@ export class ExpedienteDetailPage implements OnInit {
     //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal'
+      classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }
@@ -193,7 +193,7 @@ export class ExpedienteDetailPage implements OnInit {
   async openBookMeetingModal(task: any) {
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'book-meeting-modal'
+      classs = 'book-meeting-modal modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -65,14 +65,7 @@ export class ExpedientePage implements OnInit {
   }
 
   async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
 
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
-    }
 
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
@@ -80,7 +73,7 @@ export class ExpedientePage implements OnInit {
         serialNumber: serialNumber,
         profile: this.profile,
       },
-      cssClass: classs,
+      cssClass: 'modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -20,7 +20,7 @@
         </div>
         
         <div class="aside overflow-y-auto d-flex  flex-wrap width-100">
-          <div class="exp-card d-flex flex-column" (click)="openEventsToApprovePage('MDGPR')">
+          <div [class.active]="selectedElement == 'approval'" (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'"  class="exp-card d-flex flex-column" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
             </div>
@@ -28,7 +28,7 @@
             <p class="text-center exp-card-content">{{count_ev_md+count_ev_pr}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div class="exp-card d-flex flex-column justify-center" (click)="openExpedientListPage()">
+          <div [class.active]="selectedElement == 'Correspondence'" (click)="openExpedientListPage(); selectedElement='Correspondence'" class="exp-card d-flex flex-column justify-center" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-correspondencia.svg"></ion-icon>
             </div>
@@ -36,7 +36,7 @@
             <p class="text-center exp-card-content">{{count_exp_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div  [class.active]="selectedElement == 'Pending'" (click)="notImplemented()" class="exp-card d-flex flex-column justify-center" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-pendente.svg"></ion-icon>
             </div>
@@ -44,21 +44,24 @@
             <p class="text-center exp-card-title ">Pendentes</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+
+          <div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-parecer.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Pedidos de Parecer</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+
+          <div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
             </div>
@@ -66,15 +69,15 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
-          <div class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Expediente Presidente</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
+
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
             </div>
@@ -82,9 +85,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long justify-center width-100" (click)="notImplemented()">
-
-          <div class="exp-card-long justify-center width-100" (click)="notImplemented()">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
@@ -95,7 +96,8 @@
               </div>
             </div>
           </div>
-          <div class="exp-card-long width-100" (click)="notImplemented()">
+
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100" (click)="notImplemented()">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -107,14 +109,16 @@
             </div>
           </div>
 
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Diplomas assinaldos PR</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
+
         </div>
+
       </div>
 
       <!-- Aside right -->

src/app/pages/gabinete-digital/gabinete-digital.page.scss

@@ -345,3 +345,9 @@ ion-content{
     width: 25%;
   }
 }
+
+
+.active {
+  border:  1px solid green;
+  box-sizing: border-box;
+}

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
   templateUrl: './gabinete-digital.page.html',
   styleUrls: ['./gabinete-digital.page.scss'],
 })
+
 export class GabineteDigitalPage implements OnInit {
 
   segment:string;
@@ -27,11 +28,13 @@ export class GabineteDigitalPage implements OnInit {
   count_ev_pr=0;
   count_ev_md=0;
 
+  selectedElement = "";
 
   desktopComponent: any = {
     showEventList: false,
     showExpediente : false
   }
+
   showEventsToApprove = false;
   showEmptyContainer = false;
   showExpedients = true;
@@ -46,17 +49,15 @@ export class GabineteDigitalPage implements OnInit {
     private alertService: AlertService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
-    ) { 
+    ) {
 
       window.onresize = (event) => {
         // if not mobile remove all component
         if( window.innerWidth <= 1024){
           this.modalController.dismiss();
         }
-        this.adjastModalHeight();
-      };
 
-      this.adjastModalHeight();
+      };
 
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["show"]){
@@ -69,24 +70,6 @@ export class GabineteDigitalPage implements OnInit {
       
     }
 
-    adjastModalHeight(){
-      setTimeout(() => {
-        if( window.innerWidth <= 1366){
-
-          document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
-            console.log('adjast width')
-            e.setAttribute('style',`height:${window.innerHeight - (74 + 57)}px`)
-          })
-        } else  if( window.innerWidth >= 1366){
-          document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
-            console.log('adjast width')
-            e.setAttribute('style',`height:${window.innerHeight - (74)}px`)
-          })
-        }
-      }, 200);
-
-
-    }
 
   closeAllDesktopComponent(){
     this.desktopComponent = {
@@ -94,6 +77,7 @@ export class GabineteDigitalPage implements OnInit {
       showExpediente: false
     }
   }  
+
   ngOnInit() {
     //Initialize profile as mdgpr
     this.profile = "MDGPR";
@@ -178,22 +162,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   async openEventsToApproveList(profile:any){
     
     this.closeAllDesktopComponent();
-
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal'
-    } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
-    }
-
     //if( window.innerWidth <= 1024){
-      this.adjastModalHeight();
       const modal = await this.modalController.create({
         component: EventListPage,
         componentProps:{
           profile: profile,
         },
-        cssClass: classs,
+        cssClass: 'modal modal-desktop',
         backdropDismiss: false
       });
       await modal.present();
@@ -203,6 +178,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
     //}
 
   }
+
   openExpedientListPage(){
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 1024){
@@ -212,6 +188,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
       this.showExpedients = true;
     }
   }
+
   openExpedientPage(data){
     console.log(data);
     
@@ -224,24 +201,18 @@ this.processesbackend.GetActionsList().subscribe(res=>{
       this.showExpedientDetail = true;
     }
   }
+
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
-    let classs;
-    if( window.innerWidth <= 1024){
-      classs = 'modal'
-    } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
-    }
 
     //if( window.innerWidth <= 1024){
-      this.adjastModalHeight();
       const modal = await this.modalController.create({
         component: ExpedientePage,
         componentProps:{
           profile: this.profile,
         },
-        cssClass: classs,
+        cssClass: 'modal modal-desktop',
         backdropDismiss: false
       });
       await modal.present();

src/app/pages/publications/new-action/new-action.page.html

@@ -1,18 +1,3 @@
-<ion-header class="ion-no-border">
-  <ion-toolbar class="ion-no-border bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
-</ion-header>
 
 <ion-content>
   <div class="content-container">

src/app/pages/publications/new-action/new-action.page.scss

@@ -14,7 +14,6 @@ ion-toolbar{
   border-width: 0 !important;
 }
 .div-top-header{
-  width: 400px;
   margin: 0 auto;
   background-color: #0782c9;
   overflow: auto;
@@ -41,7 +40,6 @@ ion-toolbar{
   margin-right: 10px;
 }
 .content-top{
-  width: 344px;
   background: #f3f2f2;
   height: 20px;
   margin: 0 auto;
@@ -60,7 +58,6 @@ ion-toolbar{
   overflow: auto;
 }
 .title-content{
-  width: 360px;
   margin: 0px auto;
   overflow: auto;
   padding: 0 !important;
@@ -79,7 +76,6 @@ font-size: 25px;
     overflow: auto;
   }
   .ion-item-container{
-    width: 360px;
     margin: 15px auto;
     border: 1px solid #ebebeb;
     border-radius: 5px;
@@ -92,8 +88,8 @@ font-size: 25px;
     overflow: auto;
   }
   .ion-item-class-2{
-    width: 360px;
     margin: 0px auto;
+    display: flex;
   }
   .ion-icon-class{
     width: 45px;
@@ -101,24 +97,23 @@ font-size: 25px;
     float: left;
     padding: 10px;
     font-size: 25px;
+    
   }
   .ion-input-class{
-    width: 315px;
     height: auto;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
-    float: left;
+    flex: 1;
   }
   .ion-textarea-class{
-    width: 315px;
     height: auto;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
-    float: left;
+    flex: 1;
   }
   .ion-input-class-no-height{
     border: 1px solid #ebebeb;

src/app/pages/publications/new-publication/new-publication.page.html

@@ -1,18 +1,4 @@
-<ion-header class="ion-no-border">
+
-  <ion-toolbar class="ion-no-border bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
-</ion-header>
 
 <ion-content>
   <div class="content-container">

src/app/pages/publications/new-publication/new-publication.page.scss

@@ -14,7 +14,6 @@ ion-toolbar{
   border-width: 0 !important;
 }
 .div-top-header{
-  width: 400px;
   margin: 0 auto;
   background-color: #0782c9;
   overflow: auto;
@@ -41,7 +40,6 @@ ion-toolbar{
   margin-right: 10px;
 }
 .content-top{
-  width: 344px;
   background: #f3f2f2;
   height: 20px;
   margin: 0 auto;
@@ -60,7 +58,6 @@ ion-toolbar{
   overflow: auto;
 }
 .title-content{
-  width: 360px;
   margin: 0px auto;
   overflow: auto;
   padding: 0 !important;
@@ -79,7 +76,6 @@ font-size: 25px;
     overflow: auto;
   }
   .ion-item-container{
-    width: 360px;
     margin: 15px auto;
     border: 1px solid #ebebeb;
     border-radius: 5px;
@@ -92,8 +88,8 @@ font-size: 25px;
     overflow: auto;
   }
   .ion-item-class-2{
-    width: 360px;
     margin: 0px auto;
+    display: flex;
   }
   .ion-icon-class{
     width: 45px;
@@ -109,7 +105,7 @@ font-size: 25px;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
-    float: left;
+    flex: 1;
   }
   .ion-input-class-no-height{
     border: 1px solid #ebebeb;

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

@@ -81,7 +81,7 @@ export class NewPublicationPage implements OnInit {
      this.capturedImage = imageData;
      this.capturedImageTitle = new Date().getTime() + '.jpeg';
     }, (err) => {
-     console.log(err);
+     /* console.log(err); */
     });
   }
 
@@ -102,7 +102,7 @@ export class NewPublicationPage implements OnInit {
       this.capturedImage = imageData;
       this.capturedImageTitle = new Date().getTime() + '.jpeg';
      }, (err) => {
-      console.log(err);
+      /* console.log(err); */
      });
   }
 
@@ -139,8 +139,8 @@ export class NewPublicationPage implements OnInit {
           FileBase64: this.publication.FileBase64,
           FileExtension: 'jpeg',
         }
-        console.log('Edit - keep image');
+        /* console.log('Edit - keep image');
-        console.log(this.publication);
+        console.log(this.publication); */
         this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
         this.close();
       }
@@ -159,8 +159,8 @@ export class NewPublicationPage implements OnInit {
         FileExtension: 'jpeg',
       }
       
-      console.log('Create');
+      /* console.log('Create');
-      console.log(this.publication);
+      console.log(this.publication); */
       this.publications.CreatePublication(this.folderId, this.publication);
       this.close();
     }

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

@@ -1,21 +1,6 @@
-<ion-header class="ion-no-border">
-  <ion-toolbar class="ion-no-border bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon tappable src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
 
-</ion-header>
+
 <ion-content>
-  <div class="content-top"></div>
   <div class="content-container">
     <div *ngIf="publication.Title != ''">
     <div class="title-content">

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

@@ -10,7 +10,6 @@
     border-width: 0 !important;
   }
   .div-top-header{
-    width: 400px;
     margin: 0 auto;
     background-color: #0782c9;
     overflow: auto;
@@ -37,7 +36,6 @@
     margin-right: 10px;
   }
   .content-top{
-    width: 344px;
     background: #f3f2f2;
     height: 20px;
     margin: 0 auto;
@@ -55,7 +53,6 @@
     overflow: auto;
   }
   .title-content{
-    width: 360px;
     margin: 0px auto;
     overflow: auto;
     padding: 0 !important;
@@ -67,7 +64,6 @@
     overflow: auto;
   }
   .div-title{
-      width: 270px;
     /* padding: 0!important; */
     float: left;
     margin: 2.5px 0 0 5px;
@@ -88,7 +84,6 @@
     object-fit: cover;
 }
 .post-description{
-  width: 360px;
   margin: 0 auto;
   margin-bottom: 35px;
 }

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

@@ -94,7 +94,7 @@ export class PublicationDetailPage implements OnInit {
         publicationType: publicationType,
         publication: this.publication,
       },
-      cssClass: 'new-publication',
+      cssClass: 'new-publication modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/publications/publications.page.html

@@ -16,9 +16,9 @@
       <!-- Header -->
       <ion-toolbar >
         <div class="main-header">
-          <div class="title-content">
+          <div class="title-content d-flex justify-space-between">
-            <div class="div-title">
+            <div class="div-title flex-grow-1">
-              <ion-label class="title">Acções Presidenciais</ion-label>
+              <ion-label class="title ">Acções Presidenciais</ion-label>
             </div>
             <div class="div-icon">
               <button class="btn-no-color" (click)="AddPublicationFolder()">

src/app/pages/publications/publications.page.scss

@@ -55,13 +55,11 @@ ion-toolbar{
     
     .title-content{
       margin: 0px auto;
-      overflow: auto;
       padding: 0 !important;
       background: #fff;
     }
     .div-title{
       padding: 0!important;
-      float: left;
     }
     .title{
       font-size: 25px;
@@ -71,7 +69,6 @@ ion-toolbar{
       /* width: 45px;
       float: right; */
       font-size: 35px;
-      overflow: auto;
       padding: 0 !important;
       align-items: center;
       justify-content: flex-end;

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

@@ -116,7 +116,7 @@ export class PublicationsPage implements OnInit {
         componentProps:{
           item: item,
         },
-        cssClass: 'new-action',
+        cssClass: 'new-action modal modal-desktop',
         backdropDismiss: false
       });
       await modal.present();
@@ -131,7 +131,6 @@ export class PublicationsPage implements OnInit {
   }
 
   async viewPublications(folderId: string) {
-    console.log('FOLDER', folderId)
 
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -160,7 +159,7 @@ export class PublicationsPage implements OnInit {
     this.closeDesktopComponent();
 
     // OpenModal
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       /* let item =  this.publicationFolderList; */
       const modal = await this.modalController.create({
         component: ViewPublicationsPage,
@@ -169,7 +168,7 @@ export class PublicationsPage implements OnInit {
         componentProps:{
           folderId:folderId,
         },
-        cssClass: 'new-action',
+        cssClass: 'new-action modal modal-desktop',
         backdropDismiss: false
       });
       await modal.present();

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

@@ -1,26 +1,11 @@
-<ion-header class="ion-no-border">
-  <ion-toolbar class="ion-no-border bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
 
-</ion-header>
 <ion-content>
-  <div class="content-top"></div>
+
   <div class="content-container">
     <div *ngIf="publication.Title != ''">
-    <div class="title-content">
+    <div class="title-content px-20" (click)="close()">
       <div class="back-icon">
-        <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
       </div>
       <div class="div-title">
         <ion-label class="title"> {{publication.Title}}</ion-label>
@@ -39,7 +24,7 @@
       <div *ngIf="publication.FileBase64.length < 30" class="post-img">
         <img src="/assets/icon/icon-no-image.svg" alt="image">
       </div>
-      <div class="post-description">
+      <div class="post-description px-20">
         <p>{{publication.Message}}</p>
       </div>
     </div>
@@ -67,6 +52,7 @@
     </div>
   </div>     
 </ion-content>
+
 <ion-footer>
   <ion-toolbar class="footer-toolbar">
     <ion-buttons slot="start">

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

@@ -14,7 +14,6 @@
     border-width: 0 !important;
   }
   .div-top-header{
-    width: 400px;
     margin: 0 auto;
     background-color: #0782c9;
     overflow: auto;
@@ -41,7 +40,6 @@
     margin-right: 10px;
   }
   .content-top{
-    width: 344px;
     background: #f3f2f2;
     height: 20px;
     margin: 0 auto;
@@ -60,10 +58,8 @@
     overflow: auto;
   }
   .title-content{
-    width: 360px;
     margin: 0px auto;
     overflow: auto;
-    padding: 0 !important;
   }
   .back-icon{
     width: auto;
@@ -72,7 +68,6 @@
     overflow: auto;
   }
   .div-title{
-      width: 270px;
     /* padding: 0!important; */
     float: left;
     margin: 2.5px 0 0 5px;
@@ -93,7 +88,6 @@
     object-fit: cover;
 }
 .post-description{
-  width: 360px;
   margin: 0 auto;
   margin-bottom: 35px;
 }

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

@@ -90,7 +90,7 @@ export class PublicationDetailPage implements OnInit {
         publicationType: publicationType,
         publication: this.publication,
       },
-      cssClass: 'new-publication',
+      cssClass: 'new-publication modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();

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

@@ -1,35 +1,20 @@
-<ion-header class="ion-no-border">
+
-  <ion-toolbar class="bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
-</ion-header>
 
 <ion-header class="ion-no-border">
   <ion-toolbar class="bg-blue">
-  <div class="content-top"></div>
   <div class="main-header">
-    <div class="title-content">
+    <div class="title-content d-flex">
-      <div class="back-icon">
+      <div class="back-icon" (click)="close()">
-        <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
       </div>
-      <div class="div-title">
+      <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>
       </div>
-      <div class="actions-icon">
+      <div class="actions-icon" (click)="AddPublication('2',item.ProcessId)">
        <!--  <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  slot="end" src='assets/images/icons-add.svg'></ion-icon>
       </div>
     </div>
   </div>
@@ -54,7 +39,7 @@
         <div *ngIf="publication.FileBase64.length < 30" class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>
-        <div class="post-content">
+        <div class="post-content px-20">
           <div class="post-title-time">
             <div class="post-title">
               <ion-label>{{publication.Title}}</ion-label>
@@ -70,7 +55,7 @@
         <div class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>
-        <div class="post-content">
+        <div class="post-content px-20">
           <div class="post-title-time">
             <div class="post-title">
               <ion-label><ion-skeleton-text animated animated style="width: 60%;"></ion-skeleton-text></ion-label>
@@ -85,7 +70,7 @@
         <div class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>
-        <div class="post-content">
+        <div class="post-content px-20">
           <div class="post-title-time">
             <div class="post-title">
               <ion-label><ion-skeleton-text animated animated style="width: 60%;"></ion-skeleton-text></ion-label>

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

@@ -66,7 +66,6 @@
     padding: 15px 20px 0 20px;
   }
   .content-top{
-    width: 344px;
     background: #f3f2f2;
     height: 20px;
     margin: 0 auto;
@@ -86,7 +85,6 @@
     overflow: auto;
   }
   .title-content{
-    width: 360px;
     margin: 0px auto;
     overflow: auto;
     padding: 0 !important;
@@ -100,7 +98,6 @@
     
   }
   .div-title{
-      width: 221px;
     /* padding: 0!important; */
     float: left;
     margin: 2.5px 0 0 5px;
@@ -148,7 +145,6 @@
       object-fit: cover;
   }
   .post-content{
-    width: 360px;
     margin: 0 auto;
     margin-bottom: 35px;
   }

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

@@ -93,7 +93,7 @@ export class ViewPublicationsPage implements OnInit {
         publicationType: publicationType,
         folderId: folderId,
       },
-      cssClass: 'new-publication',
+      cssClass: 'new-publication modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();
@@ -109,7 +109,7 @@ export class ViewPublicationsPage implements OnInit {
         publicationId: publicationId,
         folderId: this.folderId,
       },
-      cssClass: 'publication-detail',
+      cssClass: 'publication-detail modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/search/search.page.html

@@ -146,7 +146,11 @@
                       src="assets/images/icons-viagem.svg"></ion-icon>
                   </div>
                   <div class="content ion-align-items-center">
-                    <p class="result-name">{{ searchDocument.Assunto}}</p>
+                    
+                    <div class="d-flex ion-justify-content-between ">
+                      <span class="result-name">{{ searchDocument.Assunto}}</span>
+                      <span class="app-name" *ngIf="currentPath == '/home/gabinete-digital' ">{{ searchDocument.appName}}</span>
+                    </div>
                     <div class="d-flex ion-justify-content-between ">
                       <span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
                       <span class="documente-date">{{ formateIsoDate(searchDocument.Data) }}</span>

src/app/pages/search/search.page.scss

@@ -155,7 +155,7 @@ ion-slide{
       .content{
         width: 100%;
         margin-left: 10px;
-        p{
+        .result-name{
           margin: 0px;
           width: 100%;
           font-family: Roboto;
@@ -169,6 +169,22 @@ ion-slide{
           font-weight: 300;
           color: #797979;
         }
+        .app-name{
+          background: #42b9f2;
+          border-radius: 18px;
+          text-align: center;
+          display: flex;
+          align-items: center;
+          padding: 0px 5px;
+          color: white;
+          font-size: 9pt;
+          font-weight: 500;
+          height: 19px;
+          -webkit-border-radius: 18px;
+          -moz-border-radius: 18px;
+          -ms-border-radius: 18px;
+          -o-border-radius: 18px;
+        }
         span.documente-date{
 
         }

src/app/pages/search/search.page.ts

@@ -36,6 +36,8 @@ export class SearchPage implements OnInit {
 
   showLoader: boolean;
 
+  currentPath: string
+
   // See http://idangero.us/swiper/api/ for valid options.
   slideOpts = {
     slidesPerView: parseInt(`${window.innerWidth/147}`, 10),
@@ -53,6 +55,8 @@ export class SearchPage implements OnInit {
     private search: SearchService,
     private modalCtrl: ModalController,) {
       this.ordinance = "recent";
+
+      this.currentPath= window.location.pathname;
     }
 
   ngOnInit() {
@@ -220,6 +224,7 @@ export class SearchPage implements OnInit {
         // bind respose
 
         this.sortArrayISODate(res.Documents).forEach(e => {
+          e['appName'] = 'Correspondencia'
           this.searchDocuments.push(e)
         });
 
@@ -245,6 +250,7 @@ export class SearchPage implements OnInit {
         
 
         this.sortArrayISODate(res.Documents).forEach(e => {
+          e['appName'] = 'ArquivoDespachoElect'
           this.searchDocuments.push(e)
         });
 

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -1,6 +1,6 @@
 <ion-content>
   <div class="title width-100">
-    <div class="title-container">
+    <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon class="title-icon" name="reload-circle"></ion-icon>

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

@@ -108,7 +108,6 @@
   
   .actions-icon{
     display: flex;
-    overflow: auto;
     align-items: top;
     justify-content: flex-end;
     padding: 0 !important;
@@ -116,7 +115,6 @@
   .actions-icon ion-icon{
       margin-left: 5px;
       font-size: 35px;
-      float: right;
       padding: 0 !important;
   }
   /* .title-icon{

src/global.scss

@@ -399,24 +399,7 @@ border-top: 1px solid #d8d8d8;
 
 
 
-.gabinete-digital-mobile-modal-to-Desktop{
+
-    top: 75px;
-    left: 340px;
-    transform: none !important;
-    ion-backdrop{
-      display: none;
-      transform: none !important;
-    }
-    .modal-wrapper{
-      transform: none !important;
-        width: 100%;
-        height: 100%;
-        box-shadow: none !important;
-        .ion-page {
-          transform: none !important;
-        }
-    }
-}
 
 .chat-mobile-modal-to-Desktop{
     top: 75px;
@@ -438,20 +421,6 @@ border-top: 1px solid #d8d8d8;
 }
 
 @media only screen and (min-width: 1365px) {
-  .gabinete-digital-mobile-modal-to-Desktop{
-    //top: 75px;
-    left: 40%;
-
-    .modal-wrapper{
-      transform: none !important;
-        width: 100%;
-        height: 100%;
-        box-shadow: none !important;
-        .ion-page {
-          transform: none !important;
-        }
-    }
-  }
 
   .search-modal{
     ion-backdrop{
@@ -490,9 +459,7 @@ border-top: 1px solid #d8d8d8;
     }
 }
 
-.gabinete-digital-mobile-modal-to-Desktop{
+
-    border-top-right-radius: 27px;
-}
 
 /* Breakpoints */
 ._xs{