Skip to content

U
ulakbus-ui
Commit f8319f7d authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

ADD expression to hide / show for actions on left by checking meta has object_actions 

rref #5046
REFACTOR refactor if else cases to dynamic dispatch to generate fields
rfix #5152
fixes GH-89
fixes zetaops/ulakbusGH-203
parent b1172c42
Show whitespace changes
Inline Side-by-side
Showing with 440 additions and 415 deletions
app/components/crud/crud_controller.js
View file @ f8319f7d
...@@ -156,7 +156,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService']) ...@@ -156,7 +156,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
$scope.$on('reload_cmd', function(event, data){ $scope.$on('reload_cmd', function(event, data){
$scope.reload_cmd = data; $scope.reload_cmd = data;
$scope.reload({}); $scope.reloadCmd();
}); });
// search directive updates objects after search results // search directive updates objects after search results
......
app/shared/templates/nodeTable.html
View file @ f8319f7d
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<th>İşlem</th> <th>İşlem</th>
</tr> </tr>
<tr ng-if="node.schema.formType=='ListNode'"> <tr ng-if="node.schema.formType=='ListNode'">
<th colspan="2"> <th colspan="2" ng-if="meta.allow_selection===true">
<!--<label>--> <label>
<!--<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">--> <input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
<!--Hepsini Seç--> Hepsini Seç
<!--</label>--> </label>
</th> </th>
<th ng-repeat="(key,value) in node.items[0] track by $index" <th ng-repeat="(key,value) in node.items[0] track by $index"
ng-if="key!=='idx' && node.schema.properties[key]"> ng-if="key!=='idx' && node.schema.properties[key]">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<tr ng-repeat="listnodemodel in node.items track by $index" <tr ng-repeat="listnodemodel in node.items track by $index"
ng-init="outerIndex=$index" ng-init="outerIndex=$index"
ng-if="node.schema.formType=='ListNode'"> ng-if="node.schema.formType=='ListNode'">
<td ng-if="meta.allow_selection=true" width="60"> <td ng-if="meta.allow_selection===true" width="60">
<label> <label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;"> <input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label> </label>
...@@ -62,10 +62,16 @@ ...@@ -62,10 +62,16 @@
ng-change="nodeModelChange(this)"> ng-change="nodeModelChange(this)">
</td> </td>
<td ng-if="meta.allow_actions!==false"> <td ng-if="meta.allow_actions!==false">
<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">Düzenle <div ng-hide="meta.object_actions.length > 0">
<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">
Düzenle
</button> </button>
<br> <br>
<button ng-click="remove(node, 'ListNode', $index)">Sil</button> <button ng-click="remove(node, 'ListNode', $index)">Sil</button>
</div>
<div ng-show="meta.object_actions.length > 0">
<!-- define object actions here -->
</div>
</td> </td>
</tr> </tr>
......
app/zetalib/form_service.js
View file @ f8319f7d
...@@ -19,7 +19,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -19,7 +19,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* Moment.js used for date type conversions. * Moment.js used for date type conversions.
* there must be no global object, so we change it into a service here. * there must be no global object, so we change it into a service here.
*/ */
.service('Moment', function(){ .service('Moment', function () {
return window.moment; return window.moment;
}) })
...@@ -217,45 +217,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -217,45 +217,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
} }
}); });
angular.forEach(scope.schema.properties, function (v, k) { var _buttons = function (scope, v, k) {
// generically change _id fields model value
if ('form_params' in scope) {
if (k == scope.form_params.param) {
scope.model[k] = scope.form_params.id;
scope.form.splice(scope.form.indexOf(k), 1);
return;
}
}
if (v.type === 'file') {
scope.form[scope.form.indexOf(k)] = {
type: "template",
title: v.title,
templateUrl: "shared/templates/filefield.html",
name: k,
key: k,
fileInsert: function () {
$scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
},
imageSrc: scope.model[k] ? $rootScope.settings.static_url + scope.model[k] : '',
avatar: k === 'avatar'
};
v.type = 'string';
}
if (v.type === 'select') {
scope.form[scope.form.indexOf(k)] = {
type: "template",
title: v.title,
templateUrl: "shared/templates/select.html",
name: k,
key: k,
titleMap: v.titleMap
};
}
if (v.type === 'submit' || v.type === 'button') {
var buttonPositions = scope.modalElements ? scope.modalElements.buttonPositions : { var buttonPositions = scope.modalElements ? scope.modalElements.buttonPositions : {
bottom: 'move-to-bottom', bottom: 'move-to-bottom',
top: 'move-to-top', top: 'move-to-top',
...@@ -298,7 +260,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -298,7 +260,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
} else { } else {
// focus to first input with validation error // focus to first input with validation error
$timeout(function () { $timeout(function () {
var firsterror = angular.element(document.querySelectorAll('input.ng-invalid'))[0] var firsterror = angular.element(document.querySelectorAll('input.ng-invalid'))[0];
firsterror.focus(); firsterror.focus();
}); });
} }
...@@ -319,10 +281,230 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -319,10 +281,230 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
buttonsToBottom.removeClass('hide'); buttonsToBottom.removeClass('hide');
//buttonsToTop.removeClass('hide'); //buttonsToTop.removeClass('hide');
}, 500); }, 500);
};
var _numbers = function (scope, v, k) {
v.type = 'number';
scope.model[k] = parseInt(scope.model[k]);
};
var _node_default = function (scope, v, k) {
scope[v.type] = scope[v.type] || {};
// no pass by reference
scope[v.type][k] = angular.copy({
title: v.title,
form: [],
schema: {
properties: {},
required: [],
title: v.title,
type: "object",
formType: v.type,
model_name: k,
inline_edit: scope.inline_edit
},
url: scope.url,
wf: scope.wf,
nodeModelChange: function (item) {
//debugger;
}
});
angular.forEach(v.schema, function (item) {
scope[v.type][k].schema.properties[item.name] = angular.copy(item);
// prepare required fields
if (item.required === true && item.name !== 'idx') {
scope[v.type][k].schema.required.push(angular.copy(item.name));
}
// idx field must be hidden
if (item.name !== 'idx') {
scope[v.type][k].form.push(item.name);
}
try {
if (item.type === 'date') {
scope.model[k][item.name] = generator.dateformatter(scope.model[k][item.name]);
}
} catch (e) {
$log.debug('Error: ', e.message);
}
});
$timeout(function () {
if (v.type === 'ListNode') {
scope[v.type][k].items = angular.copy(scope.model[k] || []);
angular.forEach(scope[v.type][k].items, function (value, key) {
if (value.constructor === Object) {
angular.forEach(value, function (x, y) {
try {
if (scope[v.type][k].schema.properties[y].type === 'date') {
scope[v.type][k].items[key][y] = generator.dateformatter(x);
scope[v.type][k].model[key][y] = generator.dateformatter(x);
}
if (scope[v.type][k].schema.properties[y].type === 'select') {
scope[v.type][k].items[key][y] = generator.item_from_array(x.toString(), scope[v.type][k].schema.properties[y].titleMap)
}
} catch (e) {
$log.debug('Field is not date');
}
});
}
});
} }
});
if (scope.model[k]) {
angular.forEach(scope.model[k], function (value, key) {
angular.forEach(value, function (y, x) {
if (y.constructor === Object) {
scope.model[k][key][x] = y.key;
}
});
});
}
scope.model[k] = scope.model[k] || [];
scope[v.type][k].model = scope.model[k];
// lengthModels is length of the listnode models. if greater than 0 show records on template
scope[v.type][k]['lengthModels'] = scope.model[k] ? 1 : 0;
};
var _node_filter_interface = function (scope, v, k) {
var formitem = scope.form[scope.form.indexOf(k)];
var modelScope = {
"url": v.wf || scope.wf, "wf": v.wf || scope.wf,
"form_params": {
model: v.model_name || v.schema[0].model_name,
cmd: v.list_cmd || 'select_list',
query: ''
}
};
scope.generateTitleMap = function (modelScope) {
generator.get_list(modelScope).then(function (res) {
formitem.titleMap = [];
angular.forEach(res.data.objects, function (item) {
if (item !== "-1") {
formitem.titleMap.push({
"value": item.key,
"name": item.value
});
}
});
formitem.filteredItems = generator.get_diff_array(angular.copy(formitem.titleMap), angular.copy(formitem.selectedFilteredItems), 1);
})
};
var modelItems = [];
var modelKeys = [];
angular.forEach(scope.model[k], function (value, mkey) {
modelItems.push({
"value": value[v.schema[0].name].key,
"name": value[v.schema[0].name].unicode
});
var modelKey = {};
modelKey[v.schema[0].name] = value[v.schema[0].name].key;
modelKeys.push(modelKey);
});
scope.model[k] = angular.copy(modelKeys);
formitem = {
type: "template",
templateUrl: "shared/templates/multiselect.html",
title: v.title,
// formName will be used in modal return to save item on form
formName: k,
wf: v.wf,
add_cmd: v.add_cmd,
name: v.model_name,
model_name: v.model_name,
filterValue: '',
selected_item: {},
filteredItems: [],
selectedFilteredItems: modelItems,
titleMap: scope.generateTitleMap(modelScope),
appendFiltered: function (filterValue) {
if (filterValue.length > 2) {
formitem.filteredItems = [];
angular.forEach(formitem.titleMap, function (value, key) {
if (value.name.indexOf(filterValue) > -1) {
formitem.filteredItems.push(formitem.titleMap[key]);
}
});
}
if (filterValue <= 2) {
formitem.filteredItems = formitem.titleMap
}
formitem.filteredItems = generator.get_diff_array(formitem.filteredItems, formitem.selectedFilteredItems);
},
select: function (selectedItemsModel) {
if (!selectedItemsModel) {
return;
}
formitem.selectedFilteredItems = formitem.selectedFilteredItems.concat(selectedItemsModel);
formitem.appendFiltered(formitem.filterValue);
scope.model[k] = (scope.model[k] || []).concat(formitem.dataToModel(selectedItemsModel));
},
deselect: function (selectedFilteredItemsModel) {
if (!selectedFilteredItemsModel) {
return;
}
formitem.selectedFilteredItems = generator.get_diff_array(angular.copy(formitem.selectedFilteredItems), angular.copy(selectedFilteredItemsModel));
formitem.appendFiltered(formitem.filterValue);
formitem.filteredItems = formitem.filteredItems.concat(selectedFilteredItemsModel);
scope.model[k] = generator.get_diff_array(scope.model[k] || [], formitem.dataToModel(selectedFilteredItemsModel));
},
dataToModel: function (data) {
var dataValues = [];
angular.forEach(data, function (value, key) {
var dataKey = {};
dataKey[v.schema[0].name] = value.value;
dataValues.push(dataKey);
});
return dataValues;
}
};
// check if type is date and if type date found change it to string scope.form[scope.form.indexOf(k)] = formitem;
if (v.type === 'date') {
};
// generate_fields covers all field types as functions
var generate_fields = {
button: {default: _buttons},
submit: {default: _buttons},
file: {default: function (scope, v, k) {
scope.form[scope.form.indexOf(k)] = {
type: "template",
title: v.title,
templateUrl: "shared/templates/filefield.html",
name: k,
key: k,
fileInsert: function () {
$scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
},
imageSrc: scope.model[k] ? $rootScope.settings.static_url + scope.model[k] : '',
avatar: k === 'avatar'
};
v.type = 'string';
}},
select: {default: function (scope, v, k) {
scope.form[scope.form.indexOf(k)] = {
type: "template",
title: v.title,
templateUrl: "shared/templates/select.html",
name: k,
key: k,
titleMap: v.titleMap
};
}},
date: {default: function (scope, v, k) {
$log.debug('date:', scope.model[k]); $log.debug('date:', scope.model[k]);
scope.model[k] = generator.dateformatter(scope.model[k]); scope.model[k] = generator.dateformatter(scope.model[k]);
scope.form[scope.form.indexOf(k)] = { scope.form[scope.form.indexOf(k)] = {
...@@ -365,26 +547,19 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -365,26 +547,19 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
scope.model[k] = angular.copy(generator.dateformatter(scope.model[k])); scope.model[k] = angular.copy(generator.dateformatter(scope.model[k]));
} }
}; };
} }},
int: {default: _numbers},
if (v.type === 'int' || v.type === 'float') { boolean: {default: function () {}},
v.type = 'number'; string: {default: function () {}},
scope.model[k] = parseInt(scope.model[k]); float: {default: _numbers},
} model: {default: function (scope, v, k) {
if (v.type === 'text_general') {
v.type = 'string';
v["x-schema-form"] = {
"type": "textarea"
//"placeholder": ""
}
}
// if type is model use foreignKey.html template to show them
if (v.type === 'model') {
var formitem = scope.form[scope.form.indexOf(k)]; var formitem = scope.form[scope.form.indexOf(k)];
var modelScope = {"url": v.wf, "wf": v.wf, "form_params": {model: v.model_name, cmd: v.list_cmd}}; var modelScope = {
"url": v.wf,
"wf": v.wf,
"form_params": {model: v.model_name, cmd: v.list_cmd}
};
//scope.$on('refreshTitleMap', function (event, data) { //scope.$on('refreshTitleMap', function (event, data) {
// todo: write a function to refresh titleMap after new item add to linkedModel // todo: write a function to refresh titleMap after new item add to linkedModel
...@@ -474,191 +649,33 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -474,191 +649,33 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
}; };
scope.form[scope.form.indexOf(k)] = formitem; scope.form[scope.form.indexOf(k)] = formitem;
} }},
Node: {
if ((v.type === 'ListNode' || v.type === 'Node') && v.widget === 'filter_interface') { default: _node_default,
var formitem = scope.form[scope.form.indexOf(k)]; filter_interface: _node_filter_interface
var modelScope = {
"url": v.wf || scope.wf, "wf": v.wf || scope.wf,
"form_params": {model: v.model_name || v.schema[0].model_name, cmd: v.list_cmd || 'select_list', query: ''}
};
scope.generateTitleMap = function (modelScope) {
generator.get_list(modelScope).then(function (res) {
formitem.titleMap = [];
angular.forEach(res.data.objects, function (item) {
if (item !== "-1") {
formitem.titleMap.push({
"value": item.key,
"name": item.value
});
}
});
formitem.filteredItems = generator.get_diff_array(angular.copy(formitem.titleMap), angular.copy(formitem.selectedFilteredItems), 1);
})
};
var modelItems = [];
var modelKeys = [];
angular.forEach(scope.model[k], function (value, mkey) {
modelItems.push({
"value": value[v.schema[0].name].key,
"name": value[v.schema[0].name].unicode
});
var modelKey = {};
modelKey[v.schema[0].name] = value[v.schema[0].name].key;
modelKeys.push(modelKey);
});
scope.model[k] = angular.copy(modelKeys);
formitem = {
type: "template",
templateUrl: "shared/templates/multiselect.html",
title: v.title,
// formName will be used in modal return to save item on form
formName: k,
wf: v.wf,
add_cmd: v.add_cmd,
name: v.model_name,
model_name: v.model_name,
filterValue: '',
selected_item: {},
filteredItems: [],
selectedFilteredItems: modelItems,
titleMap: scope.generateTitleMap(modelScope),
appendFiltered: function (filterValue) {
if (filterValue.length > 2) {
formitem.filteredItems = [];
angular.forEach(formitem.titleMap, function (value, key) {
if (value.name.indexOf(filterValue) > -1) {
formitem.filteredItems.push(formitem.titleMap[key]);
}
});
}
if (filterValue <= 2) { formitem.filteredItems = formitem.titleMap}
formitem.filteredItems = generator.get_diff_array(formitem.filteredItems, formitem.selectedFilteredItems);
},
select: function (selectedItemsModel) {
if (!selectedItemsModel) {
return;
}
formitem.selectedFilteredItems = formitem.selectedFilteredItems.concat(selectedItemsModel);
formitem.appendFiltered(formitem.filterValue);
scope.model[k] = (scope.model[k] || []).concat(formitem.dataToModel(selectedItemsModel));
},
deselect: function (selectedFilteredItemsModel) {
if (!selectedFilteredItemsModel) {
return;
}
formitem.selectedFilteredItems = generator.get_diff_array(angular.copy(formitem.selectedFilteredItems), angular.copy(selectedFilteredItemsModel));
formitem.appendFiltered(formitem.filterValue);
formitem.filteredItems = formitem.filteredItems.concat(selectedFilteredItemsModel);
scope.model[k] = generator.get_diff_array(scope.model[k] || [], formitem.dataToModel(selectedFilteredItemsModel));
}, },
dataToModel: function (data) { ListNode: {
var dataValues = []; default: _node_default,
angular.forEach(data, function (value, key) { filter_interface: _node_filter_interface
var dataKey = {};
dataKey[v.schema[0].name] = value.value;
dataValues.push(dataKey);
});
return dataValues;
} }
}; };
scope.form[scope.form.indexOf(k)] = formitem; angular.forEach(scope.schema.properties, function (v, k) {
}
if ((v.type === 'ListNode' || v.type === 'Node') && v.widget !== 'filter_interface') {
scope[v.type] = scope[v.type] || {};
// no pass by reference
scope[v.type][k] = angular.copy({
title: v.title,
form: [],
schema: {
properties: {},
required: [],
title: v.title,
type: "object",
formType: v.type,
model_name: k,
inline_edit: scope.inline_edit
},
url: scope.url,
wf: scope.wf,
nodeModelChange: function (item) {
//debugger;
}
});
angular.forEach(v.schema, function (item) {
scope[v.type][k].schema.properties[item.name] = angular.copy(item);
// prepare required fields
if (item.required === true && item.name !== 'idx') {
scope[v.type][k].schema.required.push(angular.copy(item.name));
}
// idx field must be hidden
if (item.name !== 'idx') {
scope[v.type][k].form.push(item.name);
}
try { // generically change _id fields model value
if (item.type === 'date') { if ('form_params' in scope) {
scope.model[k][item.name] = generator.dateformatter(scope.model[k][item.name]); if (k == scope.form_params.param) {
scope.model[k] = scope.form_params.id;
scope.form.splice(scope.form.indexOf(k), 1);
return;
} }
} catch (e) {
$log.debug('Error: ', e.message);
} }
});
$timeout(function () {
if (v.type === 'ListNode') {
scope[v.type][k].items = angular.copy(scope.model[k] || []);
angular.forEach(scope[v.type][k].items, function (value, key) {
if (value.constructor === Object) {
angular.forEach(value, function (x, y) {
try { try {
if (scope[v.type][k].schema.properties[y].type === 'date') { generate_fields[v.type][v.widget || 'default'](scope, v, k);
scope[v.type][k].items[key][y] = generator.dateformatter(x);
scope[v.type][k].model[key][y] = generator.dateformatter(x);
}
if (scope[v.type][k].schema.properties[y].type === 'select') {
scope[v.type][k].items[key][y] = generator.item_from_array(x.toString(), scope[v.type][k].schema.properties[y].titleMap)
}
} catch (e) {
$log.debug('Field is not date');
}
});
}
});
}
});
if (scope.model[k]) {
angular.forEach(scope.model[k], function (value, key) {
angular.forEach(value, function (y, x) {
if (y.constructor === Object) {
scope.model[k][key][x] = y.key;
} }
}); catch (e) {
}); console.log(v.type)
}
scope.model[k] = scope.model[k] || [];
scope[v.type][k].model = scope.model[k];
// lengthModels is length of the listnode models. if greater than 0 show records on template
scope[v.type][k]['lengthModels'] = scope.model[k] ? 1 : 0;
} }
}); });
...@@ -1038,7 +1055,9 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -1038,7 +1055,9 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
if (value && value.constructor === Date) { if (value && value.constructor === Date) {
model[key] = generator.dateformatter(value); model[key] = generator.dateformatter(value);
} }
if (value && value.constructor === Object) {convertDate(value);} if (value && value.constructor === Object) {
convertDate(value);
}
}); });
}; };
......
karma.conf.js
View file @ f8319f7d
...@@ -61,9 +61,9 @@ module.exports = function (config) { ...@@ -61,9 +61,9 @@ module.exports = function (config) {
plugins: [ plugins: [
'karma-phantomjs-launcher', 'karma-phantomjs-launcher',
'karma-chrome-launcher', //'karma-chrome-launcher',
'karma-firefox-launcher', //'karma-firefox-launcher',
'karma-safari-launcher', //'karma-safari-launcher',
'karma-jasmine', 'karma-jasmine',
'karma-junit-reporter', 'karma-junit-reporter',
'karma-coverage' 'karma-coverage'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment