tiny changes

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html

@@ -65,6 +65,7 @@
                   [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda"
                   interface="action-sheet" Cancel-text="Cancelar"
                   required
+                  [disabled]=true
                 >
                   <ion-select-option value="Oficial">Calendário Oficial</ion-select-option>
                   <ion-select-option value="Pessoal">Calendário Pessoal</ion-select-option>

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

@@ -44,6 +44,23 @@
 
     </div>
 
+
+    <div class="container-div">
+      <div class="ion-item-class-2 width-100 d-flex">
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
+        </div>
+        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom ">
+          <ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
+        </div>
+      </div>
+      <!-- Error messages -->
+      <!-- <span class="error ion-padding" >
+        Campo obrigatório
+      </span> -->
+
+    </div>
+
     <div *ngIf="Form && validateFrom" >
       <div *ngIf="Form.get('Location').invalid " class="input-errror-message">
         <div *ngIf="Form.get('Location').errors?.required">
@@ -63,12 +80,9 @@
         <div class="ion-input-class flex-grow-1">
 
           <mat-form-field appearance="none" floatLabel="never" class="width-100 " >
-            <mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
-              <mat-option value="Oficial">
-                Oficial
-              </mat-option>
-              <mat-option value="Pessoal">
-                Pessoal
+            <mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" [disabled]=true>
+              <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
+                Agenda {{ calendars }}
               </mat-option>
             </mat-select>
           </mat-form-field>

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

@@ -86,6 +86,9 @@ export class EditEventPage implements OnInit {
   private participantsPipe = new  ParticipantsPipe()
   sesseionStora = SessionStore
 
+  CalendarNameOwnerName = ''
+  CalendarNamesOptions = []
+
   constructor(
     private modalController: ModalController,
     private eventsService: EventsService,
@@ -131,6 +134,9 @@ export class EditEventPage implements OnInit {
     }, 500);
 
 
+    this.CalendarNameOwnerName = this.eventsService.detectCalendarNameByCalendarId(this.postEvent.CalendarId)
+    this.changeAgenda()
+
   }
 
   ngOnChanges(changes: any): void {
@@ -512,4 +518,27 @@ export class EditEventPage implements OnInit {
   }
 
 
+  changeAgenda() {
+
+    setTimeout(() => {
+
+      if(this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] &&  this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
+      
+        this.CalendarNamesOptions = ['Oficial', 'Pessoal']
+  
+      } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) {
+        this.CalendarNamesOptions = ['Oficial']
+        this.postEvent.CalendarName = 'Oficial'
+  
+      } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
+        this.CalendarNamesOptions = ['Pessoal']
+        this.postEvent.CalendarName = 'Pessoal'
+  
+      } else {
+        this.CalendarNamesOptions = ['Oficial', 'Pessoal']
+      }
+    }, 50)
+
+  }
+
 }

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

@@ -56,7 +56,7 @@
 
 
                 <mat-form-field appearance="none"  class="width-100" >
-                  <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
+                  <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" [disabled]="disabled">
                     <mat-option value="Oficial">
                       Calendário Oficial
                     </mat-option>

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

@@ -4,39 +4,6 @@
     <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title"><label>Eventos para Aprovação</label></span>
       <div class="d-flex align-center">
-
-
-        <!-- <div>
-          <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
-            <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
-              <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
-              <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src='assets/images/icons-search.svg'></ion-icon>
-              <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
-            </div>
-            <button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
-            </button>
-  
-            <div *ngIf="showSearch">
-              <div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
- 
-                <div class="input-text d-flex ion-align-items-center">
-                  <ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
-                    class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
-                </div>
-                
-   
-                <div (click)="basicSearch()"  class="d-flex align-center icon">
-  
-                  <ion-icon  class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
-      
-                </div>
-              </div>
-            </div>
-          </div>
-        </div> -->
-
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 

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

@@ -21,8 +21,6 @@ import { ThemeService } from 'src/app/services/theme.service'
 export class EventsToApprovePage implements OnInit {
 
   showLoader: boolean;
-  eventsPRList: any = [];
-  eventsMDGPRList: any = [];
   eventPerson: EventPerson;
   eventBody: EventBody;
   categories: string[];
@@ -76,7 +74,12 @@ export class EventsToApprovePage implements OnInit {
         if(pr) {
           this.segment = pr.OwnerUserId
         }
+
+        this.dynamicSearch();
+      } else {
+        this.dynamicSearch();
       }
+      
     })
 
     this.LoadToApproveEvents()
@@ -210,15 +213,7 @@ export class EventsToApprovePage implements OnInit {
   }
 
 
-  getFromDB() {
-    this.storage.get('event-to-aproveMD').then((events =  []) => {
-      this.eventsMDGPRList = events
-    })
-
-    this.storage.get('event-to-aprovePR').then((events) => {
-      this.eventsPRList = events
-    })
-  }
+  getFromDB() {}
 
 
   toDateString(e) {

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { TaskDetailContentPage } from './task-detail-content.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: TaskDetailContentPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class TaskDetailContentPageRoutingModule {}

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { TaskDetailContentPageRoutingModule } from './task-detail-content-routing.module';
+
+import { TaskDetailContentPage } from './task-detail-content.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    TaskDetailContentPageRoutingModule
+  ],
+  declarations: [TaskDetailContentPage],
+  exports: [TaskDetailContentPage]
+})
+export class TaskDetailContentPageModule {}

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html

@@ -0,0 +1,41 @@
+<ion-content>
+  <div *ngIf="task" class="overflow-y-auto height-100">
+    <div class="middle-content">
+      <h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
+      <ion-item class="ion-no-margin ion-no-padding">
+        <ion-label>
+          <div *ngFor="let interveniente of intervenientes">
+            <p>{{interveniente.Name}}</p>
+          </div>
+        </ion-label>
+      </ion-item>
+      <div *ngIf="cc.length > 0">
+        <h5 class="font-17-rem">Com conhecimento</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <div *ngFor="let c of cc">
+              <p>{{c.Name}}</p>
+            </div>
+          </ion-label>
+        </ion-item>
+      </div>
+      <div *ngIf="task.Note">
+        <h5 class="font-17-rem">Detalhes</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <pre class="width-100 text">{{ task.Note }} </pre>
+        </ion-item>
+      </div>
+    </div>
+    <div class="bottom-content width-100">
+      <ion-list>
+        <h5 class="font-17-rem">Documentos Anexados</h5>
+        <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
+          <ion-label class="d-block" (click)="viewDocument.emit(Document.DocId)">
+            <p class="attach-title-item">{{ Document.Assunto || "Sem assunto" }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+            <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+</ion-content>

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss

@@ -0,0 +1,206 @@
+@import '~src/function.scss';
+
+ion-header, ion-content {
+  background: white;
+}
+
+:host {
+  background-color: white;
+}
+
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: rem(18) !important;
+}
+.main-header{
+  overflow: inherit !important;
+  display: flex;
+  font-family: Roboto;
+  background-color: #fff;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+  .title-content{
+    display: flex;
+    justify-content: start !important;
+    align-items: flex-start !important;
+    border-radius: 0 !important;
+    }
+    .title{
+      width: fit-content;
+      height: auto;
+      font-size: rem(25);
+      overflow: auto;
+      float: left;
+      padding-left: 5px;
+    }
+    .div-icon{
+      width: 40px !important;
+      font-size: rem(35) !important;
+      text-align: start !important;
+      padding: 1px;
+    }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  font-size: rem(18);
+
+  .label{
+      border-radius: 20px;
+      background: var(--label-bg-color);
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+      font-size: rem(14);
+  }
+
+  .button-calendar-type ion-button{
+    height: rem(25);
+  }
+  .content-details{
+    font-size: rem(17);
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: rem(16);
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: rem(16);
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: rem(15);
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: rem(35);
+    float: left;
+  }
+  .attach-title-item{
+    font-size: rem(18);
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: rem(15);
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: rem(13);
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: rem(16) !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { TaskDetailContentPage } from './task-detail-content.page';
+
+describe('TaskDetailContentPage', () => {
+  let component: TaskDetailContentPage;
+  let fixture: ComponentFixture<TaskDetailContentPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TaskDetailContentPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TaskDetailContentPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.ts

@@ -0,0 +1,29 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
+@Component({
+  selector: 'app-task-detail-content',
+  templateUrl: './task-detail-content.page.html',
+  styleUrls: ['./task-detail-content.page.scss'],
+})
+export class TaskDetailContentPage implements OnInit {
+
+  @Input() task = new customTask();
+  @Input() intervenientes = []
+  @Input() cc = []
+  @Input() customDate = ''
+  @Input() fulltask = new fullTask()
+  
+  @Output() openOptions = new EventEmitter<any>();
+  @Output() goBack = new EventEmitter<any>();
+  @Output() viewDocument = new EventEmitter<any>();
+
+  constructor(
+    public ThemeService: ThemeService
+  ) { }
+
+  ngOnInit() {
+  }
+
+}

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { TaskDetailHeaderPage } from './task-detail-header.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: TaskDetailHeaderPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class TaskDetailHeaderPageRoutingModule {}

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { TaskDetailHeaderPageRoutingModule } from './task-detail-header-routing.module';
+
+import { TaskDetailHeaderPage } from './task-detail-header.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    TaskDetailHeaderPageRoutingModule
+  ],
+  declarations: [TaskDetailHeaderPage],
+  exports: [TaskDetailHeaderPage]
+})
+export class TaskDetailHeaderPageModule {}

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.html

@@ -0,0 +1,31 @@
+<ion-header *ngIf="task" class="ion-no-border">
+  <div class="main-header">
+    <div class="title-content width-100 d-flex justify-space-between align-center">
+      <div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack.emit()" defaultHref="#">
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+      </div>
+      <div class="middle d-flex align-center flex-grow-1">
+        <ion-label class="title">{{ task.Folio}}</ion-label>
+      </div>
+      <div class="div-icon" (click)="openOptions.emit()">
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
+      </div>
+    </div>
+  </div>
+  <div class="upper-content" >
+    <div class="content-details">
+      <ion-label>
+        <p><span class="date">{{customDate}}</span></p>
+      </ion-label>
+      <ion-label>
+        <p><span class="color-red">{{ task.Deadline }}</span></p>
+      </ion-label>
+      <ion-label>
+        <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+      </ion-label>
+    </div>
+  </div>
+  <div class="line"></div>
+</ion-header>

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss

@@ -0,0 +1,206 @@
+@import '~src/function.scss';
+
+ion-header, ion-content {
+  background: white;
+}
+
+:host {
+  background-color: white;
+}
+
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: rem(18) !important;
+}
+.main-header{
+  overflow: inherit !important;
+  display: flex;
+  font-family: Roboto;
+  background-color: #fff;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+  .title-content{
+    display: flex;
+    justify-content: start !important;
+    align-items: flex-start !important;
+    border-radius: 0 !important;
+    }
+    .title{
+      width: fit-content;
+      height: auto;
+      font-size: rem(25);
+      overflow: auto;
+      float: left;
+      padding-left: 5px;
+    }
+    .div-icon{
+      width: 40px !important;
+      font-size: rem(35) !important;
+      text-align: start !important;
+      padding: 1px;
+    }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  font-size: rem(18);
+
+  .label{
+      border-radius: 20px;
+      background: var(--label-bg-color);
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+      font-size: rem(14);
+  }
+
+  .button-calendar-type ion-button{
+    height: rem(25);
+  }
+  .content-details{
+    font-size: rem(17);
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: rem(16);
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: rem(16);
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: rem(15);
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: rem(35);
+    float: left;
+  }
+  .attach-title-item{
+    font-size: rem(18);
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: rem(15);
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: rem(13);
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: rem(16) !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { TaskDetailHeaderPage } from './task-detail-header.page';
+
+describe('TaskDetailHeaderPage', () => {
+  let component: TaskDetailHeaderPage;
+  let fixture: ComponentFixture<TaskDetailHeaderPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TaskDetailHeaderPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TaskDetailHeaderPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.ts

@@ -0,0 +1,27 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
+@Component({
+  selector: 'app-task-detail-header',
+  templateUrl: './task-detail-header.page.html',
+  styleUrls: ['./task-detail-header.page.scss'],
+})
+export class TaskDetailHeaderPage implements OnInit {
+
+  @Input() task = new customTask();
+  @Input() intervenientes = []
+  @Input() cc = []
+  @Input() customDate = ''
+  @Input() fulltask = new fullTask()
+  
+  @Output() openOptions = new EventEmitter<any>();
+  @Output() goBack = new EventEmitter<any>();
+  @Output() viewDocument = new EventEmitter<any>();
+
+  constructor(public ThemeService: ThemeService) { }
+
+  ngOnInit() {
+  }
+
+}

src/app/shared/gabinete-digital/generic/task-details/task-details.module.ts

@@ -7,13 +7,18 @@ import { IonicModule } from '@ionic/angular';
 import { TaskDetailsPageRoutingModule } from './task-details-routing.module';
 
 import { TaskDetailsPage } from './task-details.page';
+import { TaskDetailHeaderPageModule } from '../task-detail-header/task-detail-header.module';
+import { TaskDetailContentPageModule } from '../task-detail-content/task-detail-content.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    TaskDetailsPageRoutingModule
+    TaskDetailsPageRoutingModule,
+    //
+    TaskDetailHeaderPageModule,
+    TaskDetailContentPageModule
   ],
   declarations: [TaskDetailsPage],
   exports: [TaskDetailsPage]

src/app/shared/gabinete-digital/generic/task-details/task-details.page.html

@@ -1,5 +1,5 @@
-<ion-header *ngIf="task" class="ion-no-border">
-  <div class="main-header">
+<ion-header *ngIf="task" class="ion-no-border ">
+  <div class="main-header mt-30 px-20">
     <div class="title-content width-100 d-flex justify-space-between align-center">
       <div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack.emit()" defaultHref="#">
         <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
@@ -27,11 +27,11 @@
       </ion-label>
     </div>
   </div>
-  <div class="line"></div>
+  <div class="line mx-20"></div>
 </ion-header>
 
 <ion-content>
-  <div *ngIf="task" class="overflow-y-auto height-100">
+  <div *ngIf="task" class="overflow-y-auto height-100 px-20">
     <div class="middle-content">
       <h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
       <ion-item class="ion-no-margin ion-no-padding">
@@ -51,20 +51,21 @@
           </ion-label>
         </ion-item>
       </div>
-      <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+      <div *ngIf="task.Note">
         <h5 class="font-17-rem">Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
-          <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
+          <pre class="width-100 text">{{ task.Note }} </pre>
         </ion-item>
       </div>
     </div>
     <div class="bottom-content width-100">
       <ion-list>
         <h5 class="font-17-rem">Documentos Anexados</h5>
-        <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
-          <ion-label class="d-block" (click)="viewDocument.emit(Document.DocId)">
-            <p class="attach-title-item">{{ Document.Assunto || "Sem assunto" }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-            <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
+        <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of mergedArray">
+          <ion-label (click)="viewDocument.emit({DocId:Document.DocId, Document:Document, content:Document.content})">
+            <p *ngIf="Document.Assunto" class="attach-title-item">{{ Document.Assunto }} <span class="document-type" *ngIf="Document.content" >Rascunho</span> </p>
+            <p *ngIf="!Document.Assunto" class="attach-title-item">{{ Document.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+            <p><span class="span-left">{{Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yy' }}</span></p>
           </ion-label>
         </ion-item>
       </ion-list>

src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss

@@ -1,9 +1,15 @@
 @import '~src/function.scss';
-.main-content{
-  background-color: #fff !important;
+
+ion-header {
+  background: white;
   border-top-left-radius: 25px;
   border-top-right-radius: 25px;
 }
+
+ion-content {
+  background: white;
+}
+
 .content{
   padding: 30px 20px 0 20px !important;
   margin: 0;
@@ -13,6 +19,12 @@
   font-weight: 500;
   color:#d30a0a !important;
 }
+.document-type{
+  color: #d30a0a;
+  margin-left: 20px;
+  font-size: medium;
+}
+
 .btn-size{
   font-size: rem(18) !important;
 }

src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts

@@ -13,6 +13,7 @@ export class TaskDetailsPage implements OnInit {
   @Input() intervenientes = []
   @Input() cc = []
   @Input() customDate = ''
+  @Input() mergedArray = []
   @Input() fulltask = new fullTask()
   
   @Output() openOptions = new EventEmitter<any>();

src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { customTask } from 'src/app/models/dailyworktask.model';
-import { ThemeService } from 'src/app/services/theme.service'
-import { TaskService } from 'src/app/services/task.service'
+import { ThemeService } from 'src/app/services/theme.service';
+import { TaskService } from 'src/app/services/task.service';
 
 @Component({
   selector: 'app-task-list',

src/app/shared/popover/deploma-options/deploma-options.page.html

@@ -24,6 +24,9 @@
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
         <button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
       </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+        <button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button>
+      </div>
       <div class="buttons width-100">
         <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
       </div>

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -95,6 +95,8 @@ export class DiplomaOptionsPage implements OnInit {
         } else if (actionName == 'Arquivo') {
           await this.arquivar(res.data.note, docs);
           this.goBack();
+        } else if (actionName =='AssinarNew') {
+          await this.AssinarNew(res.data.note, docs)
         }
       }
     }, (error) => {
@@ -199,8 +201,11 @@ export class DiplomaOptionsPage implements OnInit {
       "ActionTypeId": 99999842,
       "dataFields": {
         "ReviewUserComment": note,
+        "InstanceIDNew": this.task.InstanceID,
+      },
+      "AttachmentList" : {
+        "ProcessInstanceID": this.task.InstanceID
       },
-      "AttachmentList" :documents,
     }
 
     const loader = this.toastService.loading()
@@ -220,6 +225,31 @@ export class DiplomaOptionsPage implements OnInit {
     }
   }
 
+  async AssinarNew(note:string, documents:any) {
+    let body = {
+      "InstanceId": this.task.InstanceID,
+      "FolderId": this.task.FolderID,
+      "DraftIds": "163;164;77",
+      "OriginalFileName": "Doc1;Doc2;Doc3"
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.presidentialActionsSignature(body).toPromise()
+
+      this.httpErroHandle.httpsSucessMessagge('Assinado')
+      this.TaskService.loadDiplomas()
+      this.goBack();
+    } catch (error) {
+    this.httpErroHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
 
   async finish(note:string, documents:any){
 

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html

@@ -8,7 +8,7 @@
     <button class="btn-cancel" shape="round"  (click)="close()">Cancelar</button>
   </div>
   <div *ngIf="content != ''" class="buttons">
-    <button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button>
+    <!-- <button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button> -->
     <button (click)="saveDraft(Document, content)" class="btn-cancel" shape="round" >Salvar Rascunho</button>
     <button class="btn-cancel" shape="round"  (click)="close()">Cancelar</button>
   </div>

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

@@ -12,7 +12,7 @@ import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-acti
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
-import { PublicationDetailsModel } from 'src/app/models/beast-orm';
+// import { PublicationDetailsModel } from 'src/app/models/beast-orm';
 
 @Component({
   selector: 'app-view-publications',

src/app/shared/shared.module.ts

@@ -4,6 +4,8 @@ import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
 import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
 import { TaskDetailsPage } from './gabinete-digital/generic/task-details/task-details.page';
+// import { TaskDetailHeaderPipe } from './gabinete-digital/generic/task-detail-header.pipe';
+// import { TaskDetailContentPipe } from './gabinete-digital/generic/task-detail-content.pipe';
 // import { HeaderPage } from './header/header.page';
 // import { HeaderPrPage } from './header-pr/header-pr.page';
 // import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';