diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index a48593245..534aee8d9 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -10,7 +10,7 @@
-

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

@@ -18,7 +18,7 @@
-

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

@@ -27,7 +27,7 @@
-

DoneIt

+

{{ environment.logoLabel }}

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.ts b/src/app/modals/profile/edit-profile/edit-profile.page.ts index d32656f9e..b9d345e2f 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.ts +++ b/src/app/modals/profile/edit-profile/edit-profile.page.ts @@ -16,6 +16,7 @@ export class EditProfilePage implements OnInit { SessionStore = SessionStore production = environment.production + environment = environment constructor(private modalController:ModalController, private animationController: AnimationController, diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 6de0842de..c45fcbaba 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -8,15 +8,14 @@
-

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

- -

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

@@ -33,10 +32,10 @@
- {{loggeduser.FullName}} + {{SessionStore.user.FullName}}
- {{loggeduser.RoleDescription}} + {{SessionStore.user.RoleDescription}}
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index b18576956..a9618ce7f 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -18,7 +18,6 @@ import { environment } from 'src/environments/environment'; }) export class ProfilePage implements OnInit { - loggeduser: LoginUserRespose; userLoginPreference = '' notificationdata: any[] = []; DataArray: Array = []; @@ -34,26 +33,27 @@ export class ProfilePage implements OnInit { hideImage = false logoutOut = false notificationStatus = ''; + environment = environment - constructor(private modalController: ModalController, - private authService: AuthService, + SessionStore = SessionStore; + constructor( + private modalController: ModalController, private animationController: AnimationController, private router: Router, private storageservice: StorageService, private zone: NgZone, - private notificationservice: NotificationsService, private platform: Platform, private eventtrigger: EventTrigger, public ThemeService: ThemeService, ) { - this.loggeduser = SessionStore.user; + router.events.subscribe((val) => { this.isProfileOpen = false this.logoutOut = true }); - setTimeout(()=>{ + setTimeout(() => { this.hideImage = true }, 2000) } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index eae8b344b..ea39764ea 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -258,7 +258,7 @@

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

-
+
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index c9785f51b..3bf731fd7 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -186,16 +186,15 @@
  • - + + + + - - - - + + + +
    diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index e7a892237..d4b2e2474 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -12,6 +12,7 @@ import { SearchCategory, SearchList } from 'src/app/models/search-document'; import { ThemeService } from 'src/app/services/theme.service' import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { Router } from '@angular/router'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-search', @@ -574,7 +575,9 @@ export class SearchPage implements OnInit { res.Categories.forEach( e => { e['Active'] = false; - e['Name'] = "Publicações" + if(!environment.presidencial) { + e['Name'] = "Publicações" + } }); // bind respose @@ -583,7 +586,9 @@ export class SearchPage implements OnInit { } for ( const a of this.sortArrayISODate(res.Documents)) { - a.DocTypeDesc = "Publicações" + if(!environment.presidencial) { + a.DocTypeDesc = "Publicações" + } this.searchDocuments.push(a); } @@ -621,19 +626,25 @@ export class SearchPage implements OnInit { res.Categories.forEach( e => { e['Active'] = false; - e['Name'] = "Acções" + if(!environment.presidencial) { + e['Name'] = "Acções" + } }); - // bind respose - for ( const a of res.Categories) { - this.searchCategories.push(a); + if(!environment.presidencial) { + // bind respose + for ( const a of res.Categories) { + this.searchCategories.push(a); + } } for ( const a of this.sortArrayISODate(res.Documents)) { - a.DocTypeDesc = "Acções" - this.searchDocuments.push(a); + if(!environment.presidencial) { + a.DocTypeDesc = "Acções" + this.searchDocuments.push(a); + } } this.reorderList(this.ordinance); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 10909d23b..aaefbfe6d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = oaprDev; \ No newline at end of file +export const environment: Environment = doneITDev; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 4af8c064b..2a995bc6a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "f44505082", - "SHA": "f44505082108e12aa7ab360be9af64b347b61803", + "shortSHA": "891c44d67", + "SHA": "891c44d67417ea69f48591231f6e5aae690dcdf2", "branch": "feature_build_ios_v1_3", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 25 10:28:55 2023 +0100'", - "lastCommitMessage": "save", - "lastCommitNumber": "4688", + "lastCommitTime": "'Wed Jan 25 15:06:19 2023 +0100'", + "lastCommitMessage": "improve envarionment", + "lastCommitNumber": "4689", "change": "", - "changeStatus": "On branch feature_build_ios_v1_3\nYour branch and 'origin/feature_build_ios_v1_3' have diverged,\nand have 60 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/models/beast-orm.ts\n\tnew file: src/app/models/envarioment.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/permission.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/store/localstore.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tnew file: src/environments/suport/doneIt.ts\n\tnew file: src/environments/suport/oapr.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature_build_ios_v1_3\nYour branch and 'origin/feature_build_ios_v1_3' have diverged,\nand have 61 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\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/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file