Merge branch 'developer' into developer_mobilefirst

src/app/pages/agenda/agenda.page.ts

@@ -26,6 +26,7 @@ import { NewEventPage } from './new-event/new-event.page';
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
 import { letProto } from 'rxjs-compat/operator/let';
+import { DateAdapter } from '@angular/material/core';
 
 @Component({
   selector: 'app-agenda',
@@ -158,7 +159,12 @@ export class AgendaPage implements OnInit {
     private router: Router,
     private alertController: AlertService,
     private sanitizer: DomSanitizer,
-    authService: AuthService) {
+    authService: AuthService,
+    private dateAdapter: DateAdapter<any>
+    ) {
+    this.dateAdapter.setLocale('es');
+
+    this.locale = 'pt'
 
     this.loggeduser = authService.ValidatedUser;
 

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/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.folderId = this.navParams.get('folderId');
+      this.activatedRoute.paramMap.subscribe(params => {
+        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.page.html

@@ -35,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.ts

@@ -115,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,