Skip to content

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

resolves #68

parent 630835fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 34 deletions
app/shared/templates/directives/header-breadcrumb.html
View file @ f14492e8
<button type="button" class="close breadcrumb pull-left"><i class="fa fa-angle-left"></i> Geri </button> <!--<button type="button" class="close breadcrumb pull-left"><i class="fa fa-angle-left"></i> Geri </button>-->
<!--<ul class="breadcrumb">--> <!--<ul class="breadcrumb">-->
<!--<li ng-repeat="link in $root.breadcrumblinks" ng-class="{'active':$last}">--> <!--<li ng-repeat="link in $root.breadcrumblinks" ng-class="{'active':$last}">-->
<!--<a href="#" ng-if="!$last">{{link}}</a>--> <!--<a href="#" ng-if="!$last">{{link}}</a>-->
<!--<span ng-if="$last">{{link}}</span>--> <!--<span ng-if="$last">{{link}}</span>-->
<!--</li>--> <!--</li>-->
<!--</ul>--> <!--</ul>-->
<button type="button" class="close breadcrumb pull-right" ng-click="goBack()">İleri <i class="fa fa-angle-right"></i></button> <!--<button type="button" class="close breadcrumb pull-right" ng-click="goBack()">İleri <i class="fa fa-angle-right"></i></button>-->
\ No newline at end of file \ No newline at end of file
app/shared/templates/directives/header-notification.html
View file @ f14492e8
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">
<div class="badge" ng-if="notifications[2].length > 0">{{notifications[2].length}}</div> <div class="badge" ng-if="notifications[2].length > 0">{{notifications[2].length}}</div>
<i class="fa fa-envelope fa-fw"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-envelope fa-fw" tooltip-placement="bottom" uib-tooltip="Mesajlar"></i> <i
class="fa fa-caret-down"></i>
</a> </a>
<ul class="dropdown-menu dropdown-messages" ng-if="notifications[2].length > 0"> <ul class="dropdown-menu dropdown-messages" ng-if="notifications[2].length > 0">
<li ng-repeat="notify in notifications[2] | limitTo: '8'"> <li ng-repeat="notify in notifications[2] | limitTo: '8'">
...@@ -30,7 +31,8 @@ ...@@ -30,7 +31,8 @@
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">
<div class="badge" ng-if="notifications[1].length > 0">{{notifications[1].length}}</div> <div class="badge" ng-if="notifications[1].length > 0">{{notifications[1].length}}</div>
<i class="fa fa-tasks fa-fw"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-tasks fa-fw" tooltip-placement="bottom" uib-tooltip="Görevler"></i> <i
class="fa fa-caret-down"></i>
</a> </a>
<ul class="dropdown-menu dropdown-tasks" ng-if="notifications[1].length > 0"> <ul class="dropdown-menu dropdown-tasks" ng-if="notifications[1].length > 0">
<li ng-repeat="notify in notifications[1] | limitTo: '8'"> <li ng-repeat="notify in notifications[1] | limitTo: '8'">
...@@ -64,7 +66,8 @@ ...@@ -64,7 +66,8 @@
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">
<div class="badge" ng-if="notifications[3].length > 0">{{notifications[3].length}}</div> <div class="badge" ng-if="notifications[3].length > 0">{{notifications[3].length}}</div>
<i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-bell fa-fw" tooltip-placement="bottom" uib-tooltip="Duyurular"></i> <i
class="fa fa-caret-down"></i>
</a> </a>
<ul class="dropdown-menu dropdown-alerts" ng-if="notifications[3].length > 0"> <ul class="dropdown-menu dropdown-alerts" ng-if="notifications[3].length > 0">
<li> <li>
...@@ -81,7 +84,8 @@ ...@@ -81,7 +84,8 @@
<!-- /.dropdown --> <!-- /.dropdown -->
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-user fa-fw" tooltip-placement="bottom" uib-tooltip="Profil"></i> <i
class="fa fa-caret-down"></i>
</a> </a>
<ul class="dropdown-menu dropdown-user"> <ul class="dropdown-menu dropdown-user">
<li><a role="button"><i class="fa fa-user fa-fw"></i> Profil</a></li> <li><a role="button"><i class="fa fa-user fa-fw"></i> Profil</a></li>
......
app/shared/templates/foreignKey.html
View file @ f14492e8
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
</ul> </ul>
</span> </span>
<input type="text" <input type="text"
ng-model="form.model" ng-model="$$value$$"
uib-typeahead="item as item.name for item in form.getTitleMap($viewValue)" uib-typeahead="item as item.name for item in form.getTitleMap($viewValue)"
typeahead-on-select="form.onSelect($item)" typeahead-on-select="form.onSelect($item, form.name)"
typeahead-loading="loadingTitleMap" typeahead-no-results="noResults" typeahead-loading="loadingTitleMap" typeahead-no-results="noResults"
typeahead-wait-ms="500" typeahead-wait-ms="500"
placeholder="{{form.title}}" placeholder="{{form.title}}"
......
app/zetalib/form_service.js
View file @ f14492e8
...@@ -107,7 +107,9 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -107,7 +107,9 @@ angular.module('formService', ['ui.bootstrap'])
*/ */
generator.group = function (scope) { generator.group = function (scope) {
if (!scope.grouping) {return scope;} if (!scope.grouping) {
return scope;
}
var newForm = []; var newForm = [];
...@@ -115,7 +117,9 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -115,7 +117,9 @@ angular.module('formService', ['ui.bootstrap'])
var extractedList = []; var extractedList = [];
angular.forEach(itemList, function (value, key) { angular.forEach(itemList, function (value, key) {
var item = getFormItem(value); var item = getFormItem(value);
if (item) {extractedList.push(item);} if (item) {
extractedList.push(item);
}
}); });
$log.debug('extractedList: ', extractedList); $log.debug('extractedList: ', extractedList);
...@@ -394,32 +398,35 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -394,32 +398,35 @@ angular.module('formService', ['ui.bootstrap'])
wf: v.wf, wf: v.wf,
add_cmd: v.add_cmd, add_cmd: v.add_cmd,
name: k, name: k,
key:k, key: k,
model_name: v.model_name, model_name: v.model_name,
selected_item: {}, selected_item: {},
titleMap: [], titleMap: [],
onSelect: function (item) { onSelect: function (item, inputname) {
scope.model[k] = item.value; scope.model[k] = item.value;
$timeout(function () {
document.querySelector('input[name=' + inputname + ']').value = item.name;
});
}, },
onDropdownSelect: function (item, inputname) { onDropdownSelect: function (item, inputname) {
scope.model[k] = item.value; scope.model[k] = item.value;
jQuery('input[name=' + inputname + ']').val(item.name); $timeout(function () {
document.querySelector('input[name=' + inputname + ']').value = item.name;
});
}, },
getTitleMap: function (viewValue) { getTitleMap: function (viewValue) {
modelScope.form_params.query = viewValue; modelScope.form_params.query = viewValue;
return scope.generateTitleMap(modelScope); return scope.generateTitleMap(modelScope);
}, },
getDropdownTitleMap: function () { getDropdownTitleMap: function () {
delete modelScope.form_params.query;
formitem.gettingTitleMap = true; formitem.gettingTitleMap = true;
if (formitem.titleMap.length > 0) { scope.generateTitleMap(modelScope)
formitem.gettingTitleMap = false; .then(function (data) {
} else { formitem.titleMap = data;
scope.generateTitleMap(modelScope) formitem.gettingTitleMap = false;
.then(function (data) { });
formitem.titleMap = data;
formitem.gettingTitleMap = false;
});
}
} }
}; };
......
dist/app.js
View file @ f14492e8
This diff is collapsed.
dist/bower_components/components.js
View file @ f14492e8
This diff is collapsed.
dist/templates.js
View file @ f14492e8
...@@ -838,14 +838,14 @@ angular.module("shared/templates/directives/guide-help.html", []).run(["$templat ...@@ -838,14 +838,14 @@ angular.module("shared/templates/directives/guide-help.html", []).run(["$templat
angular.module("shared/templates/directives/header-breadcrumb.html", []).run(["$templateCache", function($templateCache) { angular.module("shared/templates/directives/header-breadcrumb.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("shared/templates/directives/header-breadcrumb.html", $templateCache.put("shared/templates/directives/header-breadcrumb.html",
"<button type=\"button\" class=\"close breadcrumb pull-left\"><i class=\"fa fa-angle-left\"></i> Geri </button>\n" + "<!--<button type=\"button\" class=\"close breadcrumb pull-left\"><i class=\"fa fa-angle-left\"></i> Geri </button>-->\n" +
"<!--<ul class=\"breadcrumb\">-->\n" + "<!--<ul class=\"breadcrumb\">-->\n" +
" <!--<li ng-repeat=\"link in $root.breadcrumblinks\" ng-class=\"{'active':$last}\">-->\n" + " <!--<li ng-repeat=\"link in $root.breadcrumblinks\" ng-class=\"{'active':$last}\">-->\n" +
" <!--<a href=\"#\" ng-if=\"!$last\">{{link}}</a>-->\n" + " <!--<a href=\"#\" ng-if=\"!$last\">{{link}}</a>-->\n" +
" <!--<span ng-if=\"$last\">{{link}}</span>-->\n" + " <!--<span ng-if=\"$last\">{{link}}</span>-->\n" +
" <!--</li>-->\n" + " <!--</li>-->\n" +
"<!--</ul>-->\n" + "<!--</ul>-->\n" +
"<button type=\"button\" class=\"close breadcrumb pull-right\" ng-click=\"goBack()\">İleri <i class=\"fa fa-angle-right\"></i></button>"); "<!--<button type=\"button\" class=\"close breadcrumb pull-right\" ng-click=\"goBack()\">İleri <i class=\"fa fa-angle-right\"></i></button>-->");
}]); }]);
angular.module("shared/templates/directives/header-notification.html", []).run(["$templateCache", function($templateCache) { angular.module("shared/templates/directives/header-notification.html", []).run(["$templateCache", function($templateCache) {
...@@ -854,7 +854,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([ ...@@ -854,7 +854,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([
" <li class=\"dropdown\">\n" + " <li class=\"dropdown\">\n" +
" <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" + " <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" +
" <div class=\"badge\" ng-if=\"notifications[2].length > 0\">{{notifications[2].length}}</div>\n" + " <div class=\"badge\" ng-if=\"notifications[2].length > 0\">{{notifications[2].length}}</div>\n" +
" <i class=\"fa fa-envelope fa-fw\"></i> <i class=\"fa fa-caret-down\"></i>\n" + " <i class=\"fa fa-envelope fa-fw\" tooltip-placement=\"bottom\" uib-tooltip=\"Mesajlar\"></i> <i\n" +
" class=\"fa fa-caret-down\"></i>\n" +
" </a>\n" + " </a>\n" +
" <ul class=\"dropdown-menu dropdown-messages\" ng-if=\"notifications[2].length > 0\">\n" + " <ul class=\"dropdown-menu dropdown-messages\" ng-if=\"notifications[2].length > 0\">\n" +
" <li ng-repeat=\"notify in notifications[2] | limitTo: '8'\">\n" + " <li ng-repeat=\"notify in notifications[2] | limitTo: '8'\">\n" +
...@@ -882,7 +883,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([ ...@@ -882,7 +883,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([
" <li class=\"dropdown\">\n" + " <li class=\"dropdown\">\n" +
" <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" + " <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" +
" <div class=\"badge\" ng-if=\"notifications[1].length > 0\">{{notifications[1].length}}</div>\n" + " <div class=\"badge\" ng-if=\"notifications[1].length > 0\">{{notifications[1].length}}</div>\n" +
" <i class=\"fa fa-tasks fa-fw\"></i> <i class=\"fa fa-caret-down\"></i>\n" + " <i class=\"fa fa-tasks fa-fw\" tooltip-placement=\"bottom\" uib-tooltip=\"Görevler\"></i> <i\n" +
" class=\"fa fa-caret-down\"></i>\n" +
" </a>\n" + " </a>\n" +
" <ul class=\"dropdown-menu dropdown-tasks\" ng-if=\"notifications[1].length > 0\">\n" + " <ul class=\"dropdown-menu dropdown-tasks\" ng-if=\"notifications[1].length > 0\">\n" +
" <li ng-repeat=\"notify in notifications[1] | limitTo: '8'\">\n" + " <li ng-repeat=\"notify in notifications[1] | limitTo: '8'\">\n" +
...@@ -916,7 +918,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([ ...@@ -916,7 +918,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([
" <li class=\"dropdown\">\n" + " <li class=\"dropdown\">\n" +
" <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" + " <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" +
" <div class=\"badge\" ng-if=\"notifications[3].length > 0\">{{notifications[3].length}}</div>\n" + " <div class=\"badge\" ng-if=\"notifications[3].length > 0\">{{notifications[3].length}}</div>\n" +
" <i class=\"fa fa-bell fa-fw\"></i> <i class=\"fa fa-caret-down\"></i>\n" + " <i class=\"fa fa-bell fa-fw\" tooltip-placement=\"bottom\" uib-tooltip=\"Duyurular\"></i> <i\n" +
" class=\"fa fa-caret-down\"></i>\n" +
" </a>\n" + " </a>\n" +
" <ul class=\"dropdown-menu dropdown-alerts\" ng-if=\"notifications[3].length > 0\">\n" + " <ul class=\"dropdown-menu dropdown-alerts\" ng-if=\"notifications[3].length > 0\">\n" +
" <li>\n" + " <li>\n" +
...@@ -933,7 +936,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([ ...@@ -933,7 +936,8 @@ angular.module("shared/templates/directives/header-notification.html", []).run([
" <!-- /.dropdown -->\n" + " <!-- /.dropdown -->\n" +
" <li class=\"dropdown\">\n" + " <li class=\"dropdown\">\n" +
" <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" + " <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">\n" +
" <i class=\"fa fa-user fa-fw\"></i> <i class=\"fa fa-caret-down\"></i>\n" + " <i class=\"fa fa-user fa-fw\" tooltip-placement=\"bottom\" uib-tooltip=\"Profil\"></i> <i\n" +
" class=\"fa fa-caret-down\"></i>\n" +
" </a>\n" + " </a>\n" +
" <ul class=\"dropdown-menu dropdown-user\">\n" + " <ul class=\"dropdown-menu dropdown-user\">\n" +
" <li><a role=\"button\"><i class=\"fa fa-user fa-fw\"></i> Profil</a></li>\n" + " <li><a role=\"button\"><i class=\"fa fa-user fa-fw\"></i> Profil</a></li>\n" +
...@@ -1509,9 +1513,9 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu ...@@ -1509,9 +1513,9 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu
" </ul>\n" + " </ul>\n" +
" </span>\n" + " </span>\n" +
" <input type=\"text\"\n" + " <input type=\"text\"\n" +
" ng-model=\"form.model\"\n" + " ng-model=\"$$value$$\"\n" +
" uib-typeahead=\"item as item.name for item in form.getTitleMap($viewValue)\"\n" + " uib-typeahead=\"item as item.name for item in form.getTitleMap($viewValue)\"\n" +
" typeahead-on-select=\"form.onSelect($item)\"\n" + " typeahead-on-select=\"form.onSelect($item, form.name)\"\n" +
" typeahead-loading=\"loadingTitleMap\" typeahead-no-results=\"noResults\"\n" + " typeahead-loading=\"loadingTitleMap\" typeahead-no-results=\"noResults\"\n" +
" typeahead-wait-ms=\"500\"\n" + " typeahead-wait-ms=\"500\"\n" +
" placeholder=\"{{form.title}}\"\n" + " placeholder=\"{{form.title}}\"\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