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

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

@@ -466,6 +466,7 @@
       >
       </app-event-list>
 
+      
       <app-approve-event  class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
         [serialNumber] = "eventToaprove.serialNumber"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"

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

@@ -220,8 +220,8 @@
     </div> 
   </div>    
 </ion-content>
-<ion-footer class="ion-no-border d-flex justify-center">
-  <ion-toolbar class="btn-div ">
+<ion-footer class="ion-no-border d-flex justify-center px-20">
+  <ion-toolbar class=" ">
     <ion-buttons slot="start">
       <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>

src/app/pages/agenda/new-event/new-event.page.scss

@@ -18,7 +18,6 @@ ion-content{
     transform: translate3d(0, 1px, 0);
     
     .title-content{
-      padding: 0px 20px;
       margin: 0px auto;
       overflow: auto;
       background: #fff;
@@ -45,7 +44,8 @@ ion-content{
     padding: 15px 20px 0 20px;
 
     .ion-item-container{
-        width: 360px;
+        flex: 1;
+        width: 100%;
         margin: 15px auto;
         border: 1px solid #ebebeb;
         border-radius: 5px;
@@ -62,7 +62,7 @@ ion-content{
         overflow: auto;
       }
       .ion-item-class-2{
-        width: 360px;
+        display: flex;
         margin: 0px auto;
       }
       .ion-icon-class{
@@ -77,18 +77,18 @@ ion-content{
         margin-left: 0;
       }
       .ion-input-class{
-        width: 315px;
         height: 45px;
         border: 1px solid #ebebeb;
         border-radius: 5px;
         padding-left: 5px;
         padding-right: 10px;
         float: left;
+        flex: 1;
       }
       .ion-input-class-no-height{
         border: 1px solid #ebebeb;
         border-radius: 5px;
-        overflow: auto;
+        flex: 1;
       }
       .list-people{
         width: 256px;

src/app/pages/agenda/new-event/new-event.page.ts

@@ -5,6 +5,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../../models/event.model';
 import { AttendeesPage } from '../../events/attendees/attendees.page';
+import { SearchPage } from '../../search/search.page';
 
 @Component({
   selector: 'app-new-event',
@@ -43,7 +44,7 @@ export class NewEventPage implements OnInit {
 
   ngOnInit() {
 
-    console.log(this.profile);
+/*     console.log(this.profile); */
   
     let selectedStartdDate = this.selectedDate;
     let selectedEndDate = new Date(this.selectedDate);
@@ -118,6 +119,8 @@ export class NewEventPage implements OnInit {
     this.modalController.dismiss(this.postEvent);
   }
 
+
+
   async openAttendees() {
     const modal = await this.modalController.create({
       component: AttendeesPage,
@@ -126,7 +129,7 @@ export class NewEventPage implements OnInit {
         adding: this.adding,
         taskParticipants: this.taskParticipants
       },
-      cssClass: 'attendee',
+      cssClass: 'attendee modal modal-desktop',
       backdropDismiss: false
     });
 

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

@@ -70,7 +70,7 @@ export class ViewEventPage implements OnInit {
   }
 
   close(){
-    console.log(this.isEventEdited);
+    /* console.log(this.isEventEdited); */
     this.modalController.dismiss(this.isEventEdited);
   }
 
@@ -78,10 +78,10 @@ export class ViewEventPage implements OnInit {
     this.eventsService.getEvent(this.eventId).subscribe(res => {
       this.loadedEvent = res;
 
-      console.log(res);
+      /* console.log(res); */
       
       this.today = new Date(res.StartDate);
-      console.log(new Date(this.today));
+      /* console.log(new Date(this.today)); */
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
     });
   }
@@ -154,7 +154,7 @@ export class ViewEventPage implements OnInit {
 
   viewDocument(sourceId){
     this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
-      console.log(res);
+      /* console.log(res); */
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
       const browser = this.iab.create(url,"_blank");
       browser.show();

src/app/pages/events/attendee-modal/attendee-modal.page.html

@@ -10,7 +10,7 @@
   <ion-item-group>
   <ion-list>
     <ion-item-sliding>
-      <ion-item *ngFor="let attendee of contacts">
+      <ion-item lines="none" *ngFor="let attendee of contacts">
         <ion-checkbox slot="end" (ionChange)="selectContact(attendee)"></ion-checkbox><!-- [disabled]="isCheckboxDisabled" -->
         <ion-label>
           <h3>{{ attendee.Name }}</h3>

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

@@ -12,7 +12,7 @@
     <ion-list lines="none"  class="flex-grow-1 overflow-y-auto height-100" >
       <ion-item-sliding class="px-20">
         <div *ngFor="let attendee of contacts;">
-          <ion-item lines="none" (click)="selectContact(attendee)" *ngIf="filterSearchList(attendee)" >
+          <ion-item lines="none"  *ngIf="filterSearchList(attendee)" >
             <div class="pr-10">
               <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
             </div>
@@ -20,6 +20,9 @@
               <h3>{{ attendee.Name }}</h3>
               <p>{{ attendee.EmailAddress }}</p>
             </ion-label>
+            <div (click)="selectContact(attendee)">
+              <ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon>
+            </div>
           </ion-item>
         </div>
 
@@ -38,8 +41,8 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div style="color:red" (click)="remove(attendee)">
-            X
+          <div  (click)="remove(attendee)">
+            <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
       </ion-item-sliding>
@@ -56,8 +59,8 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div style="color:red" (click)="remove(attendee)">
-            X
+          <div  (click)="remove(attendee)">
+            <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
       </ion-item-sliding>

src/app/pages/events/attendees/attendees.page.scss

@@ -1,6 +1,3 @@
-ion-item-group{
-    margin: 15px;
-}
 ion-item{
     border-bottom:1px solid #ccc;
 }

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

@@ -41,12 +41,12 @@ export class EventListPage implements OnInit {
     }
 
     
-    this.LoadToApproveEvents();
+    // this.LoadToApproveEvents();
     
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadToApproveEvents();
+        // this.LoadToApproveEvents();
       }
     });
 

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

@@ -123,10 +123,15 @@
 
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">
+        <!--
         <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
         <app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
-        <app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
-        <app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
+        
+        
+          <app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
+          <app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
+        -->
+
       </div>
   </div>
 </ion-content>

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

@@ -56,15 +56,14 @@ export class GabineteDigitalPage implements OnInit {
         if( window.innerWidth <= 1024){
           this.modalController.dismiss();
         }
-
       };
 
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["show"]){
-          this.openExpedientListPage();
+          // this.openExpedientListPage();
         }
         else if(params["events"]){
-          this.openEventsToApprovePage("MDGPR");
+          // this.openEventsToApprovePage("MDGPR");
         }
       });
       
@@ -84,23 +83,21 @@ export class GabineteDigitalPage implements OnInit {
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadCounts();
+        //this.LoadCounts();
       }
     });
 
-
-    
-    this.LoadCounts();
+    // this.LoadCounts();
     /* this.eventService.getAllMdEvents.subscribe(res=>{
       console.log(res);
       
     });
-    console.log(this.eventService.getAllPrEvents.length);
- */
-this.processesbackend.GetActionsList().subscribe(res=>{
-  console.log(res);
-  
-});
+      console.log(this.eventService.getAllPrEvents.length);
+  */
+    // this.processesbackend.GetActionsList().subscribe(res=>{
+      // console.log(res);
+      
+    //});
 
   }
 
@@ -190,7 +187,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   }
 
   openExpedientPage(data){
-    console.log(data);
+    /* console.log(data); */
     
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 1024){

src/app/pages/search/search.page.html

@@ -4,7 +4,7 @@
   <ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
   <div class="d-flex ion-justify-content-between">
     
-    <ion-form class="d-md-none">
+    <ion-form  [class.d-md-none]="!select">
       <div class="d-flex search-input-container ion-justify-content-between" >
         <div class="icon">
           <button class="btn-no-color" (click)="basicSearch()">
@@ -20,7 +20,8 @@
           </button>
         </div>
       </div>
-    </ion-form>
+    </ion-form>     
+
     <!-- search -->
     <div *ngIf="!showAdvanceSearch" class="icon-z icon-most-searched-word-open" (click)="showHideAdvanceSearch(true)">
       <ion-icon src="assets/images/icons-most-searched-words-open.svg" class="icon" slot="end"></ion-icon>
@@ -76,19 +77,18 @@
 
   <!-- search result categories-->
   <div class="options flex-md-grow-1 " *ngIf="showDocuments"
-    style="border-bottom: 1px solid #f3f3f3;"
+    style="border-bottom: 1px solid #f3f3f3;width: unset"
   >
     <div class="container ">
-      <div class="d-flex width-100">
+      <div class="d-flex  overflow-x-auto">
         <!-- SLIDE -->
-        <ion-slides class="slide width-100" pager="false" [options]="slideOpts">
-          <ion-slide *ngFor="let category of searchCategories; index as i;">
-            <div [ngClass]="{'active-category': category.Active}" class="button" (click)="filterDocList(category.Name)" (click)="activeCategoty(i)" >
-              <p>{{ category.Name }}</p>
-              <ion-label class="label">{{ category.Qtd }}</ion-label>
-            </div>
-          </ion-slide>
-        </ion-slides>
+        <div *ngFor="let category of searchCategories; index as i;" class="d-flex py-10" style="width:0px"  [ngClass]="{'active-category': category.Active}" class="button" (click)="filterDocList(category.Name)" (click)="activeCategoty(i)">
+
+          <span>{{ category.Name }}</span>
+          <ion-label class="label">{{ category.Qtd }}</ion-label>
+
+        </div>
+    
       </div>
 
       <button class="icon-z icon-most-searched-word-open " ion-button icon-only >
@@ -130,26 +130,31 @@
                     </p>
                   </div>
                   <div>
-                    <ion-icon *ngIf="ordinance == 'old'" (click)="reorderList('recent')" src="assets/images/icons-arrow-arrow-up.svg"></ion-icon>
-                    <ion-icon *ngIf="ordinance == 'recent'" (click)="reorderList('old')" src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon>
+                    <div  *ngIf="ordinance == 'old'" (click)="reorderList('recent')">
+                      <ion-icon src="assets/images/icons-arrow-arrow-up.svg"></ion-icon>
+                    </div>
+
+                    <div *ngIf="ordinance == 'recent'" (click)="reorderList('old')">
+                      <ion-icon  src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon>
+                    </div>
                   </div>
                 </div>
               </div>
               <ul>
-                <li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail(searchDocument.Id)" class="d-flex">
+                <li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail(searchDocument.Id); selectItem(searchDocument)" class="d-flex">
                   <div class="icon">
-                    <ion-icon *ngIf="itemIcons() == '/home/gabinete-digital' "
+                    <ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' "
                       src="assets/images/icons-search-document.svg"></ion-icon>
-                    <ion-icon *ngIf="itemIcons() == '/home/agenda' "
+                    <ion-icon *ngIf="itemIcons() == 'Agenda' "
                       src="assets/images/icons-default-agenda.svg"></ion-icon> 
-                    <ion-icon *ngIf="itemIcons() == '/home/publications' "
+                    <ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais' "
                       src="assets/images/icons-viagem.svg"></ion-icon>
                   </div>
                   <div class="content ion-align-items-center">
                     
                     <div class="d-flex ion-justify-content-between ">
                       <span class="result-name">{{ searchDocument.Assunto}}</span>
-                      <span class="app-name" *ngIf="currentPath == '/home/gabinete-digital' ">{{ searchDocument.appName}}</span>
+                      <span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
                     </div>
                     <div class="d-flex ion-justify-content-between ">
                       <span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
@@ -167,5 +172,4 @@
       </div>
     </div>
 
-
 </ion-content>

src/app/pages/search/search.page.scss

@@ -55,19 +55,18 @@ ion-slide{
         margin: 0px 5px;
         margin-bottom: 10px;
         padding: 5px 20px;
-        height: 100%;
-        box-sizing: 100%;
+        box-sizing: border-box;
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
         align-items: center;
-        p{
+        span{
           padding: 0px;
           margin: 0px;
           font-family: Roboto;
           color: #0d89d1;
           font-size: 15px;
-          width: 100%;
+          text-align: center;
         }
         .label{
           width: 100%;
@@ -75,6 +74,7 @@ ion-slide{
           font-size: 13px;
           font-weight: 300;
           color: #797979;
+          text-align: center;
         }
         border-radius: 15px;
       }
@@ -82,7 +82,7 @@ ion-slide{
       .active-category{
         background-color: #42b9fe;
         color: white;
-        p{
+        span{
           color: white;
         }
         .label{

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

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams  } from '@ionic/angular';
 import { SearchService } from "../../services/search.service";
 import { SearchCategory } from "src/app/models/search-category";
 import { SearchDocument } from "src/app/models/search-document";
@@ -9,8 +9,9 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e
 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',
@@ -51,13 +52,47 @@ export class SearchPage implements OnInit {
 
   windowWidth: number;
 
+  type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda";
+  select: boolean = false;
+
   constructor(private modalController: ModalController,
     private search: SearchService,
-    private modalCtrl: ModalController,) {
+    private modalCtrl: ModalController,
+    private navParams: NavParams) {
       this.ordinance = "recent";
-
       this.currentPath= window.location.pathname;
+
+      this.type = this.navParams.get('type');
+    
+
+      if(this.type == null || this.type == undefined) {
+        
+        this.select = false;
+
+        if(this.currentPath  == '/home/agenda') {
+          this.type = "Agenda"
+        } else if (this.currentPath  =='/home/gabinete-digital') {
+          this.type = "AccoesPresidenciais & ArquivoDespachoElect"
+
+        } else if (this.currentPath  == '/home/publications') {
+          this.type = "AccoesPresidenciais"
+        } else {
+          this.select = false
+        }
+      } else {
+        this.select = true;
+      }
+
+      
+  }
+
+  selectItem(item: SearchDocument) {
+    if(this.select){
+      this.modalController.dismiss({
+        selected: item
+      });
     }
+  }
 
   ngOnInit() {
 
@@ -172,9 +207,9 @@ export class SearchPage implements OnInit {
   /**
    * @description Basic search
    */
-    basicSearch(){
+   basicSearch(){
 
-    if(window.location.pathname  == '/home/agenda'){
+    if(this.type == "Agenda" ){
       
 
       this.showLoader = true;
@@ -205,7 +240,7 @@ export class SearchPage implements OnInit {
         this.loadWordCloud();
 
       });
-    } else if (window.location.pathname  =='/home/gabinete-digital'){
+    } else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
 
       this.showLoader = true;
 
@@ -267,7 +302,7 @@ export class SearchPage implements OnInit {
         this.loadWordCloud();
       });
 
-    } else if (window.location.pathname  == '/home/publications'){
+    } else if (this.type == "AccoesPresidenciais"){
       
       this.showLoader = true;
 
@@ -297,7 +332,7 @@ export class SearchPage implements OnInit {
         this.loadWordCloud();
       });
     }
-     
+
    }
 
    /**
@@ -424,7 +459,7 @@ export class SearchPage implements OnInit {
 
 
   itemIcons(): string{
-    return window.location.pathname
+    return this.type
   }
 
   viewDocument(){
@@ -437,27 +472,28 @@ export class SearchPage implements OnInit {
   async viewDetail(id:any) {
     console.log(id);
     
-    
-    if(window.location.pathname  == '/home/agenda'){
+    if(!this.selectItem){
+      if(window.location.pathname  == '/home/agenda'){
 
-      const modal = await this.modalCtrl.create({
-        component: ViewEventPage,
-        componentProps:{
-          eventId: id
-        },
-        cssClass: 'modal modal-desktop',
-      });
-      await modal.present();
-      modal.onDidDismiss().then((res)=>{});
-      
-    } else if(window.location.pathname == '/home/publications'){
+        const modal = await this.modalCtrl.create({
+          component: ViewEventPage,
+          componentProps:{
+            eventId: id
+          },
+          cssClass: 'modal modal-desktop',
+        });
+        await modal.present();
+        modal.onDidDismiss().then((res)=>{});
         
-      this.viewPublicationDetail(id);
-    }
-    else if(window.location.pathname == '/home/gabinete-digital'){
-      console.log('OPEN DOC');
-      this.viewDocumentDetail(id,'');
-      
+      } else if(window.location.pathname == '/home/publications'){
+          
+        this.viewPublicationDetail(id);
+      }
+      else if(window.location.pathname == '/home/gabinete-digital'){
+        console.log('OPEN DOC');
+        this.viewDocumentDetail(id,'');
+        
+      }
     }
 
   }
@@ -480,7 +516,7 @@ export class SearchPage implements OnInit {
   async viewDocumentDetail(docId:string, applicationId:string) {
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal'
+      classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }