changes no publications

This commit is contained in:
Eudes Inácio
2022-01-28 19:02:44 +01:00
parent f2d649b9b2
commit dfb1e169d8
7 changed files with 74 additions and 28 deletions
+27
View File
@@ -3074,6 +3074,13 @@
"integrity": "sha512-Xeabtfjw/OCa8tZUh3yVqomVNMztwmg0hXYrcX18r3+Zq0XYRSgNtsBHrye1rBgNkXYqblWQHZQErwrAC2UNxQ==", "integrity": "sha512-Xeabtfjw/OCa8tZUh3yVqomVNMztwmg0hXYrcX18r3+Zq0XYRSgNtsBHrye1rBgNkXYqblWQHZQErwrAC2UNxQ==",
"requires": { "requires": {
"@types/cordova": "^0.0.34" "@types/cordova": "^0.0.34"
},
"dependencies": {
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
}
} }
}, },
"@ionic-native/local-notifications": { "@ionic-native/local-notifications": {
@@ -11800,6 +11807,26 @@
"resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.9.10.tgz", "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.9.10.tgz",
"integrity": "sha512-4nmGrdpu4Zy3SZwF0AaS/3gDrbFGU1dV+zn1eqInFgFj9q20N1cIITgvyIcoxUI/IoqYiohsJX1rGY5vB/HrhQ==" "integrity": "sha512-4nmGrdpu4Zy3SZwF0AaS/3gDrbFGU1dV+zn1eqInFgFj9q20N1cIITgvyIcoxUI/IoqYiohsJX1rGY5vB/HrhQ=="
}, },
"ionic-image-loader": {
"version": "6.3.3",
"resolved": "https://registry.npmjs.org/ionic-image-loader/-/ionic-image-loader-6.3.3.tgz",
"integrity": "sha512-X7AbaY3Yt3q0+kOjodjqYwTkXNhRTs3/P/afffaWLBPk5frsd7JCNaFae9U8iErwfOIbJ7VZmCHYMApBZ3Aqew=="
},
"ionic-image-loader-v5": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/ionic-image-loader-v5/-/ionic-image-loader-v5-1.0.2.tgz",
"integrity": "sha512-SsFRVjA4p6nloF+xljMctj3Uc1a74rG7HA4nDQ3zJNZgLa8S/6GqR9fr8qDb7/L3441i4ICrdQSKyfAkddbELQ==",
"requires": {
"tslib": "^1.9.0"
},
"dependencies": {
"tslib": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
}
}
},
"ionic-selectable": { "ionic-selectable": {
"version": "4.9.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/ionic-selectable/-/ionic-selectable-4.9.0.tgz", "resolved": "https://registry.npmjs.org/ionic-selectable/-/ionic-selectable-4.9.0.tgz",
+3 -1
View File
@@ -65,7 +65,7 @@
"@ionic-native/http": "^5.31.1", "@ionic-native/http": "^5.31.1",
"@ionic-native/image-picker": "^5.36.0", "@ionic-native/image-picker": "^5.36.0",
"@ionic-native/in-app-browser": "^5.28.0", "@ionic-native/in-app-browser": "^5.28.0",
"@ionic-native/ionic-webview": "^5.35.0", "@ionic-native/ionic-webview": "^5.36.0",
"@ionic-native/local-notifications": "^4.20.0", "@ionic-native/local-notifications": "^4.20.0",
"@ionic-native/media": "^5.36.0", "@ionic-native/media": "^5.36.0",
"@ionic-native/media-capture": "^5.36.0", "@ionic-native/media-capture": "^5.36.0",
@@ -119,6 +119,8 @@
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"http-server": "^0.12.3", "http-server": "^0.12.3",
"ionic-angular": "^3.9.10", "ionic-angular": "^3.9.10",
"ionic-image-loader": "^6.3.3",
"ionic-image-loader-v5": "^1.0.2",
"ionic-selectable": "^4.7.1", "ionic-selectable": "^4.7.1",
"ionic2-alpha-scroll": "^2.0.1", "ionic2-alpha-scroll": "^2.0.1",
"ionic2-calendar": "^0.6.6", "ionic2-calendar": "^0.6.6",
+4
View File
@@ -67,6 +67,7 @@ import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
import { PhotoViewer } from '@ionic-native/photo-viewer/ngx'; import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
import {NgxImageCompressService} from 'ngx-image-compress'; import {NgxImageCompressService} from 'ngx-image-compress';
import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module'; import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module';
import { IonicImageLoaderComponent, IonicImageLoaderModule } from 'ionic-image-loader-v5';
/* import { FCM } from '@ionic-native/fcm/ngx'; /* import { FCM } from '@ionic-native/fcm/ngx';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
@@ -82,10 +83,13 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
provide: DateAdapter, provide: DateAdapter,
useFactory: adapterFactory useFactory: adapterFactory
}), }),
IonicImageLoaderModule,
IonicModule.forRoot({animated: false}), IonicModule.forRoot({animated: false}),
IonicStorageModule.forRoot({ IonicStorageModule.forRoot({
name: '__mydb', name: '__mydb',
driverOrder: ['indexeddb', 'sqlite', 'websql'] driverOrder: ['indexeddb', 'sqlite', 'websql']
}), }),
AppRoutingModule, AppRoutingModule,
@@ -38,12 +38,14 @@
*ngFor="let publication of getpublication" *ngFor="let publication of getpublication"
(click)="goToPublicationDetail(publication.DocumentId)" (click)="goToPublicationDetail(publication.DocumentId)"
> >
<div *ngIf="publication.FileBase64 != null">
<div *ngIf="publication.FileBase64.length > 30" class="post-img"> <div *ngIf="publication.FileBase64.length > 30" class="post-img">
<ion-img src="{{publication.FileBase64}}" alt="image"></ion-img> <img src="{{'data:image/jpeg;base64,' + publication.FileBase64}}" alt="image">
</div> </div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img"> <div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image"> <img src="/assets/icon/icon-no-image.svg" alt="image">
</div> </div>
</div>
<div class="post-content px-20"> <div class="post-content px-20">
<div class="post-title-time"> <div class="post-title-time">
<div class="post-title"> <div class="post-title">
@@ -68,7 +68,7 @@ export class ViewPublicationsPage implements OnInit {
if (typeof (this.folderId) == 'object') { if (typeof (this.folderId) == 'object') {
this.folderId = this.folderId['ProcessId'] this.folderId = this.folderId['ProcessId']
} }
this.testForkJoin() //this.testForkJoin()
this.getPublicationDetail(); this.getPublicationDetail();
setTimeout(() => { setTimeout(() => {
this.getPublicationsIds(); this.getPublicationsIds();
@@ -76,7 +76,7 @@ export class ViewPublicationsPage implements OnInit {
this.backgroundservice.registerBackService('Online', () => { this.backgroundservice.registerBackService('Online', () => {
this.getPublicationDetail(); this.getPublicationDetail();
this.testForkJoin() //this.testForkJoin()
}) })
@@ -91,16 +91,16 @@ export class ViewPublicationsPage implements OnInit {
// if (typeof (this.id == 'object') { // if (typeof (this.id == 'object') {
// this.id = this.id['ProcessId'] // this.id = this.id['ProcessId']
// } // }
this.testForkJoin() //this.testForkJoin()
this.getPublicationDetail(); this.getPublicationDetail();
// this.getPublicationsIds(); // this.getPublicationsIds();
} }
doRefresh = (event) => { doRefresh = (event) => {
setTimeout(() => { setTimeout(() => {
this.testForkJoin() //this.testForkJoin()
this.getPublicationDetail(); this.getPublicationDetail();
// this.getPublicationsIds(); this.getPublicationsIds();
event.target.complete(); event.target.complete();
}, 3000); }, 3000);
@@ -138,7 +138,7 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = true; this.showLoader = true;
const folderId = this.folderId const folderId = this.folderId
this.getFromDB()
this.publications.GetPublicationsImages(this.folderId).subscribe(res => { this.publications.GetPublicationsImages(this.folderId).subscribe(res => {
console.log('publications ids', res) console.log('publications ids', res)
@@ -168,7 +168,6 @@ export class ViewPublicationsPage implements OnInit {
this.publicationListStorage.add(folderId, this.publicationList) this.publicationListStorage.add(folderId, this.publicationList)
this.getpublication = this.publicationList; this.getpublication = this.publicationList;
this.showLoader = false; this.showLoader = false;
/* this.publicationList = new Array(); /* this.publicationList = new Array();
@@ -189,7 +188,7 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = true; this.showLoader = true;
const folderId = this.folderId const folderId = this.folderId
this.getFromDB();
this.publications.GetPublications(this.folderId).subscribe(res => { this.publications.GetPublications(this.folderId).subscribe(res => {
console.log(this.folderId) console.log(this.folderId)
@@ -40,11 +40,21 @@ export class WsChatMethodsService {
} }
getRoomFromDb() {
this.storage.get('Rooms').then((rooms) => {
rooms.result.update.forEach((roomData: room) => {
this.prepareRoom(roomData);
});
})
};
async getAllRooms () { async getAllRooms () {
this.loadingWholeList = true this.loadingWholeList = true
this.getRoomFromDb();
const rooms = await this.WsChatService.getRooms(); const rooms = await this.WsChatService.getRooms();
this.storage.set('Rooms', rooms);
// console.log("ROOMS" + JSON.stringify(rooms)) // console.log("ROOMS" + JSON.stringify(rooms))
rooms.result.update.forEach((roomData: room) => { rooms.result.update.forEach((roomData: room) => {
+3 -1
View File
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
// import { HeaderPage } from './header/header.page'; // import { HeaderPage } from './header/header.page';
// import { HeaderPrPage } from './header-pr/header-pr.page'; // import { HeaderPrPage } from './header-pr/header-pr.page';
// import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; // import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
@@ -17,7 +18,8 @@ import { IonicModule } from '@ionic/angular';
imports: [ imports: [
CommonModule, CommonModule,
FormsModule, FormsModule,
IonicModule IonicModule,
IonicImageLoaderModule
], ],
exports: [ exports: [
// HeaderPage, // HeaderPage,