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

src/app/home/home-routing.module.ts

@@ -219,6 +219,15 @@ const routes: Routes = [
 
         ]
       },
+      {
+        path: 'document-detail',
+        children: [
+          {
+            path:'',
+            loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule)
+          }
+        ]
+      },
     ]
   },
   {

src/app/modals/document-detail/document-detail.page.html

@@ -1,10 +1,151 @@
-<ion-header>
-  <app-btn-modal-dismiss></app-btn-modal-dismiss>
-  <ion-toolbar>
-    <ion-title>document-detail</ion-title>
-  </ion-toolbar>
-</ion-header>
+<ion-menu autoHide="false" side="end" content-id="main-content">
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item (click)="notImplemented()">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item (click)="notImplemented()">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+      <ion-item (click)="notImplemented()">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item>
+      <ion-item (click)="notImplemented()">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item>
+      <ion-item (click)="notImplemented()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+      <ion-item disabled>
+        <ion-icon name="paper-plane" slot="start"></ion-icon>
+        <ion-label>Enviar para pendentes</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
 
 <ion-content>
+  <div class="main-content d-flex height-100">
+    <div *ngIf="LoadedDocument" class="content d-flex flex-column">
+      <div class="main-header">
+        <div class="title-content">
+          <app-btn-modal-dismiss></app-btn-modal-dismiss>
+          <div class="middle">
+            <ion-label class="title">{{LoadedDocument.Subject}}</ion-label>
+          </div>
+          <div class="div-icon">
+              <ion-menu-button autoHide="false">
+                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+              </ion-menu-button>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{LoadedDocument.Type}}</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="line"></div>
+      <div class="middle-content">
+        <h5>Intervenientes</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <div>
+              <p>{{LoadedDocument.Interveners}}</p>
+            </div>
+          </ion-label>
+        </ion-item>
+        <h5>Status</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+            <p >{{LoadedDocument.Status}}</p>
+        </ion-item>
+      </div>
+      <div class="bottom-content width-100">
+        <ion-list>
+          <h5>Documentos Anexados</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label
+          (click)="viewDocument()">
+            <p class="attach-title-item">{{LoadedDocument.Subject}}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+            <p hidden><span class="span-left">Remetente</span><span class="span-right"></span></p>
+          </ion-label>
+        </ion-item>
+        </ion-list>
+      </div>
 
+    </div>
+    <div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
+      <div class="buttons">
+        <button (click)="notImplemented()" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Descartar</button>
+        <div class="solid"></div>
+        <button (click)="notImplemented()"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="notImplemented()"  class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button (click)="notImplemented()"  class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <div class="solid"></div>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Executar</button>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Delegar</button>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Arquivar</button>
+      </div>
+    </div>
+
+    <div hidden>
+      <ion-list>
+        <ion-list-header>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </ion-label>
+        </ion-list-header>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-button color="medium" shape="round" expand="block">
+          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </ion-button>
+      </ion-list>
+    </div>
+  </div>
 </ion-content>
+

src/app/modals/document-detail/document-detail.page.scss

@@ -0,0 +1,236 @@
+@import '~src/function.scss';
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+    .header-top{
+      width: 360px;
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+      .middle{
+        padding: 0!important;
+        float: left;
+        width: 280px;
+        margin: 2.5px 0 0 5px;
+        display: flex;
+        align-items: center;
+            
+        }
+        .right{
+          padding: 0!important;
+          float: right;
+          font-size: 25px;
+          color: #0782c9;
+          margin: 5px 0 0 0;
+        }
+      }
+      .header-bottom{
+         width: 310px;
+        overflow: auto;
+        margin: 0 auto;
+
+        .header-bottom-icon{
+          width: 30px;
+          font-size: 25px;
+          float: left;
+          padding: 2px;
+        }
+        .header-bottom-contacts{
+          width: 275px;
+          font-size: 15px;
+          color: #797979;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          float: left;
+            padding: 5px;
+          margin: 1px;
+        }
+      }
+    
+        .title{
+          font-size: 25px;
+          overflow: auto;
+          float: left;
+          padding-top: 4px;
+          padding-left: 5px;
+        }
+        .div-icon{
+          width: 40px;
+          float: right;
+          font-size: 35px;
+          overflow: auto;
+          padding: 1px;
+        }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  overflow: auto;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #ffb703;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+  
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: #0d89d1;
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    font-size: 18px;
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.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: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: 16px !important;
+      font-weight: 600 !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/modals/document-detail/document-detail.page.ts

@@ -1,4 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { MenuController, ModalController, NavParams } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
 @Component({
   selector: 'app-document-detail',
@@ -7,9 +11,62 @@ import { Component, OnInit } from '@angular/core';
 })
 export class DocumentDetailPage implements OnInit {
 
-  constructor() { }
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+
+  customDate:any;
+
+  docId: string;
+  applicationId:string;
+  LoadedDocument:any = null;
+
+  constructor(
+    private navParams: NavParams,
+    private modalController: ModalController,
+    private alertService: AlertService,
+    private processes: ProcessesService,
+    private menu: MenuController,
+    private iab: InAppBrowser,
+  ) { 
+    this.docId = this.navParams.get('docId');
+    this.applicationId = this.navParams.get('applicationId');
+  }
 
   ngOnInit() {
+    console.log(this.docId);
+    console.log(this.applicationId);
+    this.LoadDocumentDetails();
+  }
+
+  async LoadDocumentDetails(){
+    this.processes.GetDocumentDetails(this.docId, '').subscribe(res=>{
+      console.log(res);
+      this.LoadedDocument = res[0];
+
+      let thedate = new Date(this.LoadedDocument.DateDocument);
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+    });
+  }
+
+  viewDocument(){
+    this.processes.GetDocumentUrl(this.docId, '8').subscribe(res=>{
+      console.log(res);
+      const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+      const browser = this.iab.create(url,"_blank");
+      browser.show();
+      
+    });
+  }
+
+  openMenu() {
+    this.menu.open();
+    this.modalController.dismiss();
+  }
+  close(){
+    this.modalController.dismiss();
+  }
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
 }

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -55,8 +55,8 @@
     </div>
   </div>
   <div class="middle-content">
-    <ion-item>
       <h5>Intervenientes</h5>
+      <ion-item>
       <ion-label>
         <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
       </ion-label>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -135,7 +135,7 @@ export class ApproveEventModalPage implements OnInit {
     this.alertService.presentAlert('Operação realizada com sucesso!');
     }
     else{
-      this.alertService.presentAlert('Operação cancelada!');
+      //this.alertService.presentAlert('Operação cancelada!');
     }
   });
 }

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

@@ -23,7 +23,9 @@
       <div class="main-header">
         <div class="title-content">
           <div class="left">
-            <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            <button class="btn-no-color" (click)="close()">
+              <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            </button>
           </div>
           <div class="middle">
             <ion-label class="title">{{loadedEvent.Subject}}</ion-label>

src/app/pages/chat/chat.page.html

@@ -17,8 +17,15 @@
               <ion-label class="title">Chat</ion-label>
             </div>
             <div class="div-icon">
-              <ion-icon slot="end" (click)="openNewGroupPage()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
-              <ion-icon slot="end" (click)="openContactsPage()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
+              <button class="btn-no-color" (click)="openContactsPage()">
+                <ion-icon slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
+              </button>
+              <button class="btn-no-color" (click)="openNewGroupPage()">
+                <ion-icon slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
+              </button>
+              <button class="btn-no-color" (click)="doRefresh($event)">
+                <ion-icon class="title-icon" name="reload-circle"></ion-icon>
+              </button>
             </div>
           </div>
         <ion-toolbar>

src/app/pages/chat/chat.page.scss

@@ -19,11 +19,13 @@ ion-content{
       font-size: 25px;
     }
     .div-icon{
-      width: 60%;
+      display: flex;
+      width: 50%;
       float: right;
       font-size: 35px;
       overflow: auto;
       padding: 1px;
+      justify-content: flex-end;
     }
     .div-icon ion-icon{
       float: right;

src/app/pages/chat/group-messages/group-messages.page.html

@@ -7,7 +7,9 @@
           <ion-label class="title">{{roomName}}</ion-label>
         </div>
         <div class="right">
-          <ion-icon  (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
+          <button class="btn-no-color" (click)="openOptions()">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+          </button>
         </div>  
       </div>
       <div (click)="addContacts()" class="header-bottom">
@@ -77,7 +79,10 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <button class="btn-no-color" (click)="openChatOptions()">
+        <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      </button>
+      
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
@@ -86,7 +91,9 @@
       </ion-item>
     </div>
     <div>
-      <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      <button class="btn-no-color" (click)="sendMessage()">
+        <ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      </button>
     </div>
   </div>
 </ion-footer>

src/app/pages/chat/messages/contacts/contacts.page.html

@@ -3,7 +3,9 @@
     <div class="main-header">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Nova Conversa</ion-label>

src/app/pages/chat/messages/messages.page.html

@@ -71,7 +71,9 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <button class="btn-no-color" (click)="openChatOptions()">
+        <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      </button>
     </div>
     <div class="width-70">
       <ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
@@ -80,7 +82,9 @@
       </ion-item>
     </div>
     <div>
-      <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      <button class="btn-no-color" (click)="sendMessage()">
+        <ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      </button>
     </div>
   </div>
 </ion-footer>

src/app/pages/chat/new-group/contacts/contacts.page.html

@@ -3,7 +3,9 @@
     <div class="main-header">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>

src/app/pages/events/events.page.html

@@ -46,13 +46,13 @@
             <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
             <div class="text">A sua Agenda</div>
           </div>
-          <ion-icon 
-          class="icon-next" 
-          slot="end" 
-          src="assets/images/icons-arrow-circle-arrow-right.svg"
-          [routerLink]="['/home/agenda']"
-           ></ion-icon>
-          
+          <button class="btn-no-color" [routerLink]="['/home/agenda']">
+            <ion-icon 
+            class="icon-next" 
+            slot="end" 
+            src="assets/images/icons-arrow-circle-arrow-right.svg"
+            ></ion-icon>
+          </button>
         </div>
         <div class="content">
           <ion-list>

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

@@ -148,7 +148,7 @@ export class ApproveEventModalPage implements OnInit {
     this.alertService.presentAlert('Operação realizada com sucesso!');
     }
     else{
-      this.alertService.presentAlert('Operação cancelada!');
+      //this.alertService.presentAlert('Operação cancelada!');
     }
   });
 }

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

@@ -143,7 +143,7 @@ export class ApproveEventPage implements OnInit {
         this.alertService.presentAlert('Operação realizada com sucesso!');
       }
       else {
-        this.alertService.presentAlert('Operação cancelada!');
+        //this.alertService.presentAlert('Operação cancelada!');
       }
     });
   }

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

@@ -116,7 +116,7 @@
     </div>
 
     
-    <div class="aside-right flex-column height-100">
+    <div *ngIf="postData" class="aside-right flex-column height-100">
       <app-empty-container 
           [texto]="emptyTextDescription" 
           *ngIf="!showAttendees" 

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

@@ -44,7 +44,7 @@
         <ion-icon name="trash" slot="start"></ion-icon>
         <ion-label>Descartar</ion-label>
       </ion-item>
-      <ion-item disabled>
+      <ion-item hidden disabled>
         <ion-icon name="paper-plane" slot="start"></ion-icon>
         <ion-label>Enviar para pendentes</ion-label>
       </ion-item>
@@ -56,7 +56,7 @@
 </div>
 
 <ion-content>
-  <div class="main-content d-flex">
+  <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content">
@@ -74,7 +74,7 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">Sexta, 14 de Abril</span><span class="label">Expediente</span></p>
+            <p><span class="date">{{customDate}}</span><span class="label">Expediente</span></p>
             <p><span class="color-red">Muitíssimo urgente</span></p>
           </ion-label>
         </div>
@@ -89,14 +89,16 @@
             </div>
           </ion-label>
         </ion-item>
-        <h5 *ngIf="cc">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 *ngIf="cc.length > 0">
+          <h5>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>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
             <p [innerHTML]="task.Note"></p>
@@ -152,11 +154,9 @@
         <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 (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-        <div class="solid"></div>
-        <button class="btn-cancel" shape="round" >Executar</button>
-        <button class="btn-cancel" shape="round" >Delegar</button>
-        <button class="btn-cancel" shape="round" >Arquivar</button>
+        <button hidden class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <div hidden class="solid"></div>
+        <button hidden class="btn-cancel" shape="round" >Delegar</button>
       </div>
     </div>
 

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

@@ -22,6 +22,11 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 })
 export class ExpedienteDetailPage implements OnInit {
 
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+
+  customDate:any;
+
   task: any;
   fulltask: any;
   eventsList: Event[];
@@ -81,6 +86,11 @@ export class ExpedienteDetailPage implements OnInit {
       }
       this.fulltask = res;
       console.log(res);
+
+      let thedate = new Date(this.task.CreateDate);
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+
+
       this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
         this.intervenientes = users.filter(user=>{
           return user.Type == 'I';

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

@@ -10,6 +10,7 @@ import  WordCloud from 'src/plugin/wordcloud2.js';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
 import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
@@ -25,10 +26,10 @@ export class SearchPage implements OnInit {
   searchDocTypeId: string;
   ordinance: string;
 
-  searchCategories: SearchCategory[];
-  showSearchDocuments: SearchDocument[];
+  searchCategories: SearchCategory[] = [];
+  showSearchDocuments: SearchDocument[] = [];
   showCategory: string;
-  searchDocuments: SearchDocument[];
+  searchDocuments: SearchDocument[] =[];
 
   showDocuments = false;
   showAdvanceSearch = false;
@@ -447,6 +448,7 @@ export class SearchPage implements OnInit {
     }
     else if(window.location.pathname == '/home/gabinete-digital'){
       console.log('OPEN DOC');
+      this.viewDocumentDetail(id,'');
       
     }
 
@@ -467,23 +469,21 @@ export class SearchPage implements OnInit {
 
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-
+  async viewDocumentDetail(docId:string, applicationId:string) {
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
+      classs = 'modal'
     } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+      classs = 'modal modal-desktop showAsideOptions'
     }
-
+    
     const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
+      component: DocumentDetailPage,
       componentProps:{
-        serialNumber: serialNumber,
-        profile: 'mdgpr',
+        docId: docId,
+        applicationId: applicationId,
       },
       cssClass: classs,
-      backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{

src/app/services/processes.service.ts

@@ -197,7 +197,7 @@ export class ProcessesService {
   }
 
   GetDocumentDetails(DocId:string, FsId:string){
-    const geturl = environment.apiURL + 'ecm/document/viewrequestshort';
+    const geturl = environment.apiURL + 'search/documents';
     let params = new HttpParams();
 
     params = params.set("docId", DocId);

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

@@ -73,6 +73,7 @@
             <ion-label>{{att.Name}}</ion-label>
           </div>
         </div>
+        <div class="line"></div>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
             <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>

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

@@ -152,7 +152,7 @@ export class ApproveEventComponent implements OnInit {
       this.goToEventsToApprove();
       }
       else{
-        this.alertService.presentAlert('Operação cancelada!');
+        //this.alertService.presentAlert('Operação cancelada!');
       }
     });
   }

src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html

@@ -1,3 +1,5 @@
 <div class="left">
-  <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+  <button class="btn-no-color" (click)="close()">
+    <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+  </button>
 </div>

src/app/shared/chat/group-messages/group-messages.page.html

@@ -6,7 +6,9 @@
           <ion-label class="title">{{room.name.split('-').join(' ')}}</ion-label>
         </div>
         <div class="right">
-          <ion-icon  (click)="openGroupMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
+          <button class="btn-no-color" (click)="openGroupMessagesOptions()">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+          </button>
         </div>  
       </div>
       <div (click)="openGroupContactsPage()" class="header-bottom">
@@ -55,7 +57,9 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openSendGroupMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
+        <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      </button>
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
@@ -64,7 +68,9 @@
       </ion-item>
     </div>
     <div>
-      <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      <button class="btn-no-color" (click)="sendMessage()">
+        <ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      </button>
     </div>
   </div>
 </ion-footer>

src/app/shared/chat/messages/messages.page.html

@@ -7,7 +7,9 @@
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div class="right">
-          <ion-icon  (click)="_openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
+          <button class="btn-no-color" (click)="_openMessagesOptions()">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+          </button>
         </div>  
       </div>
       <div hidden class="header-bottom" (click)="addContacts()">
@@ -48,7 +50,9 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openSendMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <button class="btn-no-color" (click)="openSendMessageOptions()">
+        <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      </button>
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
@@ -57,7 +61,9 @@
       </ion-item>
     </div>
     <div>
-      <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      <button class="btn-no-color" (click)="sendMessage()">
+        <ion-icon  class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+      </button>
     </div>
   </div>
 </ion-footer>

src/app/shared/chat/new-group/contacts/contacts.page.html

@@ -3,7 +3,9 @@
     <div class="main-header">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>

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

@@ -2,7 +2,9 @@
   <div class="title width-100">
     <div class="title-container">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
-      <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon class="title-icon" name="reload-circle"></ion-icon>
+      </button>
     </div>
     <ion-toolbar>
       <ion-segment [(ngModel)]="profile">

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

@@ -8,7 +8,7 @@
     float: right;
     margin-right: 20px;
     font-size: 30px;
-    color: #0782c9;
+    color: #42b9fe;
   }
 }
 .title{

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -1,6 +1,11 @@
 <ion-header class="ion-no-border">
   <div class="title">
-    <ion-label >Correspondência</ion-label>
+    <div class="thetitle"><ion-label >Correspondência</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
+      </button>
+    </div>
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment">

src/app/shared/gabinete-digital/expedients/expedients.page.scss

@@ -9,6 +9,15 @@
     font-size: 25px;
     color:#000;
     overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
   }
 .item-list-small{
     font-size: 11px;

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -1,6 +1,8 @@
 <ion-content class="container">
   <div class="arrow-right">
-    <ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    <button class="btn-no-color" (click)="close()">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
   </div>
   <div class="buttons">
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>