Skip to content

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

date field custom validation + listnode fix

parent f13aa51b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 125 deletions
app/shared/templates/linkedModelModalContent.html
View file @ f98e8577
...@@ -3,6 +3,34 @@ ...@@ -3,6 +3,34 @@
<div class="buttons-on-top-modal"></div> <div class="buttons-on-top-modal"></div>
<hr> <hr>
<form name="linkedModelForm" sf-schema="schema" sf-form="form" sf-model="model" modal-form-locator></form> <form name="linkedModelForm" sf-schema="schema" sf-form="form" sf-model="model" modal-form-locator></form>
<div ng-repeat="node in Node">
<h3>{{ node.title }}
<span ng-if="node.lengthModels < 1">
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},Node">
<i class="fa fa-plus-circle fa-fw"></i>
</a>
</span>
</h3>
<div class="node-table">
<ng-include src="'shared/templates/nodeTable.html'"></ng-include>
</div>
<hr>
</div>
<div ng-repeat="node in ListNode">
<h3>{{ node.title }}
<span>
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},ListNode,add">
<i class="fa fa-plus-circle fa-fw"></i>
</a>
</span>
</h3>
<div class="list-node-table">
<ng-include src="'shared/templates/nodeTable.html'"></ng-include>
</div>
<hr>
</div>
<hr> <hr>
<div class="buttons-on-bottom-modal"></div> <div class="buttons-on-bottom-modal"></div>
</div> </div>
......
app/shared/templates/nodeTable.html
View file @ f98e8577
<div class="tablescroll"> <div class="tablescroll">
{{node.model}} <table class="table table-bordered" style="background-color:#fff;">
<!--<table class="table table-bordered" style="background-color:#fff;">--> <thead>
<!--<thead>--> <tr ng-if="node.schema.formType=='Node'">
<!--<tr ng-if="node.schema.formType=='Node'">-->
<!--&lt;!&ndash;<th colspan="2">&ndash;&gt;-->
<!--&lt;!&ndash;<label>&ndash;&gt;-->
<!--&lt;!&ndash;<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">&ndash;&gt;-->
<!--&lt;!&ndash;Hepsini Seç&ndash;&gt;-->
<!--&lt;!&ndash;</label>&ndash;&gt;-->
<!--&lt;!&ndash;</th>&ndash;&gt;-->
<!--<th ng-repeat="(key,value) in node.model">{{ key }}</th>-->
<!--<th>İşlem</th>-->
<!--</tr>-->
<!--<tr ng-if="node.schema.formType=='ListNode'">-->
<!--<th colspan="2">--> <!--<th colspan="2">-->
<!--<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.model[0]">{{ key }}</th>--> <th ng-repeat="(key,value) in node.model track by $index">{{ key }}</th>
<!--<th>İşlem</th>--> <th>İşlem</th>
<!--</tr>--> </tr>
<!--</thead>--> <tr ng-if="node.schema.formType=='ListNode'">
<!--<tbody ng-class="{hidden: node.lengthModels < 1}">--> <th colspan="2">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
Hepsini Seç
</label>
</th>
<th ng-repeat="(key,value) in node.model track by $index">{{ key }}</th>
<th>İşlem</th>
</tr>
</thead>
<tbody ng-class="{hidden: node.lengthModels < 1}">
<!--<tr ng-if="node.schema.formType=='Node'">--> <tr ng-if="node.schema.formType=='Node'">
<!--&lt;!&ndash;<td width="60">&ndash;&gt;-->
<!--&lt;!&ndash;<label>&ndash;&gt;-->
<!--&lt;!&ndash;<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">&ndash;&gt;-->
<!--&lt;!&ndash;</label>&ndash;&gt;-->
<!--&lt;!&ndash;</td>&ndash;&gt;-->
<!--&lt;!&ndash;<th scope="row" style="text-align:center">1</th>&ndash;&gt;-->
<!--<td ng-repeat="value in node.model">{{ value }}</td>-->
<!--<td>-->
<!--<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit">Düzenle</button><br>-->
<!--<button>Sil</button>-->
<!--</td>-->
<!--</tr>-->
<!--<tr ng-repeat="listnodemodel in node.model" ng-if="node.schema.formType=='ListNode'">-->
<!--<td width="60">--> <!--<td 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>-->
<!--</td>--> <!--</td>-->
<!--<th scope="row" style="text-align:center">{{$index+1}}</th>--> <!--<th scope="row" style="text-align:center">1</th>-->
<!--<td ng-repeat="(k, v) in listnodemodel">{{ v }}</td>--> <td ng-repeat="value in node.model track by $index">{{ value }}</td>
<!--<td>--> <td>
<!--<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">Düzenle</button><br>--> <button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit">Düzenle</button><br>
<!--<button>Sil</button>--> <button>Sil</button>
<!--</td>--> </td>
<!--</tr>--> </tr>
<tr ng-repeat="listnodemodel in node.items track by $index" ng-if="node.schema.formType=='ListNode'">
<td width="60">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">{{$index+1}}</th>
<td ng-repeat="(k, v) in listnodemodel track by $index">{{ v }}</td>
<td>
<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">Düzenle</button><br>
<button>Sil</button>
</td>
</tr>
<!--</tbody>--> </tbody>
<!--</table>--> </table>
</div> </div>
\ No newline at end of file
app/zetalib/form_service.js
View file @ f98e8577
This diff is collapsed.
dist/templates.js
View file @ f98e8577
...@@ -1520,6 +1520,34 @@ angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templ ...@@ -1520,6 +1520,34 @@ angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templ
" <div class=\"buttons-on-top-modal\"></div>\n" + " <div class=\"buttons-on-top-modal\"></div>\n" +
" <hr>\n" + " <hr>\n" +
" <form name=\"linkedModelForm\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\" modal-form-locator></form>\n" + " <form name=\"linkedModelForm\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\" modal-form-locator></form>\n" +
" <div ng-repeat=\"node in Node\">\n" +
" <h3>{{ node.title }}\n" +
" <span ng-if=\"node.lengthModels < 1\">\n" +
" <a href=\"javascript:void(0);\" modal-for-nodes=\"{{node.schema.model_name}},Node\">\n" +
" <i class=\"fa fa-plus-circle fa-fw\"></i>\n" +
" </a>\n" +
" </span>\n" +
" </h3>\n" +
"\n" +
" <div class=\"node-table\">\n" +
" <ng-include src=\"'shared/templates/nodeTable.html'\"></ng-include>\n" +
" </div>\n" +
" <hr>\n" +
" </div>\n" +
" <div ng-repeat=\"node in ListNode\">\n" +
" <h3>{{ node.title }}\n" +
" <span>\n" +
" <a href=\"javascript:void(0);\" modal-for-nodes=\"{{node.schema.model_name}},ListNode,add\">\n" +
" <i class=\"fa fa-plus-circle fa-fw\"></i>\n" +
" </a>\n" +
" </span>\n" +
" </h3>\n" +
"\n" +
" <div class=\"list-node-table\">\n" +
" <ng-include src=\"'shared/templates/nodeTable.html'\"></ng-include>\n" +
" </div>\n" +
" <hr>\n" +
" </div>\n" +
" <hr>\n" + " <hr>\n" +
" <div class=\"buttons-on-bottom-modal\"></div>\n" + " <div class=\"buttons-on-bottom-modal\"></div>\n" +
"</div>\n" + "</div>\n" +
...@@ -1616,62 +1644,61 @@ angular.module("shared/templates/multiselect.html", []).run(["$templateCache", f ...@@ -1616,62 +1644,61 @@ angular.module("shared/templates/multiselect.html", []).run(["$templateCache", f
angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", function($templateCache) { angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("shared/templates/nodeTable.html", $templateCache.put("shared/templates/nodeTable.html",
"<div class=\"tablescroll\">\n" + "<div class=\"tablescroll\">\n" +
" {{node.model}}\n" + "<table class=\"table table-bordered\" style=\"background-color:#fff;\">\n" +
"<!--<table class=\"table table-bordered\" style=\"background-color:#fff;\">-->\n" + " <thead>\n" +
" <!--<thead>-->\n" + " <tr ng-if=\"node.schema.formType=='Node'\">\n" +
" <!--<tr ng-if=\"node.schema.formType=='Node'\">-->\n" +
" <!--&lt;!&ndash;<th colspan=\"2\">&ndash;&gt;-->\n" +
" <!--&lt;!&ndash;<label>&ndash;&gt;-->\n" +
" <!--&lt;!&ndash;<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">&ndash;&gt;-->\n" +
" <!--&lt;!&ndash;Hepsini Seç&ndash;&gt;-->\n" +
" <!--&lt;!&ndash;</label>&ndash;&gt;-->\n" +
" <!--&lt;!&ndash;</th>&ndash;&gt;-->\n" +
" <!--<th ng-repeat=\"(key,value) in node.model\">{{ key }}</th>-->\n" +
" <!--<th>İşlem</th>-->\n" +
" <!--</tr>-->\n" +
" <!--<tr ng-if=\"node.schema.formType=='ListNode'\">-->\n" +
" <!--<th colspan=\"2\">-->\n" + " <!--<th colspan=\"2\">-->\n" +
" <!--<label>-->\n" + " <!--<label>-->\n" +
" <!--<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">-->\n" + " <!--<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">-->\n" +
" <!--Hepsini Seç-->\n" + " <!--Hepsini Seç-->\n" +
" <!--</label>-->\n" + " <!--</label>-->\n" +
" <!--</th>-->\n" + " <!--</th>-->\n" +
" <!--<th ng-repeat=\"(key,value) in node.model[0]\">{{ key }}</th>-->\n" + " <th ng-repeat=\"(key,value) in node.model track by $index\">{{ key }}</th>\n" +
" <!--<th>İşlem</th>-->\n" + " <th>İşlem</th>\n" +
" <!--</tr>-->\n" + " </tr>\n" +
" <!--</thead>-->\n" + " <tr ng-if=\"node.schema.formType=='ListNode'\">\n" +
" <!--<tbody ng-class=\"{hidden: node.lengthModels < 1}\">-->\n" + " <th colspan=\"2\">\n" +
"\n" + " <label>\n" +
" <!--<tr ng-if=\"node.schema.formType=='Node'\">-->\n" + " <input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">\n" +
" <!--&lt;!&ndash;<td width=\"60\">&ndash;&gt;-->\n" + " Hepsini Seç\n" +
" <!--&lt;!&ndash;<label>&ndash;&gt;-->\n" + " </label>\n" +
" <!--&lt;!&ndash;<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">&ndash;&gt;-->\n" + " </th>\n" +
" <!--&lt;!&ndash;</label>&ndash;&gt;-->\n" + " <th ng-repeat=\"(key,value) in node.model track by $index\">{{ key }}</th>\n" +
" <!--&lt;!&ndash;</td>&ndash;&gt;-->\n" + " <th>İşlem</th>\n" +
" <!--&lt;!&ndash;<th scope=\"row\" style=\"text-align:center\">1</th>&ndash;&gt;-->\n" + " </tr>\n" +
" <!--<td ng-repeat=\"value in node.model\">{{ value }}</td>-->\n" + " </thead>\n" +
" <!--<td>-->\n" + " <tbody ng-class=\"{hidden: node.lengthModels < 1}\">\n" +
" <!--<button modal-for-nodes=\"{{node.schema.model_name}},{{node.schema.formType}},edit\">Düzenle</button><br>-->\n" +
" <!--<button>Sil</button>-->\n" +
" <!--</td>-->\n" +
" <!--</tr>-->\n" +
"\n" + "\n" +
" <!--<tr ng-repeat=\"listnodemodel in node.model\" ng-if=\"node.schema.formType=='ListNode'\">-->\n" + " <tr ng-if=\"node.schema.formType=='Node'\">\n" +
" <!--<td width=\"60\">-->\n" + " <!--<td width=\"60\">-->\n" +
" <!--<label>-->\n" + " <!--<label>-->\n" +
" <!--<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">-->\n" + " <!--<input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">-->\n" +
" <!--</label>-->\n" + " <!--</label>-->\n" +
" <!--</td>-->\n" + " <!--</td>-->\n" +
" <!--<th scope=\"row\" style=\"text-align:center\">{{$index+1}}</th>-->\n" + " <!--<th scope=\"row\" style=\"text-align:center\">1</th>-->\n" +
" <!--<td ng-repeat=\"(k, v) in listnodemodel\">{{ v }}</td>-->\n" + " <td ng-repeat=\"value in node.model track by $index\">{{ value }}</td>\n" +
" <!--<td>-->\n" + " <td>\n" +
" <!--<button modal-for-nodes=\"{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}\">Düzenle</button><br>-->\n" + " <button modal-for-nodes=\"{{node.schema.model_name}},{{node.schema.formType}},edit\">Düzenle</button><br>\n" +
" <!--<button>Sil</button>-->\n" + " <button>Sil</button>\n" +
" <!--</td>-->\n" + " </td>\n" +
" <!--</tr>-->\n" + " </tr>\n" +
"\n" +
" <tr ng-repeat=\"listnodemodel in node.items track by $index\" ng-if=\"node.schema.formType=='ListNode'\">\n" +
" <td width=\"60\">\n" +
" <label>\n" +
" <input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">\n" +
" </label>\n" +
" </td>\n" +
" <th scope=\"row\" style=\"text-align:center\">{{$index+1}}</th>\n" +
" <td ng-repeat=\"(k, v) in listnodemodel track by $index\">{{ v }}</td>\n" +
" <td>\n" +
" <button modal-for-nodes=\"{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}\">Düzenle</button><br>\n" +
" <button>Sil</button>\n" +
" </td>\n" +
" </tr>\n" +
"\n" + "\n" +
" <!--</tbody>-->\n" + " </tbody>\n" +
"<!--</table>-->\n" + "</table>\n" +
"</div>"); "</div>");
}]); }]);
......
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