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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-10-25 13:54:34 +01:00
parent a52f8fea07
commit 9bb85a2adf
17 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/search/organic-entity/organic-entity.page.ts
+7 -2
View File
@@ -3,6 +3,8 @@ import { ModalController } from '@ionic/angular';
import { from } from 'rxjs';
import { OrganicEntityService } from 'src/app/services/organic-entity.service';
import { OrganicEntity } from 'src/app/models/organic-entity.model';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-organic-entity',
@@ -16,8 +18,11 @@ export class OrganicEntityPage implements OnInit {
findEntity: string;
constructor(private modalController:ModalController,
private OrganicEntityService: OrganicEntityService) {
constructor(
private modalController:ModalController,
private OrganicEntityService: OrganicEntityService,
public ThemeService: ThemeService
) {
}
src/app/pages/search/search.page.html
+9 -5
View File
@@ -15,7 +15,8 @@
</div>
<div (click)="clearSearchInput()" class="d-flex align-center icon">
<ion-icon class="font-25" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
@@ -35,7 +36,7 @@
<div class="btn-modal-dismiss" *ngIf="showSearchInput">
<button class="btn-no-color" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon c*ngIf="ThemeService.currentTheme == 'default' " lass="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</button>
</div>
</div>
@@ -50,7 +51,8 @@
<div class="input-container d-flex ion-align-items-center">
<ion-datetime [(ngModel)]='searchDocumentDate' placeholder="Data" display-timezone="utc"></ion-datetime>
<div class="icon" (click)="clearInputDocumentDate()">
<ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
</li>
@@ -62,7 +64,8 @@
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSender' class="search-input" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<div class="icon" (click)="clearInputRemetente()" >
<ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
</li>
@@ -74,7 +77,8 @@
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchOrganicEntiry' class="search-input" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<div class="icon" (click)="clearInputOrganicEntity()" >
<ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
</li>
src/app/pages/search/search.page.ts
+4 -1
View File
@@ -9,6 +9,7 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
import { SearchCategory, SearchList } from 'src/app/models/search-document';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-search',
@@ -58,7 +59,9 @@ export class SearchPage implements OnInit {
constructor(private modalController: ModalController,
private search: SearchService,
private modalCtrl: ModalController,
private navParams: NavParams) {
private navParams: NavParams,
public ThemeService: ThemeService)
{
this.ordinance = "recent";
this.currentPath= window.location.pathname;
src/app/pages/search/sender/sender.page.ts
+3 -1
View File
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { ContactsService } from 'src/app/services/contacts.service';
import { EventPerson } from 'src/app/models/eventperson.model';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-sender',
@@ -17,7 +18,8 @@ export class SenderPage implements OnInit {
selectedUser: string;
constructor(private modalController:ModalController,
private ContactsService: ContactsService) {
private ContactsService: ContactsService,
public ThemeService: ThemeService) {
}