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

package-lock.json

@@ -19108,8 +19108,7 @@
         },
         "ssri": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "resolved": "",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"

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

@@ -176,12 +176,16 @@ const routes: Routes = [
             path:'',
             loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)
           },
+          {
+            path:':folderId',
+            loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)
+          },
           {
             path:'view-publications',
             children: [
               {
-                path:':folderId',
+                path:':folderId/:publicationId',
-                loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)
+                loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)
               },
               {
                 path:'publication-detail',

src/app/modals/forward/forward.page.ts

@@ -121,8 +121,8 @@ export class ForwardPage implements OnInit {
       Attachments: DocumentToSave,
     }
     
-    if(this.taskParticipants.length > 1){
+    if(this.taskParticipants.length < 1){
-      this.toastService.badRequest("Selecione apenas um destinatário");
+      this.toastService.badRequest("Selecione um destinatário");
     }
     else {
 

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

@@ -133,7 +133,13 @@ export class ApproveEventPage implements OnInit {
   }
   
   async getAttachments(instanceId:string){
-    this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise();
+    try {
+      this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise();
+      
+    } catch (error) {
+      
+    }
+   
   }
 
   viewDocument(sourceId){

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

@@ -35,7 +35,7 @@
         <ion-list>
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
-              *ngFor="let event of eventsMDGPRList" (click)="goToEventDetail(event)">
+              *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
               
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
@@ -57,7 +57,7 @@
       <div *ngIf="eventsPRList">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
-              *ngFor="let event of eventsPRList" (click)="goToEventDetail(event)">
+              *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

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

@@ -75,27 +75,15 @@ export class EventListPage implements OnInit {
     await modal.present();
   }
 
-  goToEventDetail(eventToAprove){
+  goToEventToApproveDetail(serialNumber:string){
-    let InstanceId;
-
-    if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
-      InstanceId = ''
-    } else {
-      InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
-    }
-
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": eventToAprove.serialNumber,
+        "serialNumber": serialNumber,
       }
     };
     this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
-
-
-
-
   doRefresh() {
     this.LoadToApproveEvents();
     console.log('refresh');

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -35,14 +35,14 @@
 
       <div class="overflow-y-auto">
         <div class="middle-content">
-          <h5 *ngIf="intervenientes">Intervenientes</h5>
+          <!-- <h5 *ngIf="intervenientes">Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
             <ion-label>
               <div *ngFor="let interveniente of intervenientes">
                 <p>{{interveniente.Name}}</p>
               </div>
             </ion-label>
-          </ion-item>
+          </ion-item> -->
           <div *ngIf="cc.length > 0">
             <h5>Com conhecimento</h5>
             <ion-item class="ion-no-margin ion-no-padding">

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

@@ -36,7 +36,7 @@
       <div class="main-content overflow-auto-y">
         <div class="item d-flex" 
           *ngFor="let viagem of publicationsTravelFolderList"
-          (click)="viewPublications(viagem.ProcessId)">
+          (click)="goToPublicationsList(viagem.ProcessId)">
           <div class="item-icon">
             <ion-icon slot="end" src='assets/images/icons-plane-active.svg'></ion-icon>
           </div>

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

@@ -152,6 +152,17 @@ export class PublicationsPage implements OnInit {
 
   }
 
+  goToPublicationsList(folderId: string){
+    if( window.innerWidth <= 800){
+      this.router.navigate(['/home/publications',folderId]);
+    } else {
+      this.closeDesktopComponent();
+      this.folderId = folderId
+      this.desktopComponent.showViewPublication = true; 
+    }
+
+  }
+
   async viewPublications(folderId: string) {
 
     const enterAnimation = (baseEl: any) => {

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

@@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular';
 import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module';
 
 import { PublicationDetailPage } from './publication-detail.page';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    PublicationDetailPageRoutingModule
+    PublicationDetailPageRoutingModule,
+    HeaderPageModule,
   ],
   declarations: [PublicationDetailPage]
 })

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

@@ -1,9 +1,12 @@
+<ion-header class="ion-no-border">
+  <app-header></app-header>
+</ion-header>
 
 <ion-content>
 
   <div class="content-container">
     <div *ngIf="publication.Title != ''">
-    <div class="title-content px-20" (click)="close()">
+    <div class="title-content px-20" (click)="goBack()">
       <div class="back-icon">
         <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
       </div>

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

@@ -1,10 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController, NavParams } from '@ionic/angular';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AnimationController, ModalController } from '@ionic/angular';
 import { Publication } from 'src/app/models/publication';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { ImageModalPage } from '../../gallery/image-modal/image-modal.page';
 import { NewPublicationPage } from '../../new-publication/new-publication.page';
 
@@ -21,13 +20,21 @@ export class PublicationDetailPage implements OnInit {
 
   constructor(
     private modalController: ModalController,
-    private navParams:NavParams,
     private publications:PublicationsService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private activatedRoute: ActivatedRoute,
+    private router: Router, 
     ) { 
-      this.publicationId = this.navParams.get('publicationId');
+      this.activatedRoute.paramMap.subscribe(params => {
-      this.folderId = this.navParams.get('folderId');
+        console.log(params);
+        if(params["params"]) {
+          this.folderId = params["params"].folderId;
+          this.publicationId = params["params"].publicationId;
+          console.log(params["params"]);
+        }
+      });
+      
       this.publication = {
         DateIndex: null,
         DocumentId: '',
@@ -80,6 +87,10 @@ export class PublicationDetailPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  goBack(){
+    this.router.navigate(['/home/publications', this.folderId]);
+  }
+
 
   async deletePost(){
 

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

@@ -8,6 +8,7 @@ import { ViewPublicationsPageRoutingModule } from './view-publications-routing.m
 
 import { ViewPublicationsPage } from './view-publications.page';
 import { ComponentsModule } from 'src/app/components/components.module';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
   imports: [
@@ -15,7 +16,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
     FormsModule,
     IonicModule,
     ComponentsModule,
-    ViewPublicationsPageRoutingModule
+    ViewPublicationsPageRoutingModule,
+    HeaderPageModule,
   ],
   exports: [ViewPublicationsPage],
   declarations: [ViewPublicationsPage]

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

@@ -1,10 +1,13 @@
 
-
 <ion-header class="ion-no-border">
-  <ion-toolbar class="bg-blue">
+  <app-header></app-header>
+</ion-header>
+
+<ion-header class="ion-no-border">
+  <!-- <ion-toolbar class="bg-blue"> -->
   <div class="main-header">
     <div class="title-content d-flex">
-      <div class="back-icon" (click)="close()">
+      <div class="back-icon" (click)="goBack()">
         <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
       </div>
       <div class="div-title flex-grow-1">
@@ -18,7 +21,7 @@
       </div>
     </div>
   </div>
-  </ion-toolbar>
+  <!-- </ion-toolbar> -->
 </ion-header>
 
 <ion-content>
@@ -32,7 +35,7 @@
       <!-- [routerLink]="['/home/publications/view-publications/publication-detail', publication.publicationId]" -->
       <div class="post-item"
       *ngFor="let publication of publicationList"
-      (click)="viewPublicationDetail(publication.DocumentId)">
+      (click)="goToPublicationDetail(publication.DocumentId)">
         <div *ngIf="publication.FileBase64.length > 30" class="post-img">
           <img src="{{publication.FileBase64}}" alt="image">
         </div>

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

@@ -4,7 +4,7 @@
   }
   ion-content{
     --background: transparent;
-    transform: translate3d(0, 5px, 0);
+    //transform: translate3d(0, 5px, 0);
     --border-radius: 30px;
   }
   ion-toolbar{
@@ -52,7 +52,6 @@
     overflow:hidden;
     padding: 25px 20px 0px 20px;
     color:#000;
-    
   }
   .main-content{
     width: 100%; /* 400px */
@@ -60,7 +59,6 @@
     font-family: Roboto;
     margin: 0 auto;
     background-color: #fff;
-
     padding: 15px 20px 0 20px;
   }
   .content-top{

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

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController } from '@ionic/angular';
 import { Publication } from 'src/app/models/publication';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -24,11 +25,20 @@ export class ViewPublicationsPage implements OnInit {
     private loadingController: LoadingService,
     private modalController: ModalController,
     private publications: PublicationsService,
-    private navParams: NavParams,
+    private activatedRoute: ActivatedRoute,
-    ) { 
+    private router: Router, 
+    )
+    { 
       this.item = new PublicationFolder();
-      this.folderId = this.navParams.get('folderId');
+      this.activatedRoute.paramMap.subscribe(params => {
-     }
+        console.log(params);
+        
+        if(params["params"]) {
+          this.folderId = params["params"].folderId;
+          console.log(params["params"]);
+        }
+      });
+    }
 
   ngOnInit() {
     console.log(this.folderId);
@@ -48,6 +58,9 @@ export class ViewPublicationsPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
+  goBack(){
+    this.router.navigate(['/home/publications']);
+  }
   getPublicationDetail(){
     this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{
       console.log(res);
@@ -102,6 +115,10 @@ export class ViewPublicationsPage implements OnInit {
     });
   }
 
+  goToPublicationDetail(publicationId:string){
+    this.router.navigate(['/home/publications/view-publications', this.folderId, publicationId]);
+  }
+
   async viewPublicationDetail(publicationId:string) {
     const modal = await this.modalController.create({
       component: PublicationDetailPage,

src/app/shared/publication/view-publications/view-publications.page.scss

@@ -1,4 +1,11 @@
+
 :host{
+
+  ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+
     background: transparent;
     padding: 0!important;
   }
@@ -56,15 +63,12 @@
     color:#000;
     
   }
-  .main-content{
+  .main-container{
-    width: 100%; /* 400px */
+    width: 100%;
-    height: 100%;
+    height: 100% !important;
-    font-family: Roboto;
+    overflow-y: auto;
-    margin: 0 auto;
-    background-color: #fff;
-    overflow:auto;
-    padding: 15px 20px 0 20px;
   }
+
   .content-top{
     background: #f3f2f2;
     height: 20px;
@@ -73,17 +77,6 @@
     border-top-right-radius: 25px;
     transform: translate3d(0, 1px, 0);
 }
-  .content-container{
-    width: 100%;
-    margin:0 auto;
-    border-top-left-radius: 25px;
-    border-top-right-radius: 25px;
-    background: #ffffff;
-    height: 100%;
-    box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6);
-    padding: 25px 0px 0 0px;
-    overflow: auto;
-  }
   .title-content{
     margin: 0px auto;
     overflow: auto;

src/global.scss

@@ -863,3 +863,7 @@ background: rgb(92, 92, 92);
       display:  none;
     }
 }
+
+.modal {
+    display: flex !important;
+    }