Merge feature/calendar to developer-c

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

@@ -152,6 +152,10 @@ const routes: Routes = [
               },
             ]  
           },
+          {
+            path:'new-publication',
+            loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule)
+          },
         ]
       },
       {

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

@@ -1,20 +1,20 @@
 <ion-content>
   <div class="main-content height-100">
 
-    <div class="content d-flex flex-column width-100 height-100">
+    <div class="content d-flex flex-column width-md-100 height-100">
       
       <div class="main-header pt-30 px-20 background-white pb-15">
         <ion-header>
         <div class="title-content">
           <div class="middle">
-            <ion-label class="title">Editar Evento com divisão</ion-label>
+            <ion-label class="title">Editar Evento</ion-label>
           </div>
         </div>
       </ion-header>
       </div>
       <ion-item-sliding class="overflow-y-auto">
       
-        <div>
+  
           <div class="px-20">
             <div class="ion-item-container width-100">
               <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
@@ -201,7 +201,7 @@
             </div>
             
           </div>
-        </div>
+        
 
         <div hidden>
           <ion-item>

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

@@ -67,16 +67,15 @@
 
 </ion-content>
 
-<!-- Hide footer in gabinete-digital -->
-<ion-footer class="ion-no-border" *ngIf="currentPath != '/home/gabinete-digital' ">
-  <ion-toolbar class="width-100 d-flex justify-space-between px-20">
-    <ion-buttons slot="start">
+<ion-footer class="ion-no-border">
+  <ion-toolbar class="d-flex">
+    <ion-buttons class="flex-grow-1" slot="start">
       <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>
         <ion-icon name="close" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
-    <ion-buttons slot="end">
+    <ion-buttons class="flex-grow-1" slot="end">
       <ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
         <ion-label>Gravar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ModalController, NavParams } from '@ionic/angular';
 import { ContactsService } from 'src/app/services/contacts.service';

src/app/pages/events/events.page.ts

@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.RefreshEvents();
+        this.LoadList();
       }
     });
     /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{
@@ -106,6 +107,7 @@ export class EventsPage implements OnInit {
 
   doRefresh(event) {
     this.RefreshEvents();
+    this.LoadList();
     event.target.complete();
   }
 

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

@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-title">
-      <label>Deseja eliminar este espediente?</label>
+      <label>Deseja eliminar este expediente?</label>
     </div>
     <div class="header-icon-left">
       <ion-icon (click)="close()" name="close-outline"></ion-icon>

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -51,7 +51,7 @@ export class DiscartExpedientModalPage implements OnInit {
       this.processes.PostTaskAction(body);
     }
     this.router.navigate(['/home/gabinete-digital/expediente']);
-    this.modalController.dismiss();
+    this.modalController.dismiss('close');
   }
 
 }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -6,8 +6,8 @@
   </div>
 </ion-header> -->
 
-<ion-content class="height-100">
-  <div class="main-content d-flex height-100">
+<ion-content>
+  <div class="main-content d-flex">
     <div class="content d-flex flex-column width-100">
       <div class="header-content">
         <div class="header-title">
@@ -150,12 +150,12 @@
     </div>
 
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
-          <ion-input [(ngModel)]="postData.Body.Text" placeholder="Detalhes"></ion-input>
+        <div class="ion-input-class-no-height width-100">
+          <ion-textarea [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>

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

@@ -12,6 +12,7 @@ import { AddParticipantsModalPage } from '../add-participants-modal/add-particip
 import { environment } from 'src/environments/environment';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
+import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -46,6 +47,7 @@ export class ExpedientTaskModalPage implements OnInit {
   showAttendees= false;
 
   adding: "intervenient" | "CC" = "intervenient";
+  profile: string;
 
   constructor(
     private modalController: ModalController,
@@ -76,6 +78,7 @@ export class ExpedientTaskModalPage implements OnInit {
       this.postData.SubjectTypeId = '99999844';
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
+      this.profile = this.navParams.get('profile');
   }
 
   async setAdding(type:  "intervenient" | "CC"){
@@ -93,15 +96,18 @@ export class ExpedientTaskModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  cancelTask(){
-    this.modalController.dismiss(null);
-  }
+  
   getSubjectType(){
     this.processes.GetSubjectType().subscribe(res=>{
       console.log(res);
       this.subjectTypes = res;
     });
   }
+  cancelTask(){
+    this.modalController.dismiss(null);
+    //this.viewExpedientDetail();
+    
+  }
   saveTask(){
    /* console.log(this.taskType); */
     
@@ -118,7 +124,9 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         console.log(this.postData);
-        this.processes.postDespatcho(this.postData);
+      /*   this.processes.postDespatcho(this.postData); */
+      //this.distartExpedientModal();
+      this.modalController.dismiss('openDiscart');
 
         break;
       case '1':
@@ -131,7 +139,9 @@ export class ExpedientTaskModalPage implements OnInit {
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
-        this.processes.postParecer(this.postData);
+        /* this.processes.postParecer(this.postData); */
+        //this.distartExpedientModal();
+        this.modalController.dismiss();
         break;
       case '2':
         this.postData = {
@@ -144,10 +154,13 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         this.processes.postDeferimento(this.postData);
+        //this.distartExpedientModal();
+        this.close();
         break;
     }
-    this.distartExpedientModal();
-    this.close();
+    /* this.distartExpedientModal();
+    this.close(); */
+    
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
@@ -245,7 +258,13 @@ export class ExpedientTaskModalPage implements OnInit {
     });
     
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        console.log('Expedient Discard closed');
+        this.modalController.dismiss(res['data'])
+      }
+      
+    });
   }
 
   async setContact(data:EventPerson[]){
@@ -271,4 +290,32 @@ export class ExpedientTaskModalPage implements OnInit {
     this.showAttendees = false;
   }
 
+  async viewExpedientDetail() {
+    console.log(this.profile);
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        serialNumber: this.task.serialNumber,
+        profile: this.profile,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('!refresh list');
+    });
+  }
+
+
+
+
 }

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

@@ -60,6 +60,10 @@ export class ExpedienteDetailPage implements OnInit {
     this.LoadRelatedEvents(this.serialnumber);
   }
 
+  close(){
+    this.modalController.dismiss();
+  }
+
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
@@ -120,9 +124,11 @@ export class ExpedienteDetailPage implements OnInit {
 
   openMenu() {
     this.menu.open();
+    this.modalController.dismiss();
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal'
@@ -134,11 +140,21 @@ export class ExpedienteDetailPage implements OnInit {
       componentProps: {
         taskAction: taskAction,
         task: task,
+        profile: this.profile,
       },
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        this.distartExpedientModal();
+
+      }
+
+    });
   }
 
   discartExpedient() {
@@ -148,7 +164,7 @@ export class ExpedienteDetailPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']); */
   }
 
-  async distartExpedientModal(task: any){
+  async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {
@@ -201,4 +217,28 @@ export class ExpedienteDetailPage implements OnInit {
       }
     });
   }
+  async distartExpedientModal(){
+    console.log(this.fulltask);
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
 }

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

@@ -40,8 +40,9 @@ export class ExpedientePage implements OnInit {
 
   LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      let tasksListReverse = result.reverse();
       this.taskslist = new Array();
-      result.forEach(element => {
+      tasksListReverse.forEach(element => {
         let task: DailyWorkTask = {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceDataFields.Subject,
@@ -67,7 +68,7 @@ export class ExpedientePage implements OnInit {
     console.log(this.profile);
 
     let classs;
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
       classs = 'gabinete-digital-mobile-modal-to-Desktop'
@@ -84,7 +85,8 @@ export class ExpedientePage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{
-      
+      console.log('refresh list');
+      this.LoadList();
     });
   }
 

src/app/pages/publications/new-action/new-action.page.html

@@ -15,7 +15,6 @@
 </ion-header>
 
 <ion-content>
-  <div class="content-top"></div>
   <div class="content-container">
     <div class="title-content">
       <div class="div-title">

src/app/pages/publications/new-publication/new-publication.page.html

@@ -15,7 +15,6 @@
 </ion-header>
 
 <ion-content>
-  <div class="content-top"></div>
   <div class="content-container">
     <div class="title-content">
       <div class="div-title">

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

@@ -86,7 +86,7 @@
         class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1"
         [folderId]="folderId"
         [publicationType]="publicationType"
-        [publication]="publication"
+
         (closeDesktopComponent)="closeDesktopComponent($event)"
         (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)"
         (goBackToViewPublications)="goBackToViewPublications($event)"

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts

@@ -22,7 +22,7 @@ export class PublicationDetailPage implements OnInit {
     private publications:PublicationsService,
     ) { 
       this.publicationId = this.navParams.get('publicationId');
-      /* this.folderId = this.navParams.get('folderIdId'); */
+      this.folderId = this.navParams.get('folderId');
       this.publication = {
         DateIndex: null,
         DocumentId: '',
@@ -78,7 +78,6 @@ export class PublicationDetailPage implements OnInit {
   deletePost(){
     this.publications.DeletePublication(this.folderId, this.publicationId).then(res =>{
       console.log(res);
-      
     });
     this.close();
   }

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -107,13 +107,14 @@ export class ViewPublicationsPage implements OnInit {
       component: PublicationDetailPage,
       componentProps:{
         publicationId: publicationId,
+        folderId: this.folderId,
       },
       cssClass: 'publication-detail',
       backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then(()=>{
-      this.doRefresh(event);
+      this.getPublications();
     });
   }
 

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

@@ -105,7 +105,7 @@
   
           <!-- most searched word-->
           <div class="most-searched-words d-md-flex flex-md-column">
-            <p class="title ion-text-center">Assunto mais pesquisado</p>
+            <p class="title ion-text-center">Assuntos mais recebidos</p>
             <div class="most-searched-word-container height-100 overflow-y-auto">
             </div>
           </div>
@@ -121,8 +121,8 @@
                   <div class="d-flex sort-by ion-justify-content-center">
                     <p>
                       <span class="order">Order por:</span>
-                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recente</span>
-                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigo</span>
+                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recentes</span>
+                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigos</span>
                     </p>
                   </div>
                   <div>

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

@@ -9,6 +9,7 @@ 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';
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
@@ -421,6 +422,8 @@ export class SearchPage implements OnInit {
 
 
   async viewDetail(id:any) {
+    console.log(id);
+    
     
     if(window.location.pathname  == '/home/agenda'){
 
@@ -430,7 +433,6 @@ export class SearchPage implements OnInit {
           eventId: id
         },
         cssClass: 'modal modal-desktop',
-        backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss().then((res)=>{});
@@ -439,6 +441,10 @@ export class SearchPage implements OnInit {
         
       this.viewPublicationDetail(id);
     }
+    else if(window.location.pathname == '/home/gabinete-digital'){
+      console.log('OPEN DOC');
+      
+    }
 
   }
 
@@ -456,5 +462,28 @@ export class SearchPage implements OnInit {
     modal.onDidDismiss().then(()=>{});
 
   }
+
+  async viewExpedientDetail(serialNumber:any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        serialNumber: serialNumber,
+        profile: 'mdgpr',
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+    });
+  }
   
 }

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

@@ -67,12 +67,14 @@
       </div>
       <div class="line"></div>
       <div class="middle-content">
-        <h5>Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-          </ion-label>
-        </ion-item>
+        <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
+          <h5>Intervenientes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label>
+              <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
+            </ion-label>
+          </ion-item>
+        </div>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
             <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>

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

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">2Editar Evento</ion-label>
+          <ion-label class="title">Editar Evento</ion-label>
         </div>
       </div>
     </div>

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

@@ -91,7 +91,8 @@ export class ExpedientsPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{
-      
+      console.log('refresh list');
+      this.LoadList();
     });
   }
 

src/app/shared/publication/new-publication/new-publication.page.html

@@ -13,7 +13,7 @@
 <div class="content-container">
 
   <div  *ngIf="publicationType!='1'" class="ion-item-container">
-    <ion-input [(ngModel)]="pub.Title" name="title" ngDefaultControl placeholder="Título" ></ion-input>
+    <ion-input [(ngModel)]="pub.Title" name="title" placeholder="Título" ></ion-input>
   </div>
 
  
@@ -31,7 +31,7 @@
   
   <div class="container-title py-10 hide-desktop">Fotografia Anexada</div>
 
-  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64.length > 10">
+  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64">
     <div  class="post-img">
       <img src="{{publication.FileBase64}}" alt="image" >
     </div>
@@ -45,26 +45,26 @@
     
   </div>
 
-  <div *ngIf="capturedImage != ''" class="ion-item-container-no-border hide-desktop">
+  <!-- <div *ngIf="capturedImage != ''" class="ion-item-container-no-border hide-desktop">
     <ion-label class="attached-title">Fotografia Anexada</ion-label>
     <ion-item lines="none">
       <ion-thumbnail slot="start">
         <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="'data:image/png;base64,'+capturedImage"></ion-img>
-      </ion-thumbnail>
+      </ion-thumbnail> -->
     <!--  <ion-thumbnail *ngIf="!publication" slot="start">
         <ion-img [(ngModel)]="publication.imageUrl" [src]="guestPicture"></ion-img>
       </ion-thumbnail> -->
-      <ion-label>
+      <!-- <ion-label>
         <p>{{capturedImageTitle}}</p>
         <p hidden>size</p>
       </ion-label>
       <ion-icon (click)="clear()" name="close"></ion-icon>
-    </ion-item>
+    </ion-item> -->
     
     <!-- <ion-thumbnail>
       <ion-img src="{{imgUrl}}"></ion-img>
     </ion-thumbnail> -->
-  </div>
+  <!-- </div> -->
 
   <div class="ion-item-container-no-border hide-desktop">
     <ion-label (click)="takePicture()">

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -35,7 +35,8 @@ export class NewPublicationPage implements OnInit {
 
   photo: SafeResourceUrl;
 
-  @Input() publication: Publication;
+  publication: Publication = new Publication();
+
   @Input() publicationType: string;
   @Input() folderId: string;
   @Output() closeDesktopComponent =  new EventEmitter<any>();
@@ -159,7 +160,7 @@ export class NewPublicationPage implements OnInit {
       console.log(this.publication);
       this.publications.CreatePublication(this.folderId, this.publication);
 
-      this.closeDesktopComponent.emit();
+      this.goBackToViewPublications.emit();
     }
   }
 

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

@@ -86,7 +86,7 @@ export class PublicationDetailPage implements OnInit {
       console.log(res);
       
     });
-   this.closeDesktopComponent.emit();
+   this.goBackToViewPublications.emit();
   }
 
   async editPost(publicationType:any) {

src/global.scss

@@ -330,7 +330,7 @@ border-top: 1px solid #d8d8d8;
 }
 .showAsideOptions{
 
-    @media only screen and (min-width: 801px) {
+    @media only screen and (min-width: 800px) {
         .div-icon{
           display: none;
         }
@@ -437,7 +437,7 @@ border-top: 1px solid #d8d8d8;
     }
 }
 
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 1365px) {
   .gabinete-digital-mobile-modal-to-Desktop{
     //top: 75px;
     left: 40%;

src/style/main.scss

@@ -65,7 +65,7 @@
 .flex-0{ flex: 0;}
 
 
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 800px) {
   // overflow
   .v-application-md .overflow-md-auto {overflow: auto !important;}
   .overflow-md-hidden {overflow: hidden !important;}