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

fix search

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-25 15:49:16 +01:00
parent 891c44d674
commit 9fea5d8488
9 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/profile/edit-profile/edit-profile.page.html
+3 -3
View File
@@ -10,7 +10,7 @@
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5">doneIT</p>
<p class="logo-description-text tp-5">{{ environment.logoLabel }}</p>
<div class="add-line"></div>
<p class="logo-description-text tp-5">GABINETE DIGITAL</p>
</div>
@@ -18,7 +18,7 @@
<div *ngIf="ThemeService.currentTheme == 'default'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white">doneIT</p>
<p class="logo-description-text tp-5 color-white">{{ environment.logoLabel }}</p>
<div class="add-line-white"></div>
<p class="logo-description-text tp-5 color-white">GABINETE DIGITAL</p>
</div>
@@ -27,7 +27,7 @@
<div *ngIf="ThemeService.currentTheme == 'doneIt'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white" style="color: transparent;">DoneIt</p>
<p class="logo-description-text tp-5 color-white" style="color: transparent;">{{ environment.logoLabel }}</p>
<div class="add-line-white"></div>
</div>
</div>
src/app/modals/profile/edit-profile/edit-profile.page.ts
+1
View File
@@ -16,6 +16,7 @@ export class EditProfilePage implements OnInit {
SessionStore = SessionStore
production = environment.production
environment = environment
constructor(private modalController:ModalController,
private animationController: AnimationController,
src/app/modals/profile/profile.page.html
+4 -5
View File
@@ -8,15 +8,14 @@
</div>
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5">doneIT</p>
<p class="logo-description-text tp-5">{{ environment.logoLabel }}</p>
<div class="add-line"></div>
<p class="logo-description-text tp-5">GABINETE DIGITAL</p>
</div>
</div>
<div *ngIf="ThemeService.currentTheme == 'default'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white">doneIT</p>
<p class="logo-description-text tp-5 color-white">{{ environment.logoLabel }}</p>
<div class="add-line-white"></div>
<p class="logo-description-text tp-5 color-white">GABINETE DIGITAL</p>
</div>
@@ -33,10 +32,10 @@
<div class="profile-content">
<div class="profile-name d-flex justify-content-center width-100">
<ion-label >{{loggeduser.FullName}}</ion-label>
<ion-label >{{SessionStore.user.FullName}}</ion-label>
</div>
<div class="profile-title d-flex justify-content-center width-100">
<ion-label *ngIf="loggeduser.RoleDescription" >{{loggeduser.RoleDescription}}</ion-label>
<ion-label *ngIf="SessionStore.user.RoleDescription" >{{SessionStore.user.RoleDescription}}</ion-label>
</div>
<div class="d-flex mt-10 width-100">
src/app/modals/profile/profile.page.ts
+6 -6
View File
@@ -18,7 +18,6 @@ import { environment } from 'src/environments/environment';
})
export class ProfilePage implements OnInit {
loggeduser: LoginUserRespose;
userLoginPreference = ''
notificationdata: any[] = [];
DataArray: Array<Object> = [];
@@ -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)
}
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -258,7 +258,7 @@
<p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
</div>
<div *ngIf="SessionStore.user.Profile == 'Consultant'" (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
<div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidencial" (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'gerarDiplomas'" src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
src/app/pages/search/search.page.html
+8 -9
View File
@@ -186,16 +186,15 @@
<ul>
<li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex cursor-pointer">
<div class="icon">
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'default' "
src="assets/images/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'default' " src="assets/images/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'gov'" src="assets/images/theme/gov/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'Agenda' " src="assets/images/icons-default-agenda.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais' && searchDocument.DocTypeDesc == 'Publicações'" src="assets/images/icons-viagem.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'gov'"
src="assets/images/theme/gov/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'Agenda' "
src="assets/images/icons-default-agenda.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais' "
src="assets/images/icons-viagem.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && itemIcons() == 'AccoesPresidenciais' && searchDocument.DocTypeDesc == 'Acções' " slot="end" src='assets/images/theme/gov/icons-nav-actions.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' && itemIcons() == 'AccoesPresidenciais' && searchDocument.DocTypeDesc == 'Acções' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-nav-actions.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' && itemIcons() == 'AccoesPresidenciais' && searchDocument.DocTypeDesc == 'Acções' " slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon>
</div>
<div class="content ion-align-items-center">
src/app/pages/search/search.page.ts
+19 -8
View File
@@ -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);
src/environments/environment.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
export const environment: Environment = oaprDev;
export const environment: Environment = doneITDev;
version/git-version.ts
+6 -6
View File
@@ -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 <file>...\" 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 <file>...\" 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"
}