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

src/app/app.module.ts

@@ -18,7 +18,6 @@ import { WebView } from '@ionic-native/ionic-webview/ngx';
 import { FilePath } from '@ionic-native/file-path/ngx';
 import { Camera } from '@ionic-native/camera/ngx';
 import { IonicStorageModule } from '@ionic/storage';
-import { PipesModule } from './pipes/pipes.module';
 //
 
 import { CommonModule } from '@angular/common';
@@ -44,7 +43,6 @@ import { MessagesPage } from './pages/chat/messages/messages.page';
     IonicModule.forRoot(),
     IonicStorageModule.forRoot(),
     AppRoutingModule, 
-    PipesModule,
     HttpClientModule,
     ],
   providers: [

src/app/pages/agenda/agenda.module.ts

@@ -26,6 +26,7 @@ registerLocaleData(localeDe);
 
 import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
+import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
 @NgModule({
   imports: [
     CommonModule,
@@ -50,6 +51,10 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
     ApproveEventComponent,
     AttendeesPage,
     AttendeeModalPage,
+    EventsToApprovePage,
+  ],
+  entryComponents: [
+    EventsToApprovePage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   providers: [

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

@@ -368,9 +368,17 @@
         (approveEventDismiss) = "approveEventDismiss($event)"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
       >
-
       </app-event-list>
 
+      <!-- <app-events-to-approve 
+      [profile]="profile" 
+      *ngIf="mobileComponent.showEventList"
+      class="d-flex height-100 flex-column"
+      (approveEventDismiss) = "approveEventDismiss($event)"
+      (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
+      >
+      </app-events-to-approve> -->
+
       <app-approve-event  class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
         [serialNumber] = "eventToaprove.serialNumber"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"

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

@@ -1,21 +1,13 @@
-<ion-header class="ion-no-border px-20 ">
+<ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-icon-left">
       <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
     </div>
     <div class="header-title">
-      <label>""Eventos para Aprovação</label>
+      <label>Eventos para Aprovação</label>
     </div>
-  
-  <!-- <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button (click) ="close()"></ion-back-button>
-    </ion-buttons>
-    <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-    <ion-title>Eventos para Aprovação</ion-title>
-  </ion-toolbar> -->
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
+    <ion-segment [(ngModel)]="profile">
       <ion-segment-button value="MDGPR">
         Seu calendário
       </ion-segment-button>
@@ -33,7 +25,7 @@
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div [ngSwitch]="segment"> 
+  <div [ngSwitch]="profile"> 
     <ion-list *ngSwitchCase="'MDGPR'">
       <div *ngIf="eventsMDGPRList">
         <ion-list>
@@ -41,7 +33,7 @@
             <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
               
-              <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
+              <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
@@ -62,7 +54,7 @@
         <ion-item-sliding>
           <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
-              <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}}">
+              <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>

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

@@ -1,7 +1,11 @@
+
+:host{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+}
 .header-content{
+  margin: 0 !important;
   overflow: auto;
-  margin: 0 auto;
-  padding-top: 25px;
 }
 .header-icon-left{
   width: 36px;
@@ -10,10 +14,10 @@
   float: left;
 }
 .header-title{
-  width: 300px;
+  //width: 300px;
   font-family: Roboto;
   font-size: 25px;
-  margin: 0 5px 0 5px;
+  //margin: 0 5px 0 5px;
   padding: 0;
   color:#000;
   float: left;
@@ -22,7 +26,7 @@ ion-item-sliding{
   margin-top: 5px;
 }
 .Rectangle {
-  width: 360px;
+  //width: 360px;
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border: solid 1px #e9e9e9;
@@ -32,26 +36,24 @@ ion-item-sliding{
   margin-bottom: 10px;
   overflow: auto;
 }
-.content-mdgpr-Oficial{
-  width: 340px;
+.content-pr-Oficial{
+  background-color: var(--white);
   border-radius: 5px;
   border-right: 5px solid #99e47b;
   overflow: auto;
 }
-.content-mdgpr-Pessoal{
-  width: 340px;
+.content-pr-Pessoal{
+  background-color: var(--white);
   border-radius: 5px;
   border-right: 5px solid #958bfc;
   overflow: auto;
 }
-.content-pr-Oficial{
-  width: 340px;
+.content-mdgpr-Oficial{
   border-radius: 5px;
   border-right: 5px solid #ffb703;
   overflow: auto;
 }
-.content-pr-Pessoal{
-  width: 340px;
+.content-mdgpr-Pessoal{
   border-radius: 5px;
   border-right: 5px solid #f05d5e;
   overflow: auto;
@@ -78,7 +80,7 @@ ion-item-sliding{
   margin-left: 10px;
 }
 .approve-event-detail p{
-  width: 250px;
+  //width: 250px;
   font-family: Roboto;
   font-size: 13px;
   font-weight: normal;
@@ -91,7 +93,7 @@ ion-item-sliding{
   padding: 0;
 }
 .approve-event-detail h3{
-  width: 250px;
+  //width: 250px;
   font-family: Roboto;
   font-size: 15px;
   font-weight: bold;

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

@@ -13,7 +13,7 @@ import { NavigationEnd, Router } from '@angular/router';
   styleUrls: ['./event-list.page.scss'],
 })
 export class EventListPage implements OnInit {
-  segment:string;
+  profile:string;
   showLoader: boolean;
   eventsPRList: any;
   eventsMDGPRList: any;
@@ -29,11 +29,11 @@ export class EventListPage implements OnInit {
     private router: Router,
     private navParams: NavParams,
     ) { }
-S
+
   ngOnInit() {
-    this.segment = this.navParams.get('segment');
+    this.profile = this.navParams.get('profile');
     /* console.log(this.navParams.get('md')); */
-    console.log(this.segment);
+    console.log(this.profile);
     
     this.LoadToApproveEvents();
     

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

@@ -70,7 +70,7 @@
       <!-- 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 [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
+        <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>
       </div>

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

@@ -149,11 +149,11 @@ ion-content{
 
 
 
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 801px) {
 
   .main-content{
     .aside-wrapper{
-      width: 40%;
+      width: 35%;
       justify-content: flex-start !important;
       border-right: 1px solid #d8d8d8;
       .aside-title{
@@ -163,7 +163,7 @@ ion-content{
       }
     }
     .aside-content{
-      width: 60%;
+      width: 65%;
       display: flex !important;
       background-color: white;
     }
@@ -198,3 +198,23 @@ ion-content{
     }
   } 
 }
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+@media only screen and (min-width: 1140px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 75%;
+    border-right: 1px solid #d8d8d8;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}

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

@@ -83,7 +83,7 @@ export class GabineteDigitalPage implements OnInit {
   }  
   ngOnInit() {
     //Initialize profile as mdgpr
-    this.profile = "mdgpr";
+    this.profile = "MDGPR";
     this.LoadCounts();
     /* this.eventService.getAllMdEvents.subscribe(res=>{
       console.log(res);
@@ -138,17 +138,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  openEventsToApprovePage(segment:any){
+  openEventsToApprovePage(profile:any){
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 1024){
-      this.openEventsToApproveList(segment);
+      this.openEventsToApproveList(profile);
     }
     else{
       this.showEventsToApprove = true;
     }
   }
   
-  async openEventsToApproveList(segment:any){
+  async openEventsToApproveList(profile:any){
     
     this.closeAllDesktopComponent();
 
@@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
       const modal = await this.modalController.create({
         component: EventListPage,
         componentProps:{
-          segment: segment,
+          profile: profile,
         },
         cssClass: classs,
         backdropDismiss: false

src/app/pages/publications/publications.page.html

@@ -10,12 +10,12 @@
   </ion-refresher>
 
   <!-- Main container -->
-  <div class="d-flex  height-100 background-white overflow-hidden border-t-radius ">
+  <div class="main-content d-flex  height-100 background-white overflow-hidden border-t-radius ">
     <!-- Left -->
-    <div class="d-flex flex-grow-1 flex-column aside max-width-md-40">
+    <div class="aside-left app-default-padding d-flex flex-grow-1 flex-column aside max-width-md-35">
       <!-- Header -->
       <ion-toolbar >
-        <div class="main-header pt-25">
+        <div class="main-header">
           <div class="title-content">
             <div class="div-title">
               <ion-label class="title">Ações Presidenciais</ion-label>
@@ -58,8 +58,7 @@
     </div>
 
     <!-- Right -->
-    <div class="d-none d-md-flex flex-grow-1 flex-column max-width-60"
-      style="border-left: 1px solid #d8d8d8;">
+    <div class="content d-none d-md-flex flex-grow-1 flex-column max-width-65 max-width-md-60">
 
       <div class="width-100 height-100 d-flex align-center justify-center" 
         *ngIf="(
@@ -67,7 +66,7 @@
           desktopComponent.showAddNewPublication == false &&
           desktopComponent.showPublicationDetail == false &&
           desktopComponent.showAddActions == false
-        )"><div>Nenhuma ação presidencial selecionado</div></div>
+        )"><div>Nenhuma ação presidencial selecionada</div></div>
      
       <!-- View Publication -->
       <app-view-publications 

src/app/pages/publications/publications.page.scss

@@ -48,11 +48,8 @@ ion-toolbar{
     width: 100%; /* 400px */
     height: 100%;
     font-family: Roboto;
-    border-top-left-radius: 25px;
-    border-top-right-radius: 25px;
     background-color: #fff;
     overflow:hidden;
-    padding: 30px 20px 0px 20px;
     color:#000;
     transform: translate3d(0, 1px, 0);
     
@@ -82,13 +79,15 @@ ion-toolbar{
     }
   }
   .main-content{
-    width: 100%; /* 400px */
-    height: 100%;
     font-family: Roboto;
-    margin: 0 auto;
     background-color: #fff;
     overflow:auto;
-    padding: 15px 20px 0 20px;
+    .aside-left{
+      border-right: 1px solid #d8d8d8;
+    }
+    .content{
+      //border: 1px solid red;
+    }
   }
   .item{
     padding: 0 0px 0 0px;

src/app/pages/search/organic-entity/organic-entity.page.ts

@@ -50,10 +50,10 @@ export class OrganicEntityPage implements OnInit {
   }
 
   selectOrganicEntidy(selectedOraganicEntit: string){
-    this.close(selectedOraganicEntit)
+    this.modalController.dismiss(selectedOraganicEntit);
   }
 
-  close(username: string){
-    this.modalController.dismiss(username);
+  close(){
+    this.modalController.dismiss();
   }
 }

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

@@ -32,7 +32,7 @@ export class SenderPage implements OnInit {
     });
   }
   
-  filterContact(){
+  filterContact(event?:any){
 
     const findPerson = this.sender.toLowerCase();
     const persons = this.contacts.filter((person) => {
@@ -52,7 +52,7 @@ export class SenderPage implements OnInit {
     this.close(this.selectedUser);
   }
 
-  close(username: string){
+  close(username?: string){
     this.modalController.dismiss(username);
   }
 

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

@@ -2,7 +2,7 @@
   <div class="title width-100">
     <label>Eventos para Aprovação</label>
     <ion-toolbar>
-      <ion-segment [(ngModel)]="segment">
+      <ion-segment [(ngModel)]="profile">
         <ion-segment-button value="MDGPR">
           Seu calendário
         </ion-segment-button>
@@ -17,7 +17,7 @@
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
+  <div class="main-content" [ngSwitch]="profile" *ngIf="eventsMDGPRList">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> --> 

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

@@ -23,7 +23,7 @@ export class EventsToApprovePage implements OnInit {
   categories: string[];
   serialnumber:string;
 
-  @Input() segment:string;
+  @Input() profile:string;
 
   constructor(
     private processes:ProcessesService,
@@ -35,9 +35,8 @@ S
   ngOnInit() {
     //this.segment = this.navParams.get('segment');
     /* console.log(this.navParams.get('md')); */
-    console.log(this.segment);
+    console.log(this.profile);
     this.LoadToApproveEvents();
-    
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {

src/global.scss

@@ -312,6 +312,9 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         width: 100%;
     } */
 }
+.app-default-padding{
+    padding: 30px 20px 0 20px !important;
+}
 .showAsideOptions{
 
     @media only screen and (min-width: 801px) {

src/style/main.scss

@@ -208,6 +208,7 @@
 .max-width-md-60{max-width: 60%;}
 .max-width-md-50{max-width: 50%;}
 .max-width-md-40{max-width: 40%;}
+.max-width-md-35{max-width: 35%;}
 .max-width-md-30{max-width: 30%;}
 .max-width-md-20{max-width: 20%;}
 .max-width-md-10{max-width: 10%;}
@@ -383,9 +384,11 @@
 .max-width-80{max-width: 80%;}
 .max-width-70{max-width: 70%;}
 .max-width-60{max-width: 60%;}
+.max-width-65{max-width: 65%;}
 .max-width-50{max-width: 50%;}
 .max-width-45{max-width: 45%;}
 .max-width-40{max-width: 40%;}
+.max-width-35{max-width: 35%;}
 .max-width-30{max-width: 30%;}
 .max-width-20{max-width: 20%;}
 .max-width-10{max-width: 10%;}