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

src/app/pages/agenda/agenda.page.html

@@ -223,14 +223,13 @@
             <div  class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
 
-                <div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
-                  <div class="day EventListBox-day mt-10"  *ngIf="shoeEventDay(events.value)">
+                <div class="EventListBox-container" >
+                  <div class="day EventListBox-day mt-10" >
                     {{ TimelineDayEvent(events.key)}}
                   </div>
                   <div *ngFor="let event of events.value" class="EventListBox"  >
 
-                    <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
+                    <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)">
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -263,16 +262,20 @@
             <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
 
-                <div class="EventListBox-container"  *ngIf="CalendarCurrentDay <= events.key">
+                <div class="EventListBox-container"  >
 
-                  <div class="day mt-10" *ngIf="shoeEventDay(events.value)">
+                  <div class="day mt-10" >
                     {{ TimelineDayEvent(events.key)}}
                   </div>
 
                   <div *ngFor="let event of events.value" class="EventListBox"   >
 
+<<<<<<< HEAD
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
                       *ngIf="viewEventMonth <= dateMonth(event) &&  showEventBox(event) ">
+=======
+                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)">
+>>>>>>> 5de16776a2d0d5cddbb186151ec203ae12509873
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>

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

@@ -290,6 +290,7 @@ export class AgendaPage implements OnInit {
     // calendar change date
     this.eventSelectedDate = new Date(ev);
 
+    this.updateEventListBox()
   };
 
   // changedate
@@ -461,7 +462,7 @@ export class AgendaPage implements OnInit {
                 // loop
                 this.calendarService.pushEvent(response, 'md');
 
-                this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+                this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
                 this.myCal.update();
                 this.myCal.loadEvents();
@@ -482,7 +483,7 @@ export class AgendaPage implements OnInit {
               // calendar
               this.calendarService.pushEvent(response, 'pr');
 
-              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -508,7 +509,7 @@ export class AgendaPage implements OnInit {
                 this.calendarService.pushEvent(response, 'pr');
 
 
-                this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+                this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
 
                 this.myCal.update();
@@ -536,7 +537,7 @@ export class AgendaPage implements OnInit {
               this.calendarService.pushEvent(eventsList, 'md');
 
 
-              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -556,7 +557,7 @@ export class AgendaPage implements OnInit {
               const eventsList = response.filter(data => data.CalendarName == "Pessoal");
               this.calendarService.pushEvent(eventsList, 'pr');
 
-              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -607,7 +608,7 @@ export class AgendaPage implements OnInit {
               this.calendarService.pushEvent(eventsList, 'pr');
 
 
-              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+              this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -638,7 +639,7 @@ export class AgendaPage implements OnInit {
           // loop
           this.calendarService.pushEvent(eventsList, 'md');
 
-          this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+          this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
           this.myCal.update();
           this.myCal.loadEvents();
@@ -667,7 +668,7 @@ export class AgendaPage implements OnInit {
 
           this.calendarService.pushEvent(eventsList, 'pr');
 
-          this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+          this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
           this.myCal.update();
           this.myCal.loadEvents();
@@ -705,7 +706,7 @@ export class AgendaPage implements OnInit {
 
         this.calendarService.pushEvent(eventsList, 'pr');
 
-        this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+        this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
 
         this.myCal.update();
@@ -732,174 +733,11 @@ export class AgendaPage implements OnInit {
 
   updateEventListBox() {
 
-    this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
-    this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+    this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+    this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
   }
 
-  eventListBox(list, nice?) {
-    let days = {};
-
-    list.forEach( (event:any)=> {
-
-      var startDate: any = new Date(event.start);
-
-      var endDate: any = this.EventTretment({
-        startTime: startDate,
-        endTime: event.end
-      })
-
-      const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0')
-
-      event.manyDays = false
-
-
-      event.todayOnly = new Date(event.start).toLocaleDateString() == new Date(event.end).toLocaleDateString()
-
-
-
-      if(!days.hasOwnProperty(day)) {
-        days[day] = []
-      }
-
-      if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
-
-        // difference
-        const diffTime = Math.abs(endDate - startDate);
-        const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-
-        if (diffDays <= 150 && !event.event.IsAllDayEvent  ) {
-
-
-          if (diffDays >= 1) {
-
-            const StartEvent =  Object.assign({}, {
-              title: event.title,
-              start: event.start,
-              end: event.end,
-              color: event.color,
-              id: event.id,
-              index: event.index,
-              profile: event.profile,
-              CalendarName: event.CalendarName,
-              event: {
-                Subject: event.event.Subject,
-                StartDate:  event.event.StartDate,
-                EndDate: event.event.EndDate,
-                Location:  event.event.Location,
-                EventId:  event.event.EventId,
-                CalendarName: event.event.CalendarName
-              },
-              startMany: true,
-              endMany: false,
-              middle: false
-            })
-
-            days[day].push(StartEvent)
-
-            let i = 1;
-
-            while (startDate.getFullYear() !=  endDate.getFullYear() ||
-              startDate.getMonth() != endDate.getMonth() ||
-              startDate.getDate() != endDate.getDate()) {
-
-              const newDate = startDate.setDate(startDate.getDate()+ i)
-
-              let otherDays =   (((new Date (newDate)).getDate())).toString().padStart(2,'0')
-
-              event.other = true
-
-              event.start = newDate
-              if(!days.hasOwnProperty(otherDays)) {
-
-                days[otherDays] = []
-              }
-
-              if (!(startDate.getFullYear() !=  endDate.getFullYear() ||
-              startDate.getMonth() != endDate.getMonth() ||
-              startDate.getDate() != endDate.getDate())) {
-                // last push
-
-                const EndEvent =  Object.assign({}, {
-                  title: event.title,
-                  start: event.start,
-                  end: event.end,
-                  color: event.color,
-                  id: event.id,
-                  index: event.index,
-                  profile: event.profile,
-                  CalendarName: event.CalendarName,
-                  event: {
-                    Subject: event.event.Subject,
-                    StartDate:  event.event.StartDate,
-                    EndDate: event.event.EndDate,
-                    Location:  event.event.Location,
-                    EventId:  event.event.EventId,
-                    CalendarName: event.event.CalendarName
-                  },
-                  Subject: event.Subject,
-                  startMany: false,
-                  endMany: true,
-                  middle: false
-                })
-
-                days[otherDays].push(EndEvent)
-
-              } else {
-                const EndEvent =  Object.assign({}, {
-                  title: event.title,
-                  start: event.start,
-                  end: event.end,
-                  color: event.color,
-                  id: event.id,
-                  index: event.index,
-                  profile: event.profile,
-                  CalendarName: event.CalendarName,
-                  event: {
-                    Subject: event.event.Subject,
-                    StartDate:  event.event.StartDate,
-                    EndDate: event.event.EndDate,
-                    Location:  event.event.Location,
-                    EventId:  event.event.EventId,
-                    CalendarName: event.event.CalendarName
-                  },
-                  Subject: event.Subject,
-                  startMany: false,
-                  endMany: true,
-                  middle: true
-                })
-                days[otherDays].push(EndEvent)
-              }
-
-            }
-
-          } else {
-            days[day].push(event)
-
-          }
-        } else {
-          days[day].push(event)
-
-        }
-
-      }
-
-      days[day].push(event)
-
-    })
-
-    setTimeout(()=>{
-      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
-        if(e.childElementCount == 0) {
-          e.parentElement.style.display = 'none'
-        } else {
-          e.parentElement.style.display = 'block'
-        }
-      })
-    }, 10)
-
-    return days
-  }
 
   get viewEventMonth () {
     return  this.viewDate.getMonth()
@@ -932,13 +770,13 @@ export class AgendaPage implements OnInit {
     if(this.profile == "mdgpr") {
       this.profile ="pr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {})
+      this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
 
     }
     else {
       this.profile ="mdgpr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+      this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
     }
 
   }
@@ -1224,26 +1062,10 @@ export class AgendaPage implements OnInit {
     }
     this.showTimelineFilterState = false;
 
-    setTimeout(()=>{
-      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
-        if(e.childElementCount == 0) {
-          e.parentElement.style.display = 'none'
-        } else {
-          e.parentElement.style.display = 'block'
-        }
-      })
-    }, 10)
 
+    // THIS LINE
+    this.updateEventListBox()
 
-    setTimeout(()=>{
-      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
-        if(e.childElementCount == 0) {
-          e.parentElement.style.display = 'none'
-        } else {
-          e.parentElement.style.display = 'block'
-        }
-      })
-    }, 100)
 
   }
 

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <div class="main-content d-flex height-100 px-20">
+  <div class="main-content d-flex height-100 pl-20 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header" >
         <div class="title-content width-100 d-flex justify-space-between align-center">
@@ -76,8 +76,8 @@
 
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 px-20">
-      <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
+    <div *ngIf="task" class="aside-right flex-column  height-100 overflow-y-auto">
+      <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div class="option-desc"> <div>Responder ao PR</div> </div>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
         <!-- <div class="solid"></div> -->
@@ -92,7 +92,7 @@
         <!-- <div class="solid"></div> -->
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
-      <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
+      <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
         <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

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

@@ -3,7 +3,7 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between align-center">
@@ -83,7 +83,7 @@
 
 
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html

@@ -3,7 +3,7 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <button (click)="Assinar()" class="btn-cancel" shape="round" >Assinado</button>
         <div class="solid"></div>

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

@@ -3,7 +3,7 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
@@ -73,7 +73,7 @@
       </div>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>

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

@@ -95,7 +95,7 @@
         <div class="option-desc"> <div>Outras opções</div> </div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -7,7 +7,7 @@
 </div>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header" style="overflow: unset !important;">
         <div class="title-content width-100 d-flex justify-between">
@@ -104,7 +104,7 @@
       </div>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div *ngIf="loggeduser.Profile =='MDGPR' " class="buttons">
         <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>

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

@@ -3,7 +3,7 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header ">
         <div class="title-content width-100 d-flex justify-space-between ">
@@ -78,7 +78,7 @@
 
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>

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

@@ -6,6 +6,7 @@ import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { ImageModalPage } from '../../gallery/image-modal/image-modal.page';
 import { NewPublicationPage } from '../../new-publication/new-publication.page';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-publication-detail',
@@ -26,6 +27,7 @@ export class PublicationDetailPage implements OnInit {
     private toastService: ToastService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
+    private location: Location,
     ) {
 
       this.activatedRoute.paramMap.subscribe(params => {
@@ -93,7 +95,7 @@ export class PublicationDetailPage implements OnInit {
     if(this.isModal) {
       this.close()
     } else {
-      this.router.navigate(['/home/publications', this.folderId]);
+      this.location.back();
     }
 
   }
@@ -110,8 +112,9 @@ export class PublicationDetailPage implements OnInit {
       this.toastService.badRequest('Publicaçao não eliminada')
     }  finally {
       loader.remove()
+      this.goBack();
     }
-    this.goBack();
+    
 
   }