git pull made

2026-04-18 20:47:54 +00:00 · 2023-02-13 18:59:23 +01:00
parent 34c0447d24 b84161765e
commit 354059592a
47 changed files with 233 additions and 90 deletions
@@ -38,9 +38,8 @@ export class AproveEventService {

  async GetTasksListEventosPR() {
    try {
-      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-      let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-      let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+      let eventsPRList = prEventsOficial
      eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
  
      return eventsPRList;
@@ -164,7 +164,7 @@ export class DocumentSetUpMeetingPage implements OnInit {

  setEndDate() {
    if(!this.postData.EndDate) {
-      this.postData.EndDate = this.postData.StartDate;
+      this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
    }
  }

@@ -463,6 +463,13 @@ export class DocumentSetUpMeetingPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
  checkRoleInArray(str) {
    return this._eventService.calendarRole.includes(str);
  }
@@ -86,7 +86,7 @@
          <div *ngIf="loadedEvent.Body.Text">
            <h5>Detalhes</h5>
            <ion-item lines="none" class="ion-no-margin ion-no-padding">
-              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+              <pre class="width-100 text">{{ loadedEvent.Body.Text }} </pre>
            </ion-item>
            <div class="line"></div>
          </div>
@@ -10,4 +10,6 @@ export let GetTasksListType:
 "Agenda Oficial PR" |
 "image/x-icon" |
 "Despacho" |
-"Agendar Evento"
+"Agendar Evento" |
+"Agenda Oficial MDGPR,Agenda Pessoal MDGPR" |
+"Agenda Oficial PR,Agenda Pessoal PR"
@@ -134,7 +134,6 @@
                  <input matInput [ngxMatDatetimePicker]="picker1"
                    placeholder="Choose a date"
                    [(ngModel)]="postEvent.StartDate"
-                    [min]="currentDate"
                    [max]="maxDate"
                    [disabled]="disabled"
                  >
@@ -62,13 +62,11 @@ export class EditEventPage implements OnInit {
  public showSeconds = false;
  public touchUi = false;
  public enableMeridian = false;
-  public minDate = new Date().toISOString().slice(0,10)
  public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10)
  public maxDate: any;
  public stepHour = 1;
  public stepMinute = 15;
  public stepSecond = 15;
-  currentDate = this.roundTimeQuarterHour();

  loadedEventAttachments: Attachment[] = [];
  taskParticipants: any = [];
@@ -193,6 +191,13 @@ export class EditEventPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
  onSelectedRecurringChanged(ev?:any) {

    this.calculetedLastOccurrence(ev);
@@ -51,7 +51,6 @@ export class NewEventPage implements OnInit {
  public stepMinute = 15;
  public stepSecond = 15;
  public color: ThemePalette = 'primary';
-  currentDate = this.roundTimeQuarterHour();

  Form: FormGroup;
  validateFrom = false
@@ -87,6 +86,7 @@ export class NewEventPage implements OnInit {
  autoEndTime;
  CalendarNamesOptions = ['Oficial', 'Pessoal']
  roomId:string;
+  globalEnd = new Date('1999')

  constructor(
    private modalController: ModalController,
@@ -189,7 +189,7 @@ export class NewEventPage implements OnInit {

  setDefaultTime() {
    this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
  }

  close() {
@@ -218,6 +218,12 @@ export class NewEventPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
  setStartDate() {
    if(!this.postEvent.StartDate) { 
      this.postEvent.StartDate = this.roundTimeQuarterHour();
@@ -57,7 +57,7 @@
          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
            <h5>Detalhes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+                <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
            </ion-item>
          </div>
        </div>
@@ -55,7 +55,7 @@
          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
            <h5>Detalhes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+                <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
            </ion-item>
          </div>
        </div>
@@ -54,7 +54,7 @@
        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
          <h5>Detalhes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
          </ion-item>
        </div>
      </div>
@@ -53,7 +53,7 @@
        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
          <h5>Detalhes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
          </ion-item>
        </div>
      </div>
@@ -56,7 +56,7 @@
        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
          <h5>Detalhes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+              <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
          </ion-item>
        </div>
      </div>
@@ -83,7 +83,7 @@
    <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
    <h5>Detalhes</h5>
    <ion-item lines="none" class="ion-no-padding ion-no-margin">
-      <div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>
+      <pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
    </ion-item>
  </div>
  <div class="line"></div>
@@ -85,7 +85,7 @@
            <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
              <h5>Detalhes</h5>
              <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                  <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+                <pre class="width-100 text">{{loadedEvent.workflowInstanceDataFields.Body }} </pre>
              </ion-item>
              <div class="line"></div>
            </div>
@@ -156,9 +156,8 @@ export class EventListPage implements OnInit {

      
      if (this.segment != 'PR') {
-        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-        this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+        this.eventsMDGPRList = mdEventsOficial

        this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
        this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
@@ -170,9 +169,9 @@ export class EventListPage implements OnInit {
        
      }
      else if (this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+
+        this.eventsPRList = prEventsOficial
        
        this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
        this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
@@ -135,8 +135,9 @@ export class BookMeetingModalPage implements OnInit {
      this.postData.Subject = this.task.Folio;
      this.postData.CalendarName = "Oficial";

-     this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
-     this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour())));
+      let startDate = this.roundTimeQuarterHour()
+     this.dateControlStart = new FormControl(moment(startDate));
+     this.dateControlEnd = new FormControl(moment(this.roundTimeQuarterHourPlus15(startDate)));

     this.postData.Category = 'Reunião'

@@ -201,7 +202,7 @@ export class BookMeetingModalPage implements OnInit {
  
  setDefaultTime() {
    this.postData.StartDate =  this.roundTimeQuarterHour();
-    this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000))
+    this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
  }

  getAttachments() {
@@ -521,6 +522,15 @@ export class BookMeetingModalPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
+  
+
  setStartDate() {
    this.postData.StartDate = this.roundTimeQuarterHour();
  }
@@ -51,7 +51,7 @@
          </div>
          <h5>Detalhes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="task.Note"></p>
+              <pre class="width-100 text">{{ task.Note }} </pre>
          </ion-item>
        </div>
        <div class="bottom-content width-100">
@@ -59,7 +59,7 @@
          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
            <h5>Detalhes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+              <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
            </ion-item>
          </div>
        </div>
@@ -193,6 +193,20 @@
                <p class="text-center exp-card-content"> {{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
              </div>

+              
+              <!-- List -->
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+                </div>
+                <p class="text-center exp-card-title">Diplomas para Assinar</p>
+                <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
+              </div>
+              

              <!-- List -->
              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -206,18 +220,6 @@
                <p class="text-center exp-card-content"> {{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
              </div>

-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title">Diplomas para Assinar</p>
-                <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
-              </div>

              <!-- List -->
              <div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidencial"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -147,6 +147,9 @@ export class GabineteDigitalPage implements OnInit {
    }

    this.checkRoutes();
+
+    window['all-process-gabinete'] = this.updateAllProcess
+
  }
  closeAllDesktopComponent() {
    this.desktopComponent = {
@@ -593,7 +596,7 @@ export class GabineteDigitalPage implements OnInit {
    this.showDiplomasGerar = false
  }

-  updateAllProcess() {
+  updateAllProcess = () => {
    this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
    .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list)
@@ -609,6 +612,10 @@ export class GabineteDigitalPage implements OnInit {
    //   .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
    //   .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
    // }
+    if(window['all-process']) {
+      window['all-process']()
+    }
+
  }

  get getAllProcessCount() {
@@ -725,9 +732,8 @@ export class GabineteDigitalPage implements OnInit {
      this.updateAllProcess()
    }

-    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-    let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-    let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+    let eventsMDGPRList = mdEventsOficial
    
    eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')

@@ -735,9 +741,8 @@ export class GabineteDigitalPage implements OnInit {
    this.eventoaprovacaostore.resetmd(eventsMDGPRList);
    this.updateAllProcess()

-    let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
-    let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
-    let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+    let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+    let eventsPRList = prEventsOficial
    eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')

    this.eventoaprovacaostore.countPr = eventsPRList.length
@@ -57,7 +57,7 @@
          <div *ngIf="task.Note">
            <h5>Detalhes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="task.Note"></p>
+                <pre class="width-100 text">{{ task.Note }} </pre>
            </ion-item>
          </div>
        </div>
@@ -37,7 +37,6 @@
            <input matInput [ngxMatDatetimePicker]="picker1"
              placeholder="Choose a date*"
              [formControl]="folder.DateBegin"
-              [min]="minDate"
              [disabled]="disabled"
            >
            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -18,7 +18,6 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatSelectModule } from '@angular/material/select';
 import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
-import { MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
 import { MatDialogModule } from '@angular/material/dialog';
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
    this.folder = new PublicationFolder();

    this.dateControlStart = new FormControl(this.roundTimeQuarterHour());
-    this.dateControlEnd = new FormControl(this.dateControlStart.value);
+    this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value));


  }
@@ -177,4 +177,11 @@ export class NewActionPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
 }
@@ -92,7 +92,7 @@
            <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
              <h5>Detalhes</h5>
              <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                  <p class="text" [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+                  <pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
              </ion-item>
              <div class="line"></div>
            </div>
@@ -158,7 +158,6 @@
                  <input matInput [ngxMatDatetimePicker]="picker1"
                    placeholder="Choose a date"
                    [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
-                    [min]="minDate" [max]="maxDate"
                    [disabled]="disabled"
                  >
                  <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -119,7 +119,6 @@
              [(ngModel)]="postEvent.StartDate"
              [max]="maxDate"
              [disabled]="disabled"
-              [min]="currentDate"
            >
            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
            <ngx-mat-datetime-picker #picker1
@@ -48,7 +48,6 @@ export class EditEventPage implements OnInit {
  public stepHour = 1;
  public stepMinute = 15;
  public stepSecond = 15;
-  currentDate = this.roundTimeQuarterHour();

  Form: FormGroup;
  validateFrom = false
@@ -238,6 +237,13 @@ export class EditEventPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
  onSelectedRecurringChanged(ev:any){

    this.calculetedLastOccurrence(ev);
@@ -88,9 +88,8 @@ export class EventListPage implements OnInit {
        this.showLoader = false;
      }
      else if(this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        let allEvents = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+        let allEvents = prEventsOficial
        
        if(allEvents.length > 0) {
          this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
@@ -115,19 +114,17 @@ export class EventListPage implements OnInit {
    
    try {
      if(this.segment == 'MDGPR') {
-        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-  
-        let allEvents = mdEventsOficial.concat(mdEventsPessoal);
+        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+
+        let allEvents = mdEventsOficial
        if(allEvents.length > 0) {
          this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
        }
        this.showLoader = false;
      }
      else if(this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        let allEvents = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+        let allEvents = prEventsOficial
        
        if(allEvents.length > 0) {
          this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
@@ -136,7 +136,6 @@
              placeholder="Data Inicio*"
              [(ngModel)]="postEvent.StartDate"
              [disabled]="disabled"
-              [min]="currentDate"
            >
            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
            <ngx-mat-datetime-picker #picker1              
@@ -227,7 +227,7 @@ export class NewEventPage implements OnInit {

  setDefaultTime() {
    this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
  }

  roundTimeQuarterHour(timeToReturn = new Date()): Date {
@@ -254,6 +254,13 @@ export class NewEventPage implements OnInit {
    return date
  }

+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+

  roundTimeQuarterHour1 (timeToReturn) {
    let date: any = new Date(timeToReturn) || new Date();
@@ -41,6 +41,8 @@ export class AllProcessesPage implements OnInit {
    public ThemeService: ThemeService
  ) {
    this.loggeduser = SessionStore.user;
+
+    window['all-process'] = this.updateAllProcess
  }

  ngOnInit() {
@@ -62,9 +64,9 @@ export class AllProcessesPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        try {
-  event?.target?.complete();
-} catch(error) {}
+      try {
+        event?.target?.complete();
+      } catch(error) {}
      }, 2000);
    }
    setTimeout(() => {
@@ -79,7 +81,7 @@ export class AllProcessesPage implements OnInit {
    }, 1000);
  }

-  updateAllProcess() {
+  updateAllProcess = () => {
    this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
    .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list)
@@ -155,7 +157,7 @@ export class AllProcessesPage implements OnInit {
      else if (activityName == 'Diploma Assinado') {
        this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
      } else {
-        alert('Bug!');
+        throw('Bug!');
      }
    }
    else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -113,7 +113,6 @@
                    placeholder="Choose a date"
                    [(ngModel)]="startDate"
                    [disabled]="disabled"
-                    [min]="currentDate"
                  >
                  <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                  <ngx-mat-datetime-picker #picker1
@@ -141,7 +140,6 @@
                    placeholder="Choose a date"
                    [(ngModel)]="endDate"
                    [disabled]="disabled"
-                    [min]="currentDate"
                  >
                  <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
                  <ngx-mat-datetime-picker #fim
@@ -71,9 +71,8 @@ export class EventsToApprovePage implements OnInit {
    
    this.getFromDB();
    if(this.segment != 'PR') {
-      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-      let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-      this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+      this.eventsMDGPRList = mdEventsOficial
      this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
      this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
        return item.activityInstanceName != 'Editar Evento'
@@ -86,11 +85,10 @@ export class EventsToApprovePage implements OnInit {
      this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
    }
    else if(this.segment == 'PR') {
-      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-      let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
      // console.log(prEventsOficial)
      // console.log(prEventsPessoal)
-      this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+      this.eventsPRList = prEventsOficial
      this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
      this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
        return item.activityInstanceName != 'Editar Evento'
@@ -49,7 +49,7 @@
      <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
        <h5>Detalhes</h5>
        <ion-item class="ion-no-margin ion-no-padding">
-            <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+          <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
        </ion-item>
      </div>
    </div>
@@ -37,7 +37,6 @@
            <input matInput [ngxMatDatetimePicker]="picker1"
              placeholder="Choose a date*"
              [(ngModel)]="folder.DateBegin"
-              [min]="currentDate"
              [disabled]="disabled"
            >
            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -185,6 +185,13 @@ export class NewActionPage implements OnInit {

    return date
  }
+
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
  

  setStartDate() {
@@ -192,6 +199,6 @@ export class NewActionPage implements OnInit {
  }

  setEndDate() {
-    this.folder.DateEnd = this.folder.DateBegin;
+    this.folder.DateEnd = this.roundTimeQuarterHourPlus15(this.folder.DateBegin);
  }
 }
@@ -105,6 +105,12 @@ export class DeplomasService {
    this._diplomasAssinadoListCount = value.length
    this._diplomasAssinadoList = value
    this.saveDiplomasAssinadoList()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  resetDiplomasParaAssinar(value: any[]) {
@@ -112,12 +118,26 @@ export class DeplomasService {
    this._diplomasListCount = value.length
    this._diplomasParaAssinar = value
    this.saveDiplomasParaAssinar()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  resetDiplomasReview(value: any[]) {
    this._diplomasReviewList =value
    this._diplomasReviewCount = value.length
    this.saveDiplomasReviewList()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  resetDiplomaGerar(value: any[]) {
@@ -126,6 +146,12 @@ export class DeplomasService {
    this._diplomasGerarList = value

    this.savetDiplomaGerar()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }


@@ -109,6 +109,13 @@ export class DespachoStoreService {
  reset(eventsList: any) {
    this._list = eventsList
    this.save({dynamicCount:true})
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private save = ({dynamicCount = false})=> {
@@ -38,6 +38,13 @@ reset(eventsList: any) {

  this.count = this._list.length
  this.save()
+
+  if(window['all-process']) {
+    window['all-process']()
+  }
+  if(window['all-process-gabinete']) {
+    window['all-process-gabinete']()
+  }
 }

 private save() {
@@ -63,7 +63,15 @@ export class EventoaprovacaoStoreService {
      this.count = this.countPr + this.countMd

      this.savePr()
+
+      if(window['all-process']) {
+        window['all-process']()
+      }
+      if(window['all-process-gabinete']) {
+        window['all-process-gabinete']()
+      }
    }
+    
  }

  resetmd(eventsList: any) {
@@ -73,6 +81,14 @@ export class EventoaprovacaoStoreService {
      this.countMd = this._listMd.length
      this.count = this.countPr + this.countMd
      this.saveMd()
+
+
+      if(window['all-process']) {
+        window['all-process']()
+      }
+      if(window['all-process-gabinete']) {
+        window['all-process-gabinete']()
+      }
    }
  }

@@ -36,6 +36,13 @@ export class ExpedientegdStoreService {
  reset(eventsList: any) {
    this._list = eventsList
    this.save()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private save() {
@@ -62,6 +62,12 @@ export class PedidosStoreService {
 
    this.countparecer = this._listParecer.length
    this.saveDeferimento()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }
 
  resetdeferimento(list: any) {
@@ -69,6 +75,12 @@ export class PedidosStoreService {
 
   this.countdeferimento =this._listDeferimento.length
   this.saveParecer()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private saveParecer() {
@@ -42,6 +42,12 @@ export class PendestesStoreService {

    this.count = this._list.length
    this.save()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private save() {
@@ -32,6 +32,12 @@ export class PresidentialActionsStoreService {
    this._list = list

    this.save(this._list)
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private save(list: Publication[]) {
@@ -38,6 +38,12 @@ export class ToDayEventStorageService {
  reset(eventsList: EventList[]) {
    this._eventsList = eventsList
    this.save()
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
  }

  private save() {
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "c82029edf",
-  "SHA": "c82029edf82df3c59548d76d6fd8d454872ae974",
+  "shortSHA": "34c0447d2",
+  "SHA": "34c0447d24ccdb21f79d2331b48c74495baa999f",
  "branch": "no_bug_movemente",
  "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Feb 13 16:35:38 2023 +0100'",
-  "lastCommitMessage": "Bug fix presenting role",
-  "lastCommitNumber": "4767",
+  "lastCommitTime": "'Mon Feb 13 18:57:15 2023 +0100'",
+  "lastCommitMessage": "required field solved and other bug",
+  "lastCommitNumber": "4768",
  "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 7 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/Rules/aprove-event.service.ts\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.html\n\tmodified:   src/app/models/GetTasksListType.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/pages/publications/new-action/new-action.module.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified:   src/app/shared/publication/new-action/new-action.page.ts\n\tmodified:   src/app/store/deplomas.service.ts\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/eventoaprovacao-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts\n\tmodified:   src/app/store/pedidos-store.service.ts\n\tmodified:   src/app/store/pendestes-store.service.ts\n\tmodified:   src/app/store/presidential-actions-store.service.ts\n\tmodified:   src/app/store/to-day-event-storage.service.ts",
  "changeAuthor": "eudes.inacio"
 }