mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Merge branch 'feature/shared-content' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/shared-content
This commit is contained in:
+3
-2
@@ -1,4 +1,4 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
@@ -14,6 +14,7 @@ import { PublicationDetailPage } from './publication-detail.page';
|
||||
IonicModule,
|
||||
PublicationDetailPageRoutingModule,
|
||||
],
|
||||
declarations: [PublicationDetailPage]
|
||||
declarations: [PublicationDetailPage],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||
})
|
||||
export class PublicationDetailPageModule {}
|
||||
|
||||
+4
-4
@@ -23,17 +23,17 @@
|
||||
</div>
|
||||
|
||||
<div class="post-item overflow-y-auto">
|
||||
<swiper-container [modules]="swiperModules" [pagination]="{clickable: true, dynamicBullets: true }">
|
||||
<swiper-container [pagination]="{clickable: true, dynamicBullets: true }">
|
||||
<swiper-slide *ngFor="let files of publication.Files let k = index">
|
||||
<div (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)">
|
||||
<div>
|
||||
<img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img"
|
||||
src="{{'data:image/jpg;base64,' + files.FileBase64}}">
|
||||
|
||||
|
||||
<video *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
|
||||
webkit-playsinline="webkit-playsinline">
|
||||
<source src="{{'data:video/mp4;base64,' + files.FileBase64}}" type="video/mp4">
|
||||
</video>
|
||||
|
||||
|
||||
</div>
|
||||
</swiper-slide>
|
||||
</swiper-container>
|
||||
|
||||
+11
-6
@@ -29,6 +29,11 @@ export class PublicationDetailPage implements OnInit {
|
||||
isModal = false
|
||||
videoControls = false;
|
||||
|
||||
pagination = {
|
||||
clickable: true,
|
||||
dynamicBullets: true
|
||||
}
|
||||
|
||||
constructor(
|
||||
private modalController: ModalController,
|
||||
private publications:PublicationsService,
|
||||
@@ -50,7 +55,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
this.folderId = params["params"].folderId;
|
||||
this.DocumentId = params["params"].publicationId;
|
||||
this.isModal = params["params"].isModal;
|
||||
//
|
||||
//
|
||||
|
||||
console.log('params', params)
|
||||
if(this.DocumentId) {
|
||||
@@ -86,9 +91,9 @@ export class PublicationDetailPage implements OnInit {
|
||||
const folderId = this.folderId
|
||||
|
||||
this.showLoader = true;
|
||||
|
||||
|
||||
this.publications.GetPublicationWithArrayOfFilesById(this.DocumentId).subscribe(res => {
|
||||
|
||||
|
||||
/* this.publication = res; */
|
||||
this.publication = {
|
||||
DateIndex: res.DateIndex,
|
||||
@@ -101,7 +106,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
OriginalFileName: res.OriginalFileName,
|
||||
FileExtension: res.FileExtension,
|
||||
}
|
||||
|
||||
|
||||
console.log('this.publication', this.publication)
|
||||
this.showLoader = false;
|
||||
}, (error) => {
|
||||
@@ -161,7 +166,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
}
|
||||
|
||||
async editPost(publicationType:any) {
|
||||
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: NewPublicationPage,
|
||||
componentProps:{
|
||||
@@ -175,7 +180,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
|
||||
modal.onDidDismiss().then((data) => {
|
||||
if(data.data) {
|
||||
this.publication = data.data
|
||||
this.publication = data.data
|
||||
if(window['app-view-publications-page-doRefresh']) {
|
||||
window['app-view-publications-page-doRefresh']()
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
@@ -33,6 +33,7 @@ setup(attributes: Attributes) {
|
||||
],
|
||||
exports: [ViewPublicationsPage],
|
||||
declarations: [ViewPublicationsPage, VisibilityDirective],
|
||||
providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}]
|
||||
providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||
})
|
||||
export class ViewPublicationsPageModule {}
|
||||
|
||||
Reference in New Issue
Block a user