Commit 48409879 authored by Evren Kutar's avatar Evren Kutar

resolves #55

parent 36a4c94b
...@@ -145,7 +145,7 @@ module.exports = function (grunt) { ...@@ -145,7 +145,7 @@ module.exports = function (grunt) {
"app/bower_components/angular-loading-bar/build/loading-bar.js", "app/bower_components/angular-loading-bar/build/loading-bar.js",
"app/bower_components/metisMenu/dist/metisMenu.js", "app/bower_components/metisMenu/dist/metisMenu.js",
"app/bower_components/Chart.js/Chart.js", "app/bower_components/Chart.js/Chart.js",
//"app/shared/scripts/jquery-ui.min.js" "app/bower_components/intro.js/intro.js"
], ],
dest: 'dist/bower_components/components.js' dest: 'dist/bower_components/components.js'
}, },
...@@ -157,7 +157,9 @@ module.exports = function (grunt) { ...@@ -157,7 +157,9 @@ module.exports = function (grunt) {
"app/app.css", "app/app.css",
"app/bower_components/metisMenu/dist/metisMenu.min.css", "app/bower_components/metisMenu/dist/metisMenu.min.css",
"app/bower_components/angular-loading-bar/build/loading-bar.min.css", "app/bower_components/angular-loading-bar/build/loading-bar.min.css",
"app/bower_components/font-awesome/css/font-awesome.min.css" "app/bower_components/font-awesome/css/font-awesome.min.css",
"app/bower_components/intro.js/intro.css",
"app/bower_components/intro.js/themes/introjs-nassim.css"
] ]
} }
}, },
...@@ -193,17 +195,21 @@ module.exports = function (grunt) { ...@@ -193,17 +195,21 @@ module.exports = function (grunt) {
"app/bower_components/json3/lib/json3.min.js", "app/bower_components/json3/lib/json3.min.js",
"app/bower_components/angular-loading-bar/build/loading-bar.min.js", "app/bower_components/angular-loading-bar/build/loading-bar.min.js",
"app/bower_components/metisMenu/dist/metisMenu.min.js", "app/bower_components/metisMenu/dist/metisMenu.min.js",
"app/bower_components/Chart.js/Chart.min.js" "app/bower_components/Chart.js/Chart.min.js",
"app/bower_components/intro.js/minified/intro.min.js"
], ],
dest: 'dist/<%= grunt.branchname %>/bower_components/components.js' dest: 'dist/<%= grunt.branchname %>/bower_components/components.js'
}, },
css_branch: { css_branch: {
src: [ src: [
"app/bower_components/angular-bootstrap/ui-bootstrap-csp.css",
"app/bower_components/bootstrap/dist/css/bootstrap.min.css", "app/bower_components/bootstrap/dist/css/bootstrap.min.css",
"app/app.css", "app/app.css",
"app/bower_components/metisMenu/dist/metisMenu.min.css", "app/bower_components/metisMenu/dist/metisMenu.min.css",
"app/bower_components/angular-loading-bar/build/loading-bar.min.css", "app/bower_components/angular-loading-bar/build/loading-bar.min.css",
"app/bower_components/font-awesome/css/font-awesome.min.css" "app/bower_components/font-awesome/css/font-awesome.min.css",
"app/bower_components/intro.js/minified/intro.min.css",
"app/bower_components/intro.js/themes/introjs-nassim.css"
], ],
dest: 'dist/<%= grunt.branchname %>/css/app.css' dest: 'dist/<%= grunt.branchname %>/css/app.css'
} }
......
...@@ -150,6 +150,16 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -150,6 +150,16 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
} }
}; };
$scope.filter = {};
$scope.addToFilter = function (field, filterValue) {
};
$scope.filterSubmit = function () {
};
$scope.do_action = function (key, cmd, mode) { $scope.do_action = function (key, cmd, mode) {
Generator.doItemAction($scope, key, cmd, mode || 'normal'); Generator.doItemAction($scope, key, cmd, mode || 'normal');
}; };
......
<div> <div>
<h2>Filtrele</h2> <h2>Filtrele</h2>
<div class="right-sidebar-box"> <div ng-repeat="filter in list_filters">
<div class="right-sidebar-messages"> <div>
<div class="right-sidebar-title clearfix"> <div class=" clearfix">
<h3>Tarİh Aralığı</h3> <h3>{{filter.verbose_name}}</h3>
</div> </div>
<div class="right-sidebar-message-block">
<div ng-if="filter.type==='check' || !filter.type">
<div class="checkbox" ng-repeat="filterItem in filter.values">
<input type="checkbox" name="filter_group[]" value="{{filterItem.value}}"/>{{filterItem.name}}<br />
</div>
</div>
<div ng-if="filter.type==='select'">
<div class="col-md-12">
<select name="filterSelect" id="filterSelect" class="form-control">
<option ng-repeat="filterItem in filter.values" value="{{filterItem.value}}">{{filterItem.name}}</option>
</select>
</div>
</div>
<div ng-if="filter.type==='date'">
<div class="col-md-6"> <div class="col-md-6">
<br> <br>
<label class="control-label" for="startDate">Başlangıç</label> <label class="control-label" for="startDate">Başlangıç</label>
...@@ -22,30 +37,7 @@ ...@@ -22,30 +37,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="right-sidebar-box">
<div class="right-sidebar-messages">
<div class="right-sidebar-title clearfix">
<br><br>
<h3>Fİltre başlığı</h3>
</div>
<div class="right-sidebar-message-block">
<div class="col-md-12">
<br>
<label class="control-label" for="filterSelect">Seçim</label>
<select name="filterSelect" id="filterSelect">
<option value="1">opsiyon 1</option>
<option value="2">opsiyon 2</option>
<option value="3">opsiyon 3</option>
<option value="4">opsiyon 4</option>
</select>
</div>
</div>
</div>
</div>
<div class="clearfix"></div>
<div style="margin-top: 40px;"> <div style="margin-top: 40px;">
<button type="button" class="btn btn-primary">Filtrele</button> <button type="button" class="btn btn-warning" ng-click="filterSubmit()">Filtrele</button>
</div> </div>
</div> </div>
\ No newline at end of file
<div class="starter-template container"> <div class="starter-template">
<sort-directive ng-if="meta['allow_sort']===true"></sort-directive> <sort-directive ng-if="meta['allow_sort']===true"></sort-directive>
<search-directive ng-if="meta['allow_search']===true"></search-directive> <search-directive ng-if="meta['allow_search']===true"></search-directive>
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<thead> <thead>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<label> <label ng-if="meta.allow_selection === true">
<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>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<tbody> <tbody>
<tr ng-repeat="object in objects" ng-if="$index>0"> <tr ng-repeat="object in objects" ng-if="$index>0">
<td width="60"> <td width="60">
<label> <label ng-if="meta.allow_selection === true">
<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>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</td> </td>
<td> <td>
<button class="btn btn-primary" style="margin-right: 5px;" ng-repeat="action in object.actions" <button class="btn btn-info" style="margin-right: 5px;" ng-repeat="action in object.actions"
ng-if="action.show_as==='button'" ng-if="action.show_as==='button'"
ng-click="do_action(object.key, action.cmd, action.mode)">{{action ng-click="do_action(object.key, action.cmd, action.mode)">{{action
.name}} .name}}
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<hr/> <hr/>
<div class="btn-group" ng-if="objects[1]"> <div class="btn-group" ng-if="objects[1]">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
İşlemler <span class="caret"></span> İşlemler <span class="caret"></span>
</button> </button>
......
...@@ -86,7 +86,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -86,7 +86,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
restrict: 'E', restrict: 'E',
replace: true, replace: true,
link: function ($scope) { link: function ($scope) {
$scope.searchForm = [{key: 'searchbox', htmlClass: "pull-left"}, {type: "submit", title: "Ara", htmlClass: "pull-left"}]; $scope.searchForm = [{key: 'searchbox', htmlClass: "pull-left"}, {type: "submit", title: "Ara", style:"btn-info", htmlClass: "pull-left"}];
$scope.searchSchema = { $scope.searchSchema = {
type: "object", type: "object",
properties: { properties: {
......
<div class="modal-body"> <div class="modal-body" style="overflow: auto;">
<h3>{{schema.title}}</h3> <h3>{{schema.title}}</h3>
<div class="buttons-on-top-modal"></div> <div class="buttons-on-top-modal{{formName}}"></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"> <div ng-repeat="node in Node">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<hr> <hr>
</div> </div>
<hr> <hr>
<div class="buttons-on-bottom-modal"></div> <div class="buttons-on-bottom-modal{{formName}}"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
</tr> </tr>
<tr ng-if="node.schema.formType=='ListNode'"> <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 track by $index">{{ key }}</th> <th ng-repeat="(key,value) in node.items track by $index" ng-if="key!=='idx' && $index === 0">{{ value.verbose_name }}</th>
<th>İşlem</th> <th>İşlem</th>
</tr> </tr>
</thead> </thead>
...@@ -34,21 +34,21 @@ ...@@ -34,21 +34,21 @@
<td ng-repeat="value in node.model track by $index">{{ value }}</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">Düzenle</button><br> <button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit">Düzenle</button><br>
<button>Sil</button> <button ng-click="remove(node)">Sil</button>
</td> </td>
</tr> </tr>
<tr ng-repeat="listnodemodel in node.items track by $index" ng-if="node.schema.formType=='ListNode'"> <tr ng-repeat="listnodemodel in node.items track by $index" 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">{{$index+1}}</th>
<td ng-repeat="(k, v) in listnodemodel track by $index">{{ v }}</td> <td ng-repeat="(k, v) in listnodemodel track by $index" ng-if="k!=='idx'">{{ v.unicode }}</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,{{$index}}">Düzenle</button><br>
<button>Sil</button> <button ng-click="remove(listnodemodel)">Sil</button>
</td> </td>
</tr> </tr>
......
...@@ -140,7 +140,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -140,7 +140,7 @@ angular.module('formService', ['ui.bootstrap'])
scope.form[scope.form.indexOf(k)] = { scope.form[scope.form.indexOf(k)] = {
type: v.type, type: v.type,
title: v.title, title: v.title,
style: "btn-primary hide " + buttonClass, style: "btn-danger hide " + buttonClass,
onClick: function () { onClick: function () {
delete scope.form_params.cmd; delete scope.form_params.cmd;
delete scope.form_params.flow; delete scope.form_params.flow;
...@@ -179,7 +179,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -179,7 +179,7 @@ angular.module('formService', ['ui.bootstrap'])
buttonsToBottom.removeClass('hide'); buttonsToBottom.removeClass('hide');
//buttonsToTop.removeClass('hide'); //buttonsToTop.removeClass('hide');
}); }, 500);
} }
// check if type is date and if type date found change it to string // check if type is date and if type date found change it to string
...@@ -216,11 +216,11 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -216,11 +216,11 @@ angular.module('formService', ['ui.bootstrap'])
scope.model[k] = date; scope.model[k] = date;
if (scope.modalElements) { if (scope.modalElements) {
scope.validateModalDate(k); scope.validateModalDate(k);
scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
} }
scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
} }
}); });
}); }, 1000);
} }
if (v.type === 'int' || v.type === 'float') { if (v.type === 'int' || v.type === 'float') {
...@@ -257,7 +257,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -257,7 +257,7 @@ angular.module('formService', ['ui.bootstrap'])
}); });
} }
// get selected item from titleMap using model value // get selected item from titleMap using model value
if (item.key === scope.model[k]) { if (item.key===scope.model[k]) {
formitem.selected_item = {value: item.key, name: item.value}; formitem.selected_item = {value: item.key, name: item.value};
} }
}); });
...@@ -270,6 +270,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -270,6 +270,7 @@ angular.module('formService', ['ui.bootstrap'])
); );
} }
catch (e) { catch (e) {
angular.element(document.querySelector('input[name=' + v.model_name + ']')).val(formitem.selected_item.name);
$log.debug('exception', e); $log.debug('exception', e);
} }
...@@ -390,6 +391,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -390,6 +391,7 @@ angular.module('formService', ['ui.bootstrap'])
} }
if ((v.type === 'ListNode' || v.type === 'Node') && v.widget !== 'filter_interface') { if ((v.type === 'ListNode' || v.type === 'Node') && v.widget !== 'filter_interface') {
//if (v.type === 'ListNode' || v.type === 'Node') {
scope[v.type] = scope[v.type] || {}; scope[v.type] = scope[v.type] || {};
...@@ -409,7 +411,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -409,7 +411,7 @@ angular.module('formService', ['ui.bootstrap'])
}); });
if (v.type === 'ListNode') { if (v.type === 'ListNode') {
scope[v.type][k].items = []; scope[v.type][k].items = angular.copy(scope.model[k] || []);
} }
angular.forEach(v.schema, function (item) { angular.forEach(v.schema, function (item) {
...@@ -421,13 +423,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -421,13 +423,7 @@ angular.module('formService', ['ui.bootstrap'])
} }
// idx field must be hidden // idx field must be hidden
if (item.name === 'idx') { if (item.name !== 'idx') {
scope[v.type][k].form.push({
type: 'string',
key: angular.copy(item.name),
htmlClass: 'hidden'
});
} else {
scope[v.type][k].form.push(item.name); scope[v.type][k].form.push(item.name);
} }
...@@ -437,7 +433,19 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -437,7 +433,19 @@ angular.module('formService', ['ui.bootstrap'])
}); });
scope[v.type][k].model = angular.copy(scope.model[k]) || {}; 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 // 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; scope[v.type][k]['lengthModels'] = scope.model[k] ? 1 : 0;
...@@ -672,7 +680,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -672,7 +680,7 @@ angular.module('formService', ['ui.bootstrap'])
// todo: diff for all submits to recognize form change. if no change returns to view with no submit // todo: diff for all submits to recognize form change. if no change returns to view with no submit
angular.forEach($scope.ListNode, function (value, key) { angular.forEach($scope.ListNode, function (value, key) {
$scope.model[key] = value.items; $scope.model[key] = value.model;
}); });
angular.forEach($scope.Node, function (value, key) { angular.forEach($scope.Node, function (value, key) {
$scope.model[key] = value.model; $scope.model[key] = value.model;
...@@ -683,9 +691,12 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -683,9 +691,12 @@ angular.module('formService', ['ui.bootstrap'])
"model": $scope.form_params.model, "model": $scope.form_params.model,
"cmd": $scope.form_params.cmd, "cmd": $scope.form_params.cmd,
"flow": $scope.form_params.flow, "flow": $scope.form_params.flow,
"object_id": $scope.object_id "object_id": $scope.object_id,
"filter": $scope.filter
}; };
debugger;
return $http.post(generator.makeUrl($scope), data) return $http.post(generator.makeUrl($scope), data)
.success(function (data) { .success(function (data) {
if (redirectTo === true) { if (redirectTo === true) {
...@@ -738,10 +749,8 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -738,10 +749,8 @@ angular.module('formService', ['ui.bootstrap'])
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate'); $scope.$broadcast('schemaFormValidate');
if (form.$valid) { if (form.$valid) {
// send form to modalinstance result function // send form to modalinstance result function
$uibModalInstance.close($scope); $uibModalInstance.close($scope);
} }
}; };
...@@ -772,6 +781,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -772,6 +781,7 @@ angular.module('formService', ['ui.bootstrap'])
var modalInstance = $uibModal.open({ var modalInstance = $uibModal.open({
animation: true, animation: true,
backdrop: 'static', backdrop: 'static',
keyboard: false,
templateUrl: 'shared/templates/listnodeModalContent.html', templateUrl: 'shared/templates/listnodeModalContent.html',
controller: 'ModalCtrl', controller: 'ModalCtrl',
size: 'lg', size: 'lg',
...@@ -802,10 +812,13 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -802,10 +812,13 @@ angular.module('formService', ['ui.bootstrap'])
var newscope = { var newscope = {
url: scope.node.url, url: scope.node.url,
form_params: {model: scope.node.schema.model_name} form_params: {model: scope.node.schema.model_name},
edit: attribs[3]
}; };
Generator.generate(newscope, {forms: scope.node}); Generator.generate(newscope, {forms: scope.node});
// modal will add only one item to listNode, so just need one model (not array)
newscope.model = angular.copy(newscope.model[node.edit] || newscope.model[0] || {});
return newscope; return newscope;
} }
} }
...@@ -820,10 +833,25 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -820,10 +833,25 @@ angular.module('formService', ['ui.bootstrap'])
} }
if (childmodel.schema.formType === 'ListNode') { if (childmodel.schema.formType === 'ListNode') {
// reformat listnode model
var reformattedModel = {};
angular.forEach(childmodel.model, function (value, key) {
if (key.indexOf('_id') > -1) {
angular.forEach(childmodel.form, function (v, k) {
if (v.formName === key) {
//if (!childmodel.model[key].key) {
function indexInTitleMap(element,index,array){if(element['value']===value){return element;}}
reformattedModel[key] = {"key": value, "unicode": v.titleMap.find(indexInTitleMap).name};
//}
}
});
}
});
if (childmodel.edit) { if (childmodel.edit) {
listNodeItem.model[childmodel.edit] = childmodel.model; listNodeItem.model[childmodel.edit] = childmodel.model;
} else { } else {
listNodeItem.items.push(angular.copy(childmodel.model)); listNodeItem.model.push(angular.copy(childmodel.model));
listNodeItem.items.push(reformattedModel);
} }
listNodeItem.lengthModels += 1; listNodeItem.lengthModels += 1;
} }
...@@ -849,6 +877,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -849,6 +877,7 @@ angular.module('formService', ['ui.bootstrap'])
var modalInstance = $uibModal.open({ var modalInstance = $uibModal.open({
animation: true, animation: true,
backdrop: 'static', backdrop: 'static',
keyboard: false,
templateUrl: 'shared/templates/linkedModelModalContent.html', templateUrl: 'shared/templates/linkedModelModalContent.html',
controller: 'ModalCtrl', controller: 'ModalCtrl',
size: 'lg', size: 'lg',
...@@ -866,7 +895,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -866,7 +895,7 @@ angular.module('formService', ['ui.bootstrap'])
none: '' none: ''
}, },
workOnForm: 'linkedModelForm', workOnForm: 'linkedModelForm',
workOnDiv: '-modal' workOnDiv: '-modal'+formName
}, },
submitModalForm: function () { submitModalForm: function () {
$rootScope.$broadcast('submitModalForm'); $rootScope.$broadcast('submitModalForm');
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -36,12 +36,27 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache ...@@ -36,12 +36,27 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
$templateCache.put("components/crud/templates/filter.html", $templateCache.put("components/crud/templates/filter.html",
"<div>\n" + "<div>\n" +
" <h2>Filtrele</h2>\n" + " <h2>Filtrele</h2>\n" +
" <div class=\"right-sidebar-box\">\n" + " <div ng-repeat=\"filter in list_filters\">\n" +
" <div class=\"right-sidebar-messages\">\n" + " <div>\n" +
" <div class=\"right-sidebar-title clearfix\">\n" + " <div class=\" clearfix\">\n" +
" <h3>Tarİh Aralığı</h3>\n" + " <h3>{{filter.verbose_name}}</h3>\n" +
" </div>\n" +
"\n" +
" <div ng-if=\"filter.type==='check' || !filter.type\">\n" +
" <div class=\"checkbox\" ng-repeat=\"filterItem in filter.values\">\n" +
" <input type=\"checkbox\" name=\"filter_group[]\" value=\"{{filterItem.value}}\"/>{{filterItem.name}}<br />\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <div ng-if=\"filter.type==='select'\">\n" +
" <div class=\"col-md-12\">\n" +
" <select name=\"filterSelect\" id=\"filterSelect\" class=\"form-control\">\n" +
" <option ng-repeat=\"filterItem in filter.values\" value=\"{{filterItem.value}}\">{{filterItem.name}}</option>\n" +
" </select>\n" +
" </div>\n" +
" </div>\n" + " </div>\n" +
" <div class=\"right-sidebar-message-block\">\n" + "\n" +
" <div ng-if=\"filter.type==='date'\">\n" +
" <div class=\"col-md-6\">\n" + " <div class=\"col-md-6\">\n" +
" <br>\n" + " <br>\n" +
" <label class=\"control-label\" for=\"startDate\">Başlangıç</label>\n" + " <label class=\"control-label\" for=\"startDate\">Başlangıç</label>\n" +
...@@ -58,31 +73,8 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache ...@@ -58,31 +73,8 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
"\n" + "\n" +
" <div class=\"clearfix\"></div>\n" + " <div class=\"clearfix\"></div>\n" +
"\n" + "\n" +
" <div class=\"right-sidebar-box\">\n" +
" <div class=\"right-sidebar-messages\">\n" +
" <div class=\"right-sidebar-title clearfix\">\n" +
" <br><br>\n" +
" <h3>Fİltre başlığı</h3>\n" +
" </div>\n" +
" <div class=\"right-sidebar-message-block\">\n" +
" <div class=\"col-md-12\">\n" +
" <br>\n" +
" <label class=\"control-label\" for=\"filterSelect\">Seçim</label>\n" +
" <select name=\"filterSelect\" id=\"filterSelect\">\n" +
" <option value=\"1\">opsiyon 1</option>\n" +
" <option value=\"2\">opsiyon 2</option>\n" +
" <option value=\"3\">opsiyon 3</option>\n" +
" <option value=\"4\">opsiyon 4</option>\n" +
" </select>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <div class=\"clearfix\"></div>\n" +
"\n" +
" <div style=\"margin-top: 40px;\">\n" + " <div style=\"margin-top: 40px;\">\n" +
" <button type=\"button\" class=\"btn btn-primary\">Filtrele</button>\n" + " <button type=\"button\" class=\"btn btn-warning\" ng-click=\"filterSubmit()\">Filtrele</button>\n" +
" </div>\n" + " </div>\n" +
"</div>"); "</div>");
}]); }]);
...@@ -133,7 +125,7 @@ angular.module("components/crud/templates/form.html", []).run(["$templateCache", ...@@ -133,7 +125,7 @@ angular.module("components/crud/templates/form.html", []).run(["$templateCache",
angular.module("components/crud/templates/list.html", []).run(["$templateCache", function($templateCache) { angular.module("components/crud/templates/list.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/list.html", $templateCache.put("components/crud/templates/list.html",
"<div class=\"starter-template container\">\n" + "<div class=\"starter-template\">\n" +
" <sort-directive ng-if=\"meta['allow_sort']===true\"></sort-directive>\n" + " <sort-directive ng-if=\"meta['allow_sort']===true\"></sort-directive>\n" +
" <search-directive ng-if=\"meta['allow_search']===true\"></search-directive>\n" + " <search-directive ng-if=\"meta['allow_search']===true\"></search-directive>\n" +
" <div class=\"clearfix\"></div>\n" + " <div class=\"clearfix\"></div>\n" +
...@@ -148,7 +140,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache", ...@@ -148,7 +140,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" <thead>\n" + " <thead>\n" +
" <tr>\n" + " <tr>\n" +
" <td colspan=\"2\">\n" + " <td colspan=\"2\">\n" +
" <label>\n" + " <label ng-if=\"meta.allow_selection === true\">\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" +
...@@ -161,7 +153,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache", ...@@ -161,7 +153,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" <tbody>\n" + " <tbody>\n" +
" <tr ng-repeat=\"object in objects\" ng-if=\"$index>0\">\n" + " <tr ng-repeat=\"object in objects\" ng-if=\"$index>0\">\n" +
" <td width=\"60\">\n" + " <td width=\"60\">\n" +
" <label>\n" + " <label ng-if=\"meta.allow_selection === true\">\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" +
...@@ -175,7 +167,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache", ...@@ -175,7 +167,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" </td>\n" + " </td>\n" +
"\n" + "\n" +
" <td>\n" + " <td>\n" +
" <button class=\"btn btn-primary\" style=\"margin-right: 5px;\" ng-repeat=\"action in object.actions\"\n" + " <button class=\"btn btn-info\" style=\"margin-right: 5px;\" ng-repeat=\"action in object.actions\"\n" +
" ng-if=\"action.show_as==='button'\"\n" + " ng-if=\"action.show_as==='button'\"\n" +
" ng-click=\"do_action(object.key, action.cmd, action.mode)\">{{action\n" + " ng-click=\"do_action(object.key, action.cmd, action.mode)\">{{action\n" +
" .name}}\n" + " .name}}\n" +
...@@ -190,7 +182,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache", ...@@ -190,7 +182,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" <hr/>\n" + " <hr/>\n" +
"\n" + "\n" +
" <div class=\"btn-group\" ng-if=\"objects[1]\">\n" + " <div class=\"btn-group\" ng-if=\"objects[1]\">\n" +
" <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\"\n" + " <button type=\"button\" class=\"btn btn-info dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\"\n" +
" aria-expanded=\"false\">\n" + " aria-expanded=\"false\">\n" +
" İşlemler <span class=\"caret\"></span>\n" + " İşlemler <span class=\"caret\"></span>\n" +
" </button>\n" + " </button>\n" +
...@@ -1511,9 +1503,9 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu ...@@ -1511,9 +1503,9 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu
angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templateCache", function($templateCache) { angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("shared/templates/linkedModelModalContent.html", $templateCache.put("shared/templates/linkedModelModalContent.html",
"<div class=\"modal-body\">\n" + "<div class=\"modal-body\" style=\"overflow: auto;\">\n" +
" <h3>{{schema.title}}</h3>\n" + " <h3>{{schema.title}}</h3>\n" +
" <div class=\"buttons-on-top-modal\"></div>\n" + " <div class=\"buttons-on-top-modal{{formName}}\"></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" + " <div ng-repeat=\"node in Node\">\n" +
...@@ -1545,7 +1537,7 @@ angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templ ...@@ -1545,7 +1537,7 @@ angular.module("shared/templates/linkedModelModalContent.html", []).run(["$templ
" <hr>\n" + " <hr>\n" +
" </div>\n" + " </div>\n" +
" <hr>\n" + " <hr>\n" +
" <div class=\"buttons-on-bottom-modal\"></div>\n" + " <div class=\"buttons-on-bottom-modal{{formName}}\"></div>\n" +
"</div>\n" + "</div>\n" +
"<div class=\"modal-footer\">\n" + "<div class=\"modal-footer\">\n" +
"\n" + "\n" +
...@@ -1652,12 +1644,12 @@ angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", fun ...@@ -1652,12 +1644,12 @@ angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", fun
" </tr>\n" + " </tr>\n" +
" <tr ng-if=\"node.schema.formType=='ListNode'\">\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 track by $index\">{{ key }}</th>\n" + " <th ng-repeat=\"(key,value) in node.items track by $index\" ng-if=\"key!=='idx' && $index === 0\">{{ value.verbose_name }}</th>\n" +
" <th>İşlem</th>\n" + " <th>İşlem</th>\n" +
" </tr>\n" + " </tr>\n" +
" </thead>\n" + " </thead>\n" +
...@@ -1673,21 +1665,21 @@ angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", fun ...@@ -1673,21 +1665,21 @@ angular.module("shared/templates/nodeTable.html", []).run(["$templateCache", fun
" <td ng-repeat=\"value in node.model track by $index\">{{ value }}</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\">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 ng-click=\"remove(node)\">Sil</button>\n" +
" </td>\n" + " </td>\n" +
" </tr>\n" + " </tr>\n" +
"\n" + "\n" +
" <tr ng-repeat=\"listnodemodel in node.items track by $index\" ng-if=\"node.schema.formType=='ListNode'\">\n" + " <tr ng-repeat=\"listnodemodel in node.items track by $index\" ng-if=\"node.schema.formType=='ListNode'\">\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\">{{$index+1}}</th>\n" +
" <td ng-repeat=\"(k, v) in listnodemodel track by $index\">{{ v }}</td>\n" + " <td ng-repeat=\"(k, v) in listnodemodel track by $index\" ng-if=\"k!=='idx'\">{{ v.unicode }}</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,{{$index}}\">Düzenle</button><br>\n" +
" <button>Sil</button>\n" + " <button ng-click=\"remove(listnodemodel)\">Sil</button>\n" +
" </td>\n" + " </td>\n" +
" </tr>\n" + " </tr>\n" +
"\n" + "\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