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

fix publication loaders

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-28 14:53:04 +01:00
parent a4063a8839
commit 4a82191e92
2 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/publications/publications.page.ts
+4 -40
View File
@@ -147,16 +147,7 @@ export class PublicationsPage implements OnInit {
this.getFromDB() this.getFromDB()
this.publications.GetPublicationFolderList().subscribe(async res => { this.publications.GetPublicationFolderList().subscribe(async res => {
const folders: any = res.map((data): PublicationFolder => { const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
return {
ProcessId: data.ProcessId,
Description: data.Description,
Detail: data.Detail,
DateBegin: data.DateBegin,
DateEnd: data.DateEnd,
ActionType: data.ActionType,
}
});
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
@@ -220,16 +211,7 @@ export class PublicationsPage implements OnInit {
this.storage.get('actionsEvents').then((events = []) => { this.storage.get('actionsEvents').then((events = []) => {
if(Array.isArray(events)) { if(Array.isArray(events)) {
const folders: PublicationFolder[] = events.map((data) : PublicationFolder => { const folders: PublicationFolder[] = this.getPublicationFolderMap(events)
return {
ProcessId: data.ProcessId,
Description: data.Description,
Detail: data.Detail,
DateBegin: data.DateBegin,
DateEnd: data.DateEnd,
ActionType: data.ActionType,
}
});
this.showLoader = false; this.showLoader = false;
this.publicationsEventFolderList = folders this.publicationsEventFolderList = folders
@@ -239,16 +221,7 @@ export class PublicationsPage implements OnInit {
this.storage.get('actionsViagens').then((viagens = []) => { this.storage.get('actionsViagens').then((viagens = []) => {
if(Array.isArray(viagens)) { if(Array.isArray(viagens)) {
const folders: PublicationFolder[] = viagens.map((data): PublicationFolder => { const folders: PublicationFolder[] = this.getPublicationFolderMap(viagens)
return {
ProcessId: data.ProcessId,
Description: data.Description,
Detail: data.Detail,
DateBegin: data.DateBegin,
DateEnd: data.DateEnd,
ActionType: data.ActionType,
}
});
this.publicationsTravelFolderList = folders this.publicationsTravelFolderList = folders
this.showLoader = false; this.showLoader = false;
@@ -258,16 +231,7 @@ export class PublicationsPage implements OnInit {
} else { } else {
this.sqliteservice.getAllActions().then((actions: any[] = []) => { this.sqliteservice.getAllActions().then((actions: any[] = []) => {
const folders: any = actions.map((data): PublicationFolder => { const folders: PublicationFolder[] = this.getPublicationFolderMap(actions)
return {
ProcessId: data.ProcessId,
Description: data.Description,
Detail: data.Detail,
DateBegin: data.DateBegin,
DateEnd: data.DateEnd,
ActionType: data.ActionType,
}
});
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "fe6a3099a", "shortSHA": "a4063a883",
"SHA": "fe6a3099a9e52ebc4417844b213e0206f27d71e5", "SHA": "a4063a88397808334edb07fa8a7a22911da60a18",
"branch": "develop_bitOut-fix", "branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Dec 28 14:15:49 2022 +0100'", "lastCommitTime": "'Wed Dec 28 14:52:42 2022 +0100'",
"lastCommitMessage": "add prepare script", "lastCommitMessage": "fix publication loaders",
"lastCommitNumber": "4590", "lastCommitNumber": "4591",
"change": "", "change": "",
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/publications.page.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }