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

bugs solved

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-11 16:14:25 +01:00
parent 2bfec82113
commit 408f68b22e
20 changed files with 263 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/search/organic-entity/organic-entity.page.html
+1 -1
View File
@@ -26,7 +26,7 @@
<ion-input [(ngModel)]='findEntity' class="search-input" type="search" placeholder="Pesquisar" (ngModelChange)="filterContact()" ></ion-input>
</div>
<ul>
<li *ngFor="let organicEntity of showOrganicEntities" (click)="selectOrganicEntidy(organicEntity.Description)">
<li *ngFor="let organicEntity of showOrganicEntities" (click)="selectOrganicEntidy(organicEntity)">
{{ organicEntity.Description }}
</li>
</ul>
src/app/pages/search/organic-entity/organic-entity.page.ts
+1 -1
View File
@@ -52,7 +52,7 @@ export class OrganicEntityPage implements OnInit {
this.showOrganicEntities = entities;
}
selectOrganicEntidy(selectedOraganicEntit: string){
selectOrganicEntidy(selectedOraganicEntit){
this.modalController.dismiss(selectedOraganicEntit);
}
src/app/pages/search/search.page.html
+2 -2
View File
@@ -102,7 +102,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-sender.svg"></ion-icon>
</div>
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSender' class="search-input cursor-pointer" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<ion-input [(ngModel)]='searchSenderdescription' class="search-input cursor-pointer" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputRemetente()" >
<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>
@@ -115,7 +115,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-arrow-arrow-down-25-copy.svg"></ion-icon>
</div>
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchOrganicEntiry' class="search-input custom-checkbox" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<ion-input [(ngModel)]='searchOrganicEntiryDescription' class="search-input custom-checkbox" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputOrganicEntity()" >
<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>
src/app/pages/search/search.page.ts
+29 -22
View File
@@ -52,8 +52,10 @@ export class SearchPage implements OnInit {
// https params
searchSubject: string;
searchDocumentDate: string;
searchSender: string;
searchOrganicEntiry: string;
searchSenderdescription: string;
searchSenderId: number;
searchOrganicEntiryDescription: string;
searchOrganicEntiryCode: number;
searchDocTypeId: string;
ordinance: string;
@@ -336,8 +338,8 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '0').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
@@ -379,8 +381,8 @@ export class SearchPage implements OnInit {
let counter = 0;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -418,8 +420,8 @@ export class SearchPage implements OnInit {
}
});
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
@@ -461,8 +463,8 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
this.searchCategories.push(e)
@@ -501,8 +503,8 @@ export class SearchPage implements OnInit {
}
});
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => {
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -556,8 +558,8 @@ export class SearchPage implements OnInit {
let counter = 0;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
@@ -594,8 +596,8 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
@@ -692,8 +694,8 @@ export class SearchPage implements OnInit {
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res => {
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSenderId
,this.searchOrganicEntiryCode, this.searchDocTypeId, '386').subscribe(res => {
res.Categories.forEach( e => {
@@ -780,13 +782,15 @@ export class SearchPage implements OnInit {
}
clearInputRemetente() {
this.searchSender = "";
this.searchSenderdescription = "";
this.searchSenderId = null;
}
clearInputOrganicEntity(){
this.searchOrganicEntiry = "";
this.searchOrganicEntiryDescription = "";
this.searchOrganicEntiryCode = null;
}
/**
@@ -815,7 +819,8 @@ export class SearchPage implements OnInit {
modal.onDidDismiss().then((data) => {
this.searchSender = data.data;
this.searchSenderdescription = data.data.Name;
this.searchSenderId = data.data.Id
});
await modal.present();
@@ -840,7 +845,9 @@ export class SearchPage implements OnInit {
modal.onDidDismiss().then((data) => {
this.searchOrganicEntiry = data.data;
console.log('SerachEntity',data.data )
this.searchOrganicEntiryDescription = data.data.Description;
this.searchOrganicEntiryCode = data.data.Code;
});
await modal.present();
src/app/pages/search/sender/sender.page.html
+1 -1
View File
@@ -19,7 +19,7 @@
<ion-input [(ngModel)]='sender' class="search-input" type="search" placeholder="Pesquisar" (ngModelChange)="filterContact($event)" ></ion-input>
</div>
<ul>
<li *ngFor="let contact of showContacts" (click)="selectUser(contact.Name)">
<li *ngFor="let contact of showContacts" (click)="selectUser(contact)">
{{ contact.Name }}
</li>
</ul>
src/app/pages/search/sender/sender.page.ts
+1 -1
View File
@@ -48,7 +48,7 @@ export class SenderPage implements OnInit {
this.showContacts = persons;
}
selectUser(username:string){
selectUser(username){
this.selectedUser = username;
this.close(this.selectedUser);
}