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

remove duplication from publication

Browse Source
This commit is contained in:
Peter Maquiran
2023-03-10 15:46:37 +01:00
parent 57b4f08800
commit 2b4b879970
2 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/publications/publications.page.ts
+19 -49
View File
@@ -89,7 +89,6 @@ export class PublicationsPage implements OnInit {
});
this.hideRefreshButton();
this.getFromDB()
}
@@ -148,38 +147,22 @@ export class PublicationsPage implements OnInit {
this.showLoader = false;
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
// let publications = await ActionModel.create(folders)
// console.log('publications', publications)
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
await this.storage.set('actionsEvents', this.publicationsEventFolderList);
await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
} else {
folders.forEach((folder)=> {
this.addActionToDB(folder);
})
}
await this.storage.set('actionsEvents', this.publicationsEventFolderList);
await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
this.showLoader = false;
}, (error) => {
this.showLoader = false;
this.getFromDB()
});
}
// addActionToStorage(events, viagens) {
// if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
// this.storage.set('actionsEvents', events);
// this.storage.set('actionsViagens', viagens);
// }
// }
addActionToDB(folder) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
} else {
@@ -202,39 +185,26 @@ export class PublicationsPage implements OnInit {
}
getFromDB() {
this.storage.get('actionsEvents').then((events = []) => {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('actionsEvents').then((events = []) => {
if(Array.isArray(events)) {
const folders: PublicationFolder[] = this.getPublicationFolderMap(events)
if(Array.isArray(events)) {
const folders: PublicationFolder[] = this.getPublicationFolderMap(events)
this.showLoader = false;
this.publicationsEventFolderList = folders
}
});
this.storage.get('actionsViagens').then((viagens = []) => {
if(Array.isArray(viagens)) {
const folders: PublicationFolder[] = this.getPublicationFolderMap(viagens)
this.publicationsTravelFolderList = folders
this.showLoader = false;
}
});
} else {
this.sqliteservice.getAllActions().then((actions: any[] = []) => {
const folders: PublicationFolder[] = this.getPublicationFolderMap(actions)
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
this.showLoader = false;
this.publicationsEventFolderList = folders
}
})
}
});
this.storage.get('actionsViagens').then((viagens = []) => {
if(Array.isArray(viagens)) {
const folders: PublicationFolder[] = this.getPublicationFolderMap(viagens)
this.publicationsTravelFolderList = folders
this.showLoader = false;
}
});
}
async editAction(folderId?: string) {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "5b0606420",
"SHA": "5b060642036e92e97d14f9926b9e49e29257fd43",
"shortSHA": "57b4f0880",
"SHA": "57b4f0880084a1ab1005660d19cb603fa7b279ad",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Mar 10 14:30:50 2023 +0100'",
"lastCommitMessage": "update actions",
"lastCommitNumber": "4866",
"lastCommitTime": "'Fri Mar 10 15:10:37 2023 +0100'",
"lastCommitMessage": "improve publication",
"lastCommitNumber": "4867",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/publications.page.ts",
"changeAuthor": "peter.maquiran"
}