diff --git a/src/addon/mod/data/components/index/index.scss b/src/addon/mod/data/components/index/index.scss
index 2c2a8e5a3..106a72942 100644
--- a/src/addon/mod/data/components/index/index.scss
+++ b/src/addon/mod/data/components/index/index.scss
@@ -1,5 +1,5 @@
addon-mod-data-index {
- .core-data-contents {
+ .addon-data-contents {
overflow: visible;
white-space: normal;
word-break: break-word;
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index e2517fc62..fcfae95e3 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -13,7 +13,7 @@
// limitations under the License.
import { Component, Optional, Injector } from '@angular/core';
-import { Content, ModalController } from 'ionic-angular';
+import { Content, ModalController, NavController } from 'ionic-angular';
import { CoreTimeUtilsProvider } from '@providers/utils/time';
import { CoreUtilsProvider } from '@providers/utils/utils';
import { CoreGroupsProvider, CoreGroupInfo } from '@providers/groups';
@@ -42,7 +42,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
data: any = {};
fields: any;
selectedGroup: number;
- advancedSearch: any;
timeAvailableFrom: number | boolean;
timeAvailableFromReadable: string | boolean;
timeAvailableTo: number | boolean;
@@ -79,7 +78,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
private dataOffline: AddonModDataOfflineProvider, @Optional() @Optional() content: Content,
private dataSync: AddonModDataSyncProvider, private timeUtils: CoreTimeUtilsProvider,
private groupsProvider: CoreGroupsProvider, private commentsProvider: CoreCommentsProvider,
- private modalCtrl: ModalController, private utils: CoreUtilsProvider) {
+ private modalCtrl: ModalController, private utils: CoreUtilsProvider, protected navCtrl: NavController) {
super(injector);
// Refresh entries on change.
@@ -222,7 +221,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
this.fields[field.id] = field;
});
this.fieldsArray = this.utils.objectToArray(this.fields);
- this.advancedSearch = this.dataHelper.displayAdvancedSearchFields(this.data.asearchtemplate, this.fieldsArray);
return this.fetchEntriesData();
});
@@ -349,9 +347,16 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
* Display the chat users modal.
*/
showSearch(): void {
- const modal = this.modalCtrl.create('AddonModDataSearchPage');
+ const modal = this.modalCtrl.create('AddonModDataSearchPage', {
+ search: this.search,
+ fields: this.fields,
+ data: this.data});
modal.onDidDismiss((data) => {
- // @TODO.
+ // Add data to search object.
+ if (data) {
+ this.search = data;
+ this.searchEntries(0);
+ }
});
modal.present();
}
@@ -366,14 +371,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
this.loaded = false;
this.search.page = page;
- if (this.search.searchingAdvanced) {
- this.search.advanced = this.dataHelper.getSearchDataFromForm(document.forms['addon-mod_data-advanced-search-form'],
- this.fieldsArray);
- this.search.searching = this.search.advanced.length > 0;
- } else {
- this.search.searching = this.search.text.length > 0;
- }
-
return this.fetchEntriesData().catch((message) => {
this.domUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
}).finally(() => {
@@ -405,6 +402,37 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
});
}
+ /**
+ * Opens add entries form.
+ */
+ gotoAddEntries(): void {
+ const stateParams = {
+ moduleId: this.module.id,
+ module: this.module,
+ courseId: this.courseId,
+ group: this.selectedGroup
+ };
+
+ this.navCtrl.push('AddonModDataEditPage', stateParams);
+ }
+
+ /**
+ * Goto the selected entry.
+ *
+ * @param {number} entryId Entry ID.
+ */
+ gotoEntry(entryId: number): void {
+ const stateParams = {
+ module: this.module,
+ moduleid: this.module.id,
+ courseid: this.courseId,
+ entryid: entryId,
+ group: this.selectedGroup
+ };
+
+ this.navCtrl.push('AddonModDataEntryPage', stateParams);
+ }
+
/**
* Fetch offline entries.
*
diff --git a/src/addon/mod/data/fields/checkbox/component/checkbox.html b/src/addon/mod/data/fields/checkbox/component/checkbox.html
index cc37e6f1e..6bd9c1bd6 100644
--- a/src/addon/mod/data/fields/checkbox/component/checkbox.html
+++ b/src/addon/mod/data/fields/checkbox/component/checkbox.html
@@ -1,16 +1,17 @@
-
+
-
- {{ option }}
-
-
-
+
+
+ {{option.key}}
+
+
+
+
{{ 'addon.mod_data.selectedrequired' | translate }}
-
+
-
+
+
'); + this.value.content = this.value && this.value.content && this.value.content.split('##').join('
'); return; } - this.options = this.field.param1.split('\n'); - - if (this.mode == 'edit' && this.value) { - this.values = {}; + this.options = this.field.param1.split('\n').map((option) => { + return { key: option, value: option }; + }); + if (this.mode == 'edit' && this.value && this.value.content) { this.value.content.split('##').forEach((value) => { - this.values[value] = true; + const x = this.options.findIndex((option) => value == option.key); + if (x >= 0) { + this.options[x].selected = true; + } }); - - //this.control = this.fb.control(text); } + + if (this.mode == 'search') { + this.addControl('f_' + this.field.id + '_allreq'); + } + + this.addControl('f_' + this.field.id); } } diff --git a/src/addon/mod/data/fields/checkbox/providers/handler.ts b/src/addon/mod/data/fields/checkbox/providers/handler.ts index 14632ab59..e307cc6e2 100644 --- a/src/addon/mod/data/fields/checkbox/providers/handler.ts +++ b/src/addon/mod/data/fields/checkbox/providers/handler.ts @@ -49,20 +49,22 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle const fieldName = 'f_' + field.id, reqName = 'f_' + field.id + '_allreq'; - const checkboxes = [], + const options = field.param1.split('\n'), + checkboxes = [], values = []; - inputData[fieldName].forEach((value, option) => { - if (value) { + options.forEach((option) => { + if (inputData[fieldName + '_' + option]) { checkboxes.push(option); } }); + if (checkboxes.length > 0) { values.push({ name: fieldName, value: checkboxes }); - if (inputData[reqName]['1']) { + if (inputData[reqName]) { values.push({ name: reqName, value: true @@ -85,9 +87,10 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle getFieldEditData(field: any, inputData: any, originalFieldData: any): any { const fieldName = 'f_' + field.id; - const checkboxes = []; - inputData[fieldName].forEach((value, option) => { - if (value) { + const options = field.param1.split('\n'), + checkboxes = []; + options.forEach((option) => { + if (inputData[fieldName + '_' + option]) { checkboxes.push(option); } }); diff --git a/src/addon/mod/data/fields/date/component/date.html b/src/addon/mod/data/fields/date/component/date.html index 66a9c8de0..41aa4d756 100644 --- a/src/addon/mod/data/fields/date/component/date.html +++ b/src/addon/mod/data/fields/date/component/date.html @@ -1,12 +1,14 @@ - -
- {{ 'addon.mod_data.usedate' | translate }}
-
-
-
+
+ {{ 'addon.mod_data.usedate' | translate }}
+
+
+
+
'); + this.value.content = this.value && this.value.content && this.value.content.split('##').join('
'); return; } - this.options = this.field.param1.split('\n'); - - if (this.mode == 'edit' && this.value) { - this.values = {}; + this.options = this.field.param1.split('\n').map((option) => { + return { key: option, value: option }; + }); + if (this.mode == 'edit' && this.value && this.value.content) { this.value.content.split('##').forEach((value) => { - this.values[value] = true; + const x = this.options.findIndex((option) => value == option.key); + if (x >= 0) { + this.options[x].selected = true; + } }); - - //this.control = this.fb.control(text); } + + if (this.mode == 'search') { + this.addControl('f_' + this.field.id + '_allreq'); + } + + this.addControl('f_' + this.field.id); } } diff --git a/src/addon/mod/data/fields/checkbox/providers/handler.ts b/src/addon/mod/data/fields/checkbox/providers/handler.ts index 14632ab59..e307cc6e2 100644 --- a/src/addon/mod/data/fields/checkbox/providers/handler.ts +++ b/src/addon/mod/data/fields/checkbox/providers/handler.ts @@ -49,20 +49,22 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle const fieldName = 'f_' + field.id, reqName = 'f_' + field.id + '_allreq'; - const checkboxes = [], + const options = field.param1.split('\n'), + checkboxes = [], values = []; - inputData[fieldName].forEach((value, option) => { - if (value) { + options.forEach((option) => { + if (inputData[fieldName + '_' + option]) { checkboxes.push(option); } }); + if (checkboxes.length > 0) { values.push({ name: fieldName, value: checkboxes }); - if (inputData[reqName]['1']) { + if (inputData[reqName]) { values.push({ name: reqName, value: true @@ -85,9 +87,10 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle getFieldEditData(field: any, inputData: any, originalFieldData: any): any { const fieldName = 'f_' + field.id; - const checkboxes = []; - inputData[fieldName].forEach((value, option) => { - if (value) { + const options = field.param1.split('\n'), + checkboxes = []; + options.forEach((option) => { + if (inputData[fieldName + '_' + option]) { checkboxes.push(option); } }); diff --git a/src/addon/mod/data/fields/date/component/date.html b/src/addon/mod/data/fields/date/component/date.html index 66a9c8de0..41aa4d756 100644 --- a/src/addon/mod/data/fields/date/component/date.html +++ b/src/addon/mod/data/fields/date/component/date.html @@ -1,12 +1,14 @@ - -
diff --git a/src/addon/mod/data/fields/file/component/file.ts b/src/addon/mod/data/fields/file/component/file.ts
index 773a3b7ed..b802d6f17 100644
--- a/src/addon/mod/data/fields/file/component/file.ts
+++ b/src/addon/mod/data/fields/file/component/file.ts
@@ -11,10 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, ElementRef } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
import { CoreFileSessionProvider } from '@providers/file-session';
import { AddonModDataProvider } from '../../../providers/data';
@@ -28,15 +26,13 @@ import { AddonModDataProvider } from '../../../providers/data';
})
export class AddonModDataFieldFileComponent extends AddonModDataFieldPluginComponent implements OnInit {
- control: FormControl;
files = [];
component: string;
componentId: number;
maxSizeBytes: number;
- constructor(protected fb: FormBuilder, protected domUtils: CoreDomUtilsProvider, protected textUtils: CoreTextUtilsProvider,
- element: ElementRef, private fileSessionprovider: CoreFileSessionProvider) {
- super();
+ constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider) {
+ super(fb);
}
/**
@@ -77,5 +73,7 @@ export class AddonModDataFieldFileComponent extends AddonModDataFieldPluginCompo
this.fileSessionprovider.setFiles(this.component, this.database.id + '_' + this.field.id, this.files);
}
}
+
+ this.addControl('f_' + this.field.id);
}
}
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.html b/src/addon/mod/data/fields/latlong/component/latlong.html
index 0b2ef6c9e..9303ec6d7 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.html
+++ b/src/addon/mod/data/fields/latlong/component/latlong.html
@@ -1,17 +1,19 @@
-
-
-
-
+
+
+
+
+
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 2d4e555a8..f9933bf6e 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -11,11 +11,9 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, ElementRef } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
import { Platform } from 'ionic-angular';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
/**
@@ -27,14 +25,11 @@ import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-
})
export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginComponent implements OnInit {
- control: FormControl;
- values = {};
north: number;
east: number;
- constructor(protected fb: FormBuilder, protected domUtils: CoreDomUtilsProvider, protected textUtils: CoreTextUtilsProvider,
- element: ElementRef, private platform: Platform) {
- super();
+ constructor(protected fb: FormBuilder, private platform: Platform) {
+ super(fb);
}
/**
@@ -86,5 +81,12 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
this.north = (this.value && parseFloat(this.value.content)) || null;
this.east = (this.value && parseFloat(this.value.content1)) || null;
}
+
+ if (this.mode == 'edit') {
+ this.addControl('f_' + this.field.id + '_0', this.north);
+ this.addControl('f_' + this.field.id + '_1', this.east);
+ } else if (this.mode == 'search') {
+ this.addControl('f_' + this.field.id);
+ }
}
}
diff --git a/src/addon/mod/data/fields/menu/component/menu.html b/src/addon/mod/data/fields/menu/component/menu.html
index 12f41a13f..c7e9e03c8 100644
--- a/src/addon/mod/data/fields/menu/component/menu.html
+++ b/src/addon/mod/data/fields/menu/component/menu.html
@@ -1,9 +1,11 @@
-
-
- {{ 'addon.mod_data.menuchoose' | translate }}
- {{option}}
-
+
+ {{ 'addon.mod_data.menuchoose' | translate }}
+ {{option}}
+
+
+ {{ 'addon.mod_data.selectedrequired' | translate }}
+
+
+
+
+
+
'); + return; } @@ -59,5 +57,11 @@ export class AddonModDataFieldMultimenuComponent extends AddonModDataFieldPlugin } }); } + + if (this.mode == 'search') { + this.addControl('f_' + this.field.id + '_allreq'); + } + + this.addControl('f_' + this.field.id); } } diff --git a/src/addon/mod/data/fields/multimenu/providers/handler.ts b/src/addon/mod/data/fields/multimenu/providers/handler.ts index 9f65ee8bf..c5d5c5fcc 100644 --- a/src/addon/mod/data/fields/multimenu/providers/handler.ts +++ b/src/addon/mod/data/fields/multimenu/providers/handler.ts @@ -49,25 +49,22 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl const fieldName = 'f_' + field.id, reqName = 'f_' + field.id + '_allreq'; - if (inputData[fieldName].length > 0) { - const options = inputData[fieldName].split('###'), - values = []; + if (inputData[fieldName] && inputData[fieldName].length > 0) { + const values = []; - if (options.length > 0) { + values.push({ + name: fieldName, + value: inputData[fieldName] + }); + + if (inputData[reqName]) { values.push({ - name: fieldName, - value: options + name: reqName, + value: true }); - - if (inputData[reqName]['1']) { - values.push({ - name: reqName, - value: true - }); - } - - return values; } + + return values; } return false; diff --git a/src/addon/mod/data/fields/number/component/number.html b/src/addon/mod/data/fields/number/component/number.html index 41bbe1fb0..17a4a6423 100644 --- a/src/addon/mod/data/fields/number/component/number.html +++ b/src/addon/mod/data/fields/number/component/number.html @@ -1,7 +1,9 @@ - + + -
+ {{ 'addon.mod_data.alttext' | translate }}
+
+
-
- {{ 'addon.mod_data.alttext' | translate }}
-
+
+ ![]()
diff --git a/src/addon/mod/data/fields/picture/component/picture.ts b/src/addon/mod/data/fields/picture/component/picture.ts
index b4516a4a3..810b63cc7 100644
--- a/src/addon/mod/data/fields/picture/component/picture.ts
+++ b/src/addon/mod/data/fields/picture/component/picture.ts
@@ -11,10 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, ElementRef } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
import { CoreFileSessionProvider } from '@providers/file-session';
import { AddonModDataProvider } from '../../../providers/data';
@@ -28,7 +26,6 @@ import { AddonModDataProvider } from '../../../providers/data';
})
export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginComponent implements OnInit {
- control: FormControl;
files = [];
component: string;
componentId: number;
@@ -42,9 +39,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
width: string;
height: string;
- constructor(protected fb: FormBuilder, protected domUtils: CoreDomUtilsProvider, protected textUtils: CoreTextUtilsProvider,
- element: ElementRef, private fileSessionprovider: CoreFileSessionProvider) {
- super();
+ constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider) {
+ super(fb);
}
/**
@@ -124,5 +120,7 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
this.height = this.field.param2 || '';
}
}
+
+ this.addControl('f_' + this.field.id);
}
}
diff --git a/src/addon/mod/data/fields/radiobutton/component/radiobutton.html b/src/addon/mod/data/fields/radiobutton/component/radiobutton.html
index 12f41a13f..c7e9e03c8 100644
--- a/src/addon/mod/data/fields/radiobutton/component/radiobutton.html
+++ b/src/addon/mod/data/fields/radiobutton/component/radiobutton.html
@@ -1,9 +1,11 @@
-
-
- {{ 'addon.mod_data.menuchoose' | translate }}
- {{option}}
-
+
+ {{ 'addon.mod_data.menuchoose' | translate }}
+ {{option}}
+
+
+
+ {{ 'addon.mod_data.search' | translate }}
+
+
+
+
+
+
+
+
+
diff --git a/src/addon/mod/data/pages/search/search.module.ts b/src/addon/mod/data/pages/search/search.module.ts
new file mode 100644
index 000000000..09b8cfa41
--- /dev/null
+++ b/src/addon/mod/data/pages/search/search.module.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreDirectivesModule } from '@directives/directives.module';
+import { AddonModDataComponentsModule } from '../../components/components.module';
+import { AddonModDataSearchPage } from './search';
+import { CoreCompileHtmlComponentModule } from '@core/compile/components/compile-html/compile-html.module';
+
+@NgModule({
+ declarations: [
+ AddonModDataSearchPage,
+ ],
+ imports: [
+ CoreDirectivesModule,
+ AddonModDataComponentsModule,
+ CoreCompileHtmlComponentModule,
+ IonicPageModule.forChild(AddonModDataSearchPage),
+ TranslateModule.forChild()
+ ],
+})
+export class AddonModDataSearchPageModule {}
diff --git a/src/addon/mod/data/pages/search/search.scss b/src/addon/mod/data/pages/search/search.scss
new file mode 100644
index 000000000..4ca495a75
--- /dev/null
+++ b/src/addon/mod/data/pages/search/search.scss
@@ -0,0 +1,57 @@
+page-addon-mod-data-search {
+ form {
+ background-color: $list-background-color;
+ }
+
+ table {
+ width: 100%;
+ }
+ td {
+ vertical-align: top;
+ }
+
+ .addon-data-advanced-search {
+ background-color: $list-background-color;
+
+ @if ($text-input-md-show-focus-highlight) {
+ .input-md input:focus {
+ @include md-input-highlight($text-input-md-highlight-color);
+ }
+ }
+
+ .input-md input {
+ @include padding-horizontal(null, ($item-md-padding-end / 2));
+ border-bottom: 1px solid $list-md-border-color;
+ &:focus {
+ @include md-input-highlight($text-input-md-highlight-color);
+ }
+ }
+
+ .input-ios input {
+ @include padding-horizontal(null, $item-ios-padding-end / 2);
+ @include safe-area-padding-horizontal(null, $item-ios-padding-end / 2);
+ border-bottom: $hairlines-width solid $list-ios-border-color;
+ &:focus {
+ @include ios-input-highlight($text-input-ios-highlight-color);
+ }
+ }
+
+ .input-wp input {
+ @include padding-horizontal(null, ($item-wp-padding-end / 2));
+ border-bottom: 1px solid $list-wp-border-color;
+ &:focus {
+ border-color: $text-input-wp-highlight-color;
+ }
+ }
+
+ ion-select {
+ width: 100%;
+ left: 0;
+ max-width: none;
+ }
+
+ .core-item-has-rich-text-editor {
+ margin-right: 1px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/addon/mod/data/pages/search/search.ts b/src/addon/mod/data/pages/search/search.ts
new file mode 100644
index 000000000..d50a121ec
--- /dev/null
+++ b/src/addon/mod/data/pages/search/search.ts
@@ -0,0 +1,189 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component } from '@angular/core';
+import { IonicPage, NavParams, ViewController } from 'ionic-angular';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { AddonModDataComponentsModule } from '../../components/components.module';
+import { AddonModDataFieldsDelegate } from '../../providers/fields-delegate';
+
+/**
+ * Page that displays the search modal.
+ */
+@IonicPage({ segment: 'addon-mod-data-search' })
+@Component({
+ selector: 'page-addon-mod-data-search',
+ templateUrl: 'search.html',
+})
+export class AddonModDataSearchPage {
+ search: any;
+ fields: any;
+ data: any;
+ advancedSearch: any;
+ extraImports = [AddonModDataComponentsModule];
+ searchForm: FormGroup;
+ jsData: any;
+ fieldsArray: any;
+
+ constructor(params: NavParams, private viewCtrl: ViewController, fb: FormBuilder, protected utils: CoreUtilsProvider,
+ protected domUtils: CoreDomUtilsProvider, protected fieldsDelegate: AddonModDataFieldsDelegate) {
+ this.search = params.get('search');
+ this.fields = params.get('fields');
+ this.data = params.get('data');
+
+ const advanced = {};
+ this.search.advanced.forEach((field) => {
+ advanced[field.name] = field.value ? JSON.parse(field.value) : '';
+ });
+ this.search.advanced = advanced;
+
+ this.searchForm = fb.group({
+ text: [this.search.text],
+ sortBy: [this.search.sortBy],
+ sortDirection: [this.search.sortDirection],
+ firstname: [this.search.advanced['firstname'] || ''],
+ lastname: [this.search.advanced['lastname'] || '']
+ });
+
+ this.fieldsArray = this.utils.objectToArray(this.fields);
+ this.advancedSearch = this.renderAdvancedSearchFields();
+ }
+
+ /**
+ * Displays Advanced Search Fields.
+ *
+ * @return {string} Generated HTML.
+ */
+ protected renderAdvancedSearchFields(): string {
+ if (!this.data.asearchtemplate) {
+ return '';
+ }
+
+ this.jsData = {
+ fields: this.fields,
+ form: this.searchForm,
+ search: this.search.advanced
+ };
+
+ let template = this.data.asearchtemplate,
+ replace, render;
+
+ // Replace the fields found on template.
+ this.fieldsArray.forEach((field) => {
+ replace = '[[' + field.name + ']]';
+ replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
+ replace = new RegExp(replace, 'gi');
+
+ // Replace field by a generic directive.
+ render = '
'); + return; } @@ -59,5 +57,11 @@ export class AddonModDataFieldMultimenuComponent extends AddonModDataFieldPlugin } }); } + + if (this.mode == 'search') { + this.addControl('f_' + this.field.id + '_allreq'); + } + + this.addControl('f_' + this.field.id); } } diff --git a/src/addon/mod/data/fields/multimenu/providers/handler.ts b/src/addon/mod/data/fields/multimenu/providers/handler.ts index 9f65ee8bf..c5d5c5fcc 100644 --- a/src/addon/mod/data/fields/multimenu/providers/handler.ts +++ b/src/addon/mod/data/fields/multimenu/providers/handler.ts @@ -49,25 +49,22 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl const fieldName = 'f_' + field.id, reqName = 'f_' + field.id + '_allreq'; - if (inputData[fieldName].length > 0) { - const options = inputData[fieldName].split('###'), - values = []; + if (inputData[fieldName] && inputData[fieldName].length > 0) { + const values = []; - if (options.length > 0) { + values.push({ + name: fieldName, + value: inputData[fieldName] + }); + + if (inputData[reqName]) { values.push({ - name: fieldName, - value: options + name: reqName, + value: true }); - - if (inputData[reqName]['1']) { - values.push({ - name: reqName, - value: true - }); - } - - return values; } + + return values; } return false; diff --git a/src/addon/mod/data/fields/number/component/number.html b/src/addon/mod/data/fields/number/component/number.html index 41bbe1fb0..17a4a6423 100644 --- a/src/addon/mod/data/fields/number/component/number.html +++ b/src/addon/mod/data/fields/number/component/number.html @@ -1,7 +1,9 @@ - + + -