Git pull made

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
 import { PermissionService } from 'src/app/services/worker/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-despachos-options',
@@ -32,7 +32,8 @@ export class DespachosOptionsPage implements OnInit {
     private navParams: NavParams,
     private toastService: ToastService,
     public p: PermissionService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private location: Location,
     ) { 
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
@@ -143,8 +144,14 @@ export class DespachosOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then(res=>{
-      this.goBack();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
     });
   }
 
@@ -309,7 +316,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
+    this.location.back();
   }
 
 }

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -35,7 +35,8 @@ export class DespachosPrOptionsPage implements OnInit {
     private toastService: ToastService,
     private location: Location,
     public p: PermissionService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    
   ) { }
 
   ngOnInit() {
@@ -174,7 +175,15 @@ export class DespachosPrOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async generateDiploma(note:string, documents:any) {
@@ -363,7 +372,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos-pr'])
+    this.location.back();
   }
 
   cancle() {

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

@@ -1,12 +1,10 @@
-
-
 <ion-header class="ion-no-border">
   <div class="main-header">
     <div class="title-content d-flex flex-end">
     <!--   <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">
+      <div *ngIf="item" class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
         <p class="item-content-detail">{{item.Detail}}</p>
         <p class="item-content-date">{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}</p>
@@ -34,7 +32,7 @@
   <div class="main-container px-20">
     <ion-list>
       <!-- [routerLink]="['/home/publications/view-publications/publication-detail', publication.publicationId]" -->
-      <div class="post-item  d-md-block mb-10"
+      <div class="post-item  d-md-block mb-10 cursor-pointer"
         *ngFor="let publication of publicationListStorage.documents[folderId]"
         (click)="viewPublicationDetail(publication.DocumentId)">
         <div *ngIf="publication.FileBase64.length > 30" class="mb-10 post-img width-md-100">

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

@@ -4,7 +4,7 @@ import { Publication } from 'src/app/models/publication';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { LoadingService } from 'src/app/services/loading.service';
 import { PublicationsService } from 'src/app/services/publications.service';
-import { PublicationDetailPage } from 'src/app/pages/publications/publication-detail/publication-detail.page';
+
 import { NewPublicationPage } from 'src/app/pages/publications/new-publication/new-publication.page';
 import { PublicationListStorage } from 'src/app/store/publication-list.service'
 import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';