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

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)=>{