peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ChangeUi

Browse Source
This commit is contained in:
ivan gomes
2021-11-30 10:23:46 +01:00
parent 9c70c23919
commit b2e55317b5
7 changed files with 22 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/publications/new-publication/new-publication.page.ts
-9
View File
@@ -395,22 +395,13 @@ export class NewPublicationPage implements OnInit {
this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl));
} */
async selectImage() {
const image = await Camera.getPhoto({
<<<<<<< HEAD
quality: 50,
width:50,
height:50,
=======
quality: 20,
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
allowEditing: false,
resultType: CameraResultType.Uri,
source: CameraSource.Camera // Camera, Photos or Prompt!
});
if (image) {
this.saveImage(image)
}
src/app/pages/publications/view-publications/view-publications.page.html
-4
View File
@@ -39,11 +39,7 @@
(click)="goToPublicationDetail(publication.DocumentId)"
>
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<<<<<<< HEAD
<img [debug]= "true" [defaultImage] = "defaultImage" [lazyLoad]="publication.FileBase64" src="{{publication.FileBase64}}" alt="image">
=======
<ion-img src="{{publication.FileBase64}}" alt="image"></ion-img>
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
src/app/pages/publications/view-publications/view-publications.page.ts
+14 -63
View File
@@ -69,22 +69,10 @@ export class ViewPublicationsPage implements OnInit {
this.folderId = this.folderId['ProcessId']
}
<<<<<<< HEAD
if (typeof (this.id) == 'object') {
this.id = this.id['ProcessId']
}
this.getPublicationDetail();
setTimeout(() => {
this.testForkJoin()
// this.getPublications();
=======
this.getPublicationsIds()
this.getPublicationDetail();
setTimeout(() => {
this.getPublicationsIds();
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
}, 1000);
this.backgroundservice.registerBackService('Online', () => {
@@ -106,23 +94,14 @@ export class ViewPublicationsPage implements OnInit {
// }
this.testForkJoin()
this.getPublicationDetail();
<<<<<<< HEAD
// this.getPublications();
=======
this.getPublicationsIds();
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
}
doRefresh = (event) => {
setTimeout(() => {
this.testForkJoin()
this.getPublicationDetail();
<<<<<<< HEAD
// this.getPublications();
=======
this.getPublicationsIds();
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
event.target.complete();
}, 3000);
@@ -161,51 +140,24 @@ export class ViewPublicationsPage implements OnInit {
this.publicationList = new Array();
<<<<<<< HEAD
res.forEach(element => {
console.log('getPublications', element)
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
});
this.sqliteservice.updateactions(this.id, JSON.stringify(this.publicationList));
// getPublicationsIds() {
// this.publicationListStorage.add(id, this.publicationList)
// this.getpublication = this.publicationList;
// this.showLoader = true;
// const folderId = this.folderId
// this.showLoader = false;
// }, (error) => {
// this.publications.GetPublicationsID(this.folderId).subscribe(res => {
// if(error.status == '0') {
// this.getFromDB();
// }
// if (error.status == '404') {
// this.error = 'Sem publicações disponíveis!';
// this.publicationList = [];
// this.publicationListStorage.add(id, this.publicationList)
// }
this.showLoader = false;
});
}
// goes to fork
=======
getPublicationsIds() {
// console.log('publications ids', res)
// this.publicationList = new Array();
this.showLoader = true;
const folderId = this.folderId
this.publications.GetPublicationsID(this.folderId).subscribe(res => {
console.log('publications ids', res)
this.publicationList = new Array();
for(let i of res) {
this.publications.GetPublicationById(i).subscribe(ress => {
console.log('publications by ids', ress)
let item: Publication = this.publicationPipe.itemList(ress)
console.log('publications by ids 2', item)
this.publicationList.push(item);
})
}
// for(let i of res) {
// this.publications.GetPublicationById(i).subscribe(ress => {
// console.log('publications by ids', ress)
// let item: Publication = this.publicationPipe.itemList(ress)
// console.log('publications by ids 2', item)
// this.publicationList.push(item);
// })
// }
/* res.forEach(element => {
console.log('publications elements', element)
@@ -239,7 +191,6 @@ export class ViewPublicationsPage implements OnInit {
});
}
>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
getPublications() {
this.showLoader = true;