diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 6762f50a2..b901bac6f 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -24,7 +24,7 @@ import { PermissionService } from 'src/app/services/permission.service';
styleUrls: ['./publications.page.scss'],
})
export class PublicationsPage implements OnInit {
- showLoader: boolean;
+ showLoader: boolean = false
publicationFolder: PublicationFolder;
publication: Publication;
@@ -57,7 +57,6 @@ export class PublicationsPage implements OnInit {
hideRefreshBtn = true;
showSlidingOptions = true;
idSelected: string;
- skeletonLoader: boolean;
constructor(
private router: Router,
@@ -138,13 +137,10 @@ export class PublicationsPage implements OnInit {
return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear()
}
- loadList = false
getActions() {
- if(this.loadList == false) {
- this.loadList = true
+ if(this.showLoader == false) {
this.showLoader = true;
- this.skeletonLoader = true;
this.publications.GetPublicationFolderList().subscribe(async res => {
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
@@ -162,13 +158,9 @@ export class PublicationsPage implements OnInit {
}
this.showLoader = false;
- this.skeletonLoader = false;
- this.loadList = false
}, (error) => {
this.showLoader = false;
- this.skeletonLoader = false;
- this.loadList = false
});
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index f5d27fc98..b868f0e40 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -15,8 +15,8 @@ export const environment = {
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */
production: false,
domain: 'equilibrium.co.ao',
- defaultuser: '',//evandre.dasilva@equilibrium.co.ao
- defaultuserpwd: '', //Luand@1219,
+ defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao
+ defaultuserpwd: 'Luand@1219', //Luand@1219,
chatOffline: true,
presidencia: false,
version: versionData,
diff --git a/version/git-version.ts b/version/git-version.ts
index 34a46fc86..445ef0ea3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "f83ef8201",
- "SHA": "f83ef8201fffa4d964d7293d17004c90e6429d7d",
+ "shortSHA": "1800b5b4a",
+ "SHA": "1800b5b4a96b7cbc94fd7aa9a624c140d2f78135",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Thu Jan 19 12:47:00 2023 +0100'",
- "lastCommitMessage": "fix chat",
- "lastCommitNumber": "4662",
+ "lastCommitTime": "'Thu Jan 19 12:48:51 2023 +0100'",
+ "lastCommitMessage": "merge",
+ "lastCommitNumber": "4668",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
+ "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file