EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2430 data: Enter search page fixed

main
Pau Ferrer Ocaña 2018-06-20 14:24:40 +02:00
parent 91d8b13e18
commit 647f9945a4
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/addon/mod/data/data.scss
View File

@ -34,20 +34,21 @@ page-addon-mod-data-edit {
vertical-align: top; vertical-align: top;
} }
.item.item-input.item-block .item-inner ion-input,
.item.item-input.item-input-has-focus .item-inner ion-input,
.item.item-input.input-has-focus .item-inner ion-input {
border: 0 !important;
box-shadow: none;
}
.addon-data-lantlong { .addon-data-lantlong {
display: flex; display: flex;
} }
form, .addon-data-advanced-search { .addon-data-contents form,
form .addon-data-advanced-search {
background-color: $list-background-color; background-color: $list-background-color;
.item.item-input .item-block .item-inner ion-input,
.item.item-input.item-input-has-focus .item-inner ion-input,
.item.item-input.input-has-focus .item-inner ion-input {
border: 0 !important;
box-shadow: none;
}
.core-mark-required { .core-mark-required {
float: right; float: right;

4
src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
View File

@ -2,11 +2,11 @@
<ion-input *ngIf="mode == 'search'" type="text" [placeholder]="field.name" [formControlName]="'f_'+field.id"></ion-input> <ion-input *ngIf="mode == 'search'" type="text" [placeholder]="field.name" [formControlName]="'f_'+field.id"></ion-input>
<span *ngIf="mode == 'edit'" [core-mark-required]="field.required" class="core-mark-required"></span> <span *ngIf="mode == 'edit'" [core-mark-required]="field.required" class="core-mark-required"></span>
<div class="addon-data-lantlong"> <div *ngIf="mode == 'edit'" class="addon-data-lantlong">
<ion-input type="text" [formControlName]="'f_'+field.id+'_0'" maxlength="10"></ion-input> <ion-input type="text" [formControlName]="'f_'+field.id+'_0'" maxlength="10"></ion-input>
<span class="placeholder-icon" item-right>°N</span> <span class="placeholder-icon" item-right>°N</span>
</div> </div>
<div class="addon-data-lantlong"> <div *ngIf="mode == 'edit'" class="addon-data-lantlong">
<ion-input type="text" [formControlName]="'f_'+field.id+'_1'" maxlength="10"></ion-input> <ion-input type="text" [formControlName]="'f_'+field.id+'_1'" maxlength="10"></ion-input>
<span class="placeholder-icon" item-right>°E</span> <span class="placeholder-icon" item-right>°E</span>
</div> </div>

4
src/addon/mod/data/pages/search/search.html
View File

@ -10,8 +10,8 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="fixed-content core-tabs-bar"> <div class="fixed-content core-tabs-bar">
<a [attr.aria-selected]="!search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.search' | translate}}</a> <a class="tab-slide" [attr.aria-selected]="!search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.search' | translate}}</a>
<a [attr.aria-selected]="search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.advancedsearch' | translate }}</a> <a class="tab-slide" [attr.aria-selected]="search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.advancedsearch' | translate }}</a>
</div> </div>
<form (ngSubmit)="searchEntries()" [formGroup]="searchForm"> <form (ngSubmit)="searchEntries()" [formGroup]="searchForm">
<ion-list no-margin> <ion-list no-margin>

20
src/addon/mod/data/pages/search/search.ts
View File

@ -47,14 +47,26 @@ export class AddonModDataSearchPage {
this.data = params.get('data'); this.data = params.get('data');
const advanced = {}; const advanced = {};
this.search.advanced.forEach((field) => { if (typeof this.search.advanced == 'object') {
advanced[field.name] = field.value ? this.textUtils.parseJSON(field.value) : ''; Object.keys(this.search.advanced).forEach((index) => {
}); if (typeof this.search.advanced[index] != 'undefined' && typeof this.search.advanced[index].name != 'undefined') {
advanced[this.search.advanced[index].name] = this.search.advanced[index].value ?
this.textUtils.parseJSON(this.search.advanced[index].value) : '';
} else {
advanced[index] = this.search.advanced[index] ?
this.textUtils.parseJSON(this.search.advanced[index]) : '';
}
});
} else {
this.search.advanced.forEach((field) => {
advanced[field.name] = field.value ? this.textUtils.parseJSON(field.value) : '';
});
}
this.search.advanced = advanced; this.search.advanced = advanced;
this.searchForm = fb.group({ this.searchForm = fb.group({
text: [this.search.text], text: [this.search.text],
sortBy: [this.search.sortBy || 0], sortBy: [this.search.sortBy || '0'],
sortDirection: [this.search.sortDirection || 'DESC'], sortDirection: [this.search.sortDirection || 'DESC'],
firstname: [this.search.advanced['firstname'] || ''], firstname: [this.search.advanced['firstname'] || ''],
lastname: [this.search.advanced['lastname'] || ''] lastname: [this.search.advanced['lastname'] || '']