Skip to content

U
ulakbus-ui
Commit 6338143e authored by bahadircyildiz's avatar bahadircyildiz
Browse files
Options

Merge branch 'develop' of github.com:zetaops/ulakbus-ui into develop

parents 3091f14c e521e671
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 63 deletions
app/components/crud/crud_controller.js
View file @ 6338143e
......@@ -60,8 +60,11 @@ angular.module('ulakbus.crud', ['schemaForm', 'ui.bootstrap', 'ulakbus.formServi
scope.form_params = {
//cmd: cmd,
// model name in ulakbus
model: routeParams.model,
// generic value passing by backend. would be any of these: id, personel_id, etc.
param: scope.param || routeParams.param,
// generic value passing by backend. would be the value of param
id: scope.param_id || routeParams.param_id,
wf: routeParams.wf,
object_id: routeParams.key,
......
app/components/crud/templates/form.html
View file @ 6338143e
......@@ -2,7 +2,19 @@
<div class="buttons-on-top"></div>
<form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"
ng-submit="onSubmit(formgenerated)" form-locator></form>
ng-submit="onSubmit(formgenerated)" form-locator>
<!--<div>-->
<!--<uib-tabset active="active">-->
<!--<uib-tab index="0" heading="Static title">-->
<!--<div ng-repeat="field in form">-->
<!--<em>before</em>-->
<!--<div sf-insert-field="[field]"></div>-->
<!--<em>after</em>-->
<!--</div>-->
<!--</uib-tab>-->
<!--</uib-tabset>-->
<!--</div>-->
</form>
<div ng-repeat="node in Node">
<h3>{{ node.title }}
......
app/components/crud/templates/nodeTable.html
View file @ 6338143e
......@@ -22,7 +22,7 @@
<th ng-repeat="(key,value) in node.items[0] track by $index"
ng-if="key!=='idx' && node.schema.properties[key]">
<span ng-if="value.verbose_name">{{ value.verbose_name }}</span>
<span ng-if="!value.verbose_name">{{key}}</span>
<span ng-if="!value.verbose_name">{{node.schema.properties[key]['title']|| key}}</span>
</th>
<th ng-if="meta.allow_actions!==false">İşlem</th>
</tr>
......
app/shared/templates/foreignKey.html
View file @ 6338143e
......@@ -14,7 +14,7 @@
data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<ul class="dropdown-menu" ng-if="form.titleMap.length > 0">
<li class="text-center" ng-if="form.gettingTitleMap"><a><span class="loader"></span></a></li>
<li ng-repeat="item in form.titleMap">
<a ng-click="form.onDropdownSelect(item, form.name)">{{item
......
app/zetalib/form_service.js
View file @ 6338143e
......@@ -333,11 +333,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
if (scope.modalElements) {
scope.submitModalForm();
} else {
if (v.validation === false) {
if (v.validation === false || !v.form_validate) {
generator.submit(scope, redirectTo);
} else {
scope.$broadcast('schemaFormValidate');
if (scope[workOnForm].$valid) {
if (scope[workOnForm].$valid || !v.form_validate) {
generator.submit(scope, redirectTo);
scope.$broadcast('disposeModal');
} else {
......@@ -369,6 +369,12 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
};
var _numbers = function (scope, v, k) {
v.type = 'number';
v.validationMessage = {'max': 'bu alan -2147483647 ve 2147483647 arasında olmalıdır.'}
v.$validators = {
max: function(value){
return 2147483647>value>-2147483647;
}
};
scope.model[k] = parseInt(scope.model[k]);
};
var _node_default = function (scope, v, k) {
......@@ -428,6 +434,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
});
$timeout(function () {
// todo: needs refactor
if (v.type === 'ListNode') {
scope[v.type][k].items = angular.copy(scope.model[k] || []);
angular.forEach(scope[v.type][k].items, function (value, key) {
......@@ -726,7 +733,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
// todo: write a function to refresh titleMap after new item add to linkedModel
//});
scope.generateTitleMap = function (modelScope) {
var generateTitleMap = function (modelScope) {
return generator.get_list(modelScope).then(function (res) {
formitem.titleMap = [];
angular.forEach(res.objects, function (item) {
......@@ -772,12 +779,12 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
},
getTitleMap: function (viewValue) {
modelScope.form_params.query = viewValue;
return scope.generateTitleMap(modelScope);
return generateTitleMap(modelScope);
},
getDropdownTitleMap: function () {
delete modelScope.form_params.query;
formitem.gettingTitleMap = true;
scope.generateTitleMap(modelScope)
generateTitleMap(modelScope)
.then(function (data) {
formitem.titleMap = data;
formitem.gettingTitleMap = false;
......@@ -850,7 +857,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
generate_fields[v.type][v.widget || 'default'](scope, v, k);
}
catch (e) {
// raise not implemented
// todo: raise not implemented
console.log(v.type)
}
});
......@@ -930,6 +937,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @description Changes html disabled and enabled attributes of all buttons on current page.
* @param {boolean} position
*/
// todo: remove
generator.button_switch = function (position) {
var buttons = angular.element(document.querySelectorAll('button'));
var positions = {true: "enabled", false: "disabled"};
......@@ -957,12 +965,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
generator.get_form(scope);
}, 500);
}
//return $http
// .post(generator.makeUrl(scope), scope.form_params)
// .then(function (res) {
// //generator.button_switch(true);
// return generator.generate(scope, res.data);
// });
};
/**
* @memberof ulakbus.formService
......@@ -973,12 +975,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @returns {*}
*/
generator.get_list = function (scope) {
//return $http
// .post(generator.makeUrl(scope), scope.form_params)
// .then(function (res) {
// //generator.button_switch(true);
// return res;
// });
if ($rootScope.websocketIsOpen === true) {
return WSOps.request(scope.form_params)
......@@ -1001,6 +997,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @returns {*}
*/
generator.get_wf = function (scope) {
// todo: remove this condition
if ($rootScope.websocketIsOpen === true) {
WSOps.request(scope.form_params)
.then(function (data) {
......@@ -1012,13 +1009,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
generator.get_wf(scope);
}, 500);
}
//return $http
// .post(generator.makeUrl(scope), scope.form_params)
// .then(function (res) {
// return generator.pathDecider(res.data.client_cmd, scope, res.data);
// });
};
/**
* @memberof ulakbus.formService
......@@ -1258,33 +1248,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
generator.scope($scope, redirectTo);
}, 500);
}
//return $http.post(generator.makeUrl($scope), data)
// .success(function (data, status, headers) {
// if (headers('content-type') === "application/pdf") {
// var a = document.createElement("a");
// document.body.appendChild(a);
// a.style = "display: none";
// var file = new Blob([data], {type: 'application/pdf'});
// var fileURL = URL.createObjectURL(file);
// var fileName = $scope.schema.title;
// a.href = fileURL;
// a.download = fileName;
// a.click();
// }
// if (redirectTo === true) {
// if (data.client_cmd) {
// generator.pathDecider(data.client_cmd, $scope, data);
// }
// if (data.msgbox) {
// $scope.msgbox = data.msgbox;
// var newElement = $compile("<msgbox></msgbox>")($scope);
// // this is the default action, which is removing page items and reload page with msgbox
// angular.element(document.querySelector('.main.ng-scope')).children().remove();
// angular.element(document.querySelector('.main.ng-scope')).append(newElement);
// }
// }
// });
};
return generator;
})
......
app/zetalib/socket.js
View file @ 6338143e
......@@ -102,7 +102,7 @@ angular.module('ulakbus')
};
wsOps.onClose = function (event) {
$rootScope.websocketIsOpen = false;
$log.info("DISCONNEDTED", event);
$log.info("DISCONNECTED", event);
};
// two types of data can be come from websocket: with and without callback
// if callback in callbacks list it will run the callback and delete it
......
dist/app.js
View file @ 6338143e
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/bower_components/components.js
View file @ 6338143e
This diff is collapsed.
dist/templates.js
View file @ 6338143e
......@@ -182,7 +182,19 @@ angular.module("components/crud/templates/form.html", []).run(["$templateCache",
" <div class=\"buttons-on-top\"></div>\n" +
"\n" +
" <form id=\"formgenerated\" name=\"formgenerated\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\"\n" +
" ng-submit=\"onSubmit(formgenerated)\" form-locator></form>\n" +
" ng-submit=\"onSubmit(formgenerated)\" form-locator>\n" +
" <!--<div>-->\n" +
" <!--<uib-tabset active=\"active\">-->\n" +
" <!--<uib-tab index=\"0\" heading=\"Static title\">-->\n" +
" <!--<div ng-repeat=\"field in form\">-->\n" +
" <!--<em>before</em>-->\n" +
" <!--<div sf-insert-field=\"[field]\"></div>-->\n" +
" <!--<em>after</em>-->\n" +
" <!--</div>-->\n" +
" <!--</uib-tab>-->\n" +
" <!--</uib-tabset>-->\n" +
" <!--</div>-->\n" +
" </form>\n" +
"\n" +
" <div ng-repeat=\"node in Node\">\n" +
" <h3>{{ node.title }}\n" +
......@@ -367,7 +379,7 @@ angular.module("components/crud/templates/nodeTable.html", []).run(["$templateCa
" <th ng-repeat=\"(key,value) in node.items[0] track by $index\"\n" +
" ng-if=\"key!=='idx' && node.schema.properties[key]\">\n" +
" <span ng-if=\"value.verbose_name\">{{ value.verbose_name }}</span>\n" +
" <span ng-if=\"!value.verbose_name\">{{key}}</span>\n" +
" <span ng-if=\"!value.verbose_name\">{{node.schema.properties[key]['title']|| key}}</span>\n" +
" </th>\n" +
" <th ng-if=\"meta.allow_actions!==false\">İşlem</th>\n" +
" </tr>\n" +
......@@ -2737,7 +2749,7 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu
" data-toggle=\"dropdown\">\n" +
" <span class=\"caret\"></span>\n" +
" </button>\n" +
" <ul class=\"dropdown-menu\">\n" +
" <ul class=\"dropdown-menu\" ng-if=\"form.titleMap.length > 0\">\n" +
" <li class=\"text-center\" ng-if=\"form.gettingTitleMap\"><a><span class=\"loader\"></span></a></li>\n" +
" <li ng-repeat=\"item in form.titleMap\">\n" +
" <a ng-click=\"form.onDropdownSelect(item, form.name)\">{{item\n" +
......
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