diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue index 1f49a5ad..4020ff84 100644 --- a/ayanova/src/views/ay-data-list-view.vue +++ b/ayanova/src/views/ay-data-list-view.vue @@ -426,16 +426,7 @@ function initDataObject(vm) { effectiveListView: [{"fld": "widgetname","filter": {"items": [{"op": "%-","value": "Awesome"}]}},{"fld":"widgetserial"},{"fld":"widgetdollaramount"},{"fld":"widgetusertype"},{"fld":"widgetstartdate"},{"fld":"widgetactive"},{"fld":"username"},{"fld":"widgettags"},{"fld":"widgetcustom1"},{"fld":"widgetcustom2"}] */ //Iterate the listview, add each field to working array - //custom fields example - // var objItem = { - // key: faf.fieldKey, - // title: window.$gz.locale.get(faf.ltKey), - // stockRequired: !faf.hideable, - // custom: faf.isCustomField, - // required: faf.hideable === false || templateItem.required === true, - // visible: templateItem.hide !== true, - // type: templateItem.type - // }; + /* What I need here: { @@ -451,12 +442,29 @@ What I need here: sort: "-","+" or null filter:{any:bool,items:[]} same format as listview } +vm.fieldDefinitions */ - var o = []; + var ret = []; //Pass 1, iterate the listview first - for (var i = 0; i < vm.effectiveListView.length; i++) {} + for (var i = 0; i < vm.effectiveListView.length; i++) { + var lvItem = vm.effectiveListView[i]; + var fld = window.$gz._.find(vm.fieldDefinitions, ["fieldKey", lvItem.fld]); + var o = { + key: fld.fieldKey, + title: vm.lt(fld.ltKey), + visible: true, + isFilterable: fld.isFilterable, + isSortable: fld.isSortable, + enumType: fld.enumType, + ayaObjectType: fld.ayaObjectType, + uiFieldDataType: fld.uiFieldDataType, + isCustomField: fld.isCustomField, + sort: lvItem.sort || null, + filter: lvItem.filter || null + }; + } //eoc }