Skip to content

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

#52 de belirtilen islemler gerceklestirildi test edilmeleri gerekli

parent 562f8061
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 47 deletions
app/app.css
View file @ e455cb3c
...@@ -1636,6 +1636,6 @@ table.dataTable thead .sorting:after { ...@@ -1636,6 +1636,6 @@ table.dataTable thead .sorting:after {
} }
/* end page transitions */ /* end page transitions */
.move-to-bottom, .move-to-top { .move-to-bottom, .move-to-top, .move-to-bottom-modal, .move-to-top-modal {
margin-right: 10px !important; margin-right: 10px !important;
} }
\ No newline at end of file
app/components/crud/crud_controller.js
View file @ e455cb3c
...@@ -260,4 +260,12 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -260,4 +260,12 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
scope.$emit('formLocator'); scope.$emit('formLocator');
} }
} }
})
.directive('crudFilters', function() {
return {
templateUrl: 'components/crud/templates/filter.html',
restrict: 'E',
replace: true
};
}); });
\ No newline at end of file
app/components/crud/templates/crud.html
View file @ e455cb3c
<crud-show-directive ng-if="object"></crud-show-directive> <div class="row">
<crud-form-directive ng-if="forms"></crud-form-directive> <div class="col-md-8">
<crud-list-directive ng-if="objects"></crud-list-directive> <crud-show-directive ng-if="object"></crud-show-directive>
\ No newline at end of file <crud-form-directive ng-if="forms"></crud-form-directive>
<crud-list-directive ng-if="objects"></crud-list-directive>
</div>
<crud-filters ng-if="meta.allow_filters === true" class="col-md-4"></crud-filters>
</div>
\ No newline at end of file
app/components/crud/templates/filter.html 0 → 100644
View file @ e455cb3c
<div>
<div class="right-sidebar-box">
<div class="right-sidebar-messages">
<div class="right-sidebar-title clearfix">
<h3>Filtre basligi</h3>
</div>
<div class="right-sidebar-message-block">
</div>
</div>
</div>
</div>
\ No newline at end of file
app/shared/templates/directives/search.html
View file @ e455cb3c
<form class="form-inline col-md-8" id="search" name="search" sf-schema="searchSchema" sf-form="searchForm" <form class="form-inline pull-right" id="search" name="search" sf-schema="searchSchema" sf-form="searchForm"
sf-model="searchModel" sf-model="searchModel"
ng-submit="searchSubmit(search)"></form> ng-submit="searchSubmit(search)"></form>
\ No newline at end of file
app/shared/templates/directives/sidebar.html
View file @ e455cb3c
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
</a> </a>
<ul class="nav nav-second-level" ng-class="{hidden: $root.collapsed}"> <ul class="nav nav-second-level" ng-class="{hidden: $root.collapsed}">
<li ng-repeat="(k, v) in item"> <li ng-repeat="(k, v) in item">
<a ng-if="v['baseCategory'] == 'other'" ng-href="#{{v.url}}" ng- <!--<a ng-if="v.model" ng-href="#{{v.url}}" ng- -->
ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a> <!--ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a>-->
<a ng-if="v['baseCategory'] == 'ogrenci' || v['baseCategory'] == 'personel'" <a ng-href="#/{{v.wf}}/{{v.model}}?{{v.param}}={{$root.selectedUser.key}}"
ng-href="#/{{v.wf}}/{{v.model}}?{{v.param}}={{$root.selectedUser.key}}"
ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a> ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a>
</li> </li>
</ul> </ul>
......
app/shared/templates/linkedModelModalContent.html
View file @ e455cb3c
<div class="modal-body"> <div class="modal-body">
<h3>{{schema.title}}</h3> <h3>{{schema.title}}</h3>
<form name="linkedModelForm" sf-schema="schema" sf-form="form" sf-model="model"></form> <div class="buttons-on-top-modal"></div>
<hr>
<form name="linkedModelForm" sf-schema="schema" sf-form="form" sf-model="model" modal-form-locator></form>
<hr>
<div class="buttons-on-bottom-modal"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary" ng-click="onSubmit(linkedModelForm)">OK</button>
<!--<button type="submit" class="btn btn-primary" ng-click="onSubmit(linkedModelForm)">OK</button>-->
<button type="button" class="btn btn-warning" ng-click="cancel()">Cancel</button> <button type="button" class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div> </div>
\ No newline at end of file
app/zetalib/form_service.js
View file @ e455cb3c
...@@ -132,11 +132,16 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -132,11 +132,16 @@ angular.module('formService', ['ui.bootstrap'])
if (v.type === 'submit' || v.type === 'button') { if (v.type === 'submit' || v.type === 'button') {
var buttonPositions = {bottom: 'move-to-bottom', top: 'move-to-top', none: ''}; var buttonPositions = scope.modalElements ? scope.modalElements.buttonPositions : {bottom: 'move-to-bottom', top: 'move-to-top', none: ''};
var workOnForm = scope.modalElements ? scope.modalElements.workOnForm : 'formgenerated';
var workOnDiv = scope.modalElements ? scope.modalElements.workOnDiv : '';
var buttonClass = (buttonPositions[v.position] || buttonPositions.bottom);
var redirectTo = scope.modalElements ? false : true;
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 " + (buttonPositions[v.position] || "move-to-bottom"), style: "btn-primary 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;
...@@ -148,20 +153,32 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -148,20 +153,32 @@ angular.module('formService', ['ui.bootstrap'])
} }
scope.model[k] = 1; scope.model[k] = 1;
// todo: test it // todo: test it
if (scope.modalElements) {
scope.submitModalForm();
} else {
scope.$broadcast('schemaFormValidate'); scope.$broadcast('schemaFormValidate');
if (scope.formgenerated.$valid) { if (scope[workOnForm].$valid) {
generator.submit(scope); generator.submit(scope, redirectTo);
scope.$broadcast('disposeModal');
}
} }
} }
}; };
// replace buttons according to their position values // replace buttons according to their position values
$timeout(function () { $timeout(function () {
var buttonsToBottom = angular.element(document.querySelector('.move-to-bottom')); var selectorBottom = '.buttons-on-bottom'+workOnDiv;
angular.element(document.querySelector('.buttons-on-bottom')).append(buttonsToBottom); //var selectorTop = '.buttons-on-top'+workOnDiv;
var buttonsToTop = angular.element(document.querySelector('.move-to-top'));
angular.element(document.querySelector('.buttons-on-bottom')).append(buttonsToTop); var buttonsToBottom = angular.element(document.querySelector('.' + buttonClass));
angular.element(document.querySelector(selectorBottom)).append(buttonsToBottom);
//var buttonsToTop = angular.element(document.querySelector('.' + buttonClass));
//angular.element(document.querySelector(selectorTop)).append(buttonsToTop);
$log.debug(selectorBottom, buttonsToBottom);
$log.debug(angular.element(document.querySelector(selectorBottom)));
buttonsToBottom.removeClass('hide'); buttonsToBottom.removeClass('hide');
buttonsToTop.removeClass('hide'); //buttonsToTop.removeClass('hide');
}); });
} }
...@@ -177,8 +194,13 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -177,8 +194,13 @@ angular.module('formService', ['ui.bootstrap'])
dateFormat: "dd.mm.yy", dateFormat: "dd.mm.yy",
onSelect: function (date, inst) { onSelect: function (date, inst) {
scope.model[k] = date; scope.model[k] = date;
if (scope.modalElements) {
scope.validateModalDate(k);
}
else {
scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true); scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
} }
}
}); });
}); });
} }
...@@ -210,6 +232,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -210,6 +232,7 @@ angular.module('formService', ['ui.bootstrap'])
add_cmd: v.add_cmd, add_cmd: v.add_cmd,
name: v.model_name, name: v.model_name,
model_name: v.model_name, model_name: v.model_name,
selected_item: {},
titleMap: generator.get_list(modelscope).then(function (res) { titleMap: generator.get_list(modelscope).then(function (res) {
formitem.titleMap = []; formitem.titleMap = [];
angular.forEach(res.data.objects, function (item) { angular.forEach(res.data.objects, function (item) {
...@@ -220,12 +243,14 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -220,12 +243,14 @@ 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]) {formitem.selected_item = {value: item.key, name: item.value};} if (item.key === scope.model[k]) {
formitem.selected_item = {value: item.key, name: item.value};
}
}); });
// after rendering change input value to model value // after rendering change input value to model value
scope.$watch(document.querySelector('input[name='+ v.model_name+']'), scope.$watch(document.querySelector('input[name=' + v.model_name + ']'),
function(){ function () {
angular.element(document.querySelector('input[name='+ v.model_name+']')).val(formitem.selected_item.name); angular.element(document.querySelector('input[name=' + v.model_name + ']')).val(formitem.selected_item.name);
} }
); );
}), }),
...@@ -312,7 +337,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -312,7 +337,7 @@ angular.module('formService', ['ui.bootstrap'])
// tab without modal. 'modal' will use modal to manipulate data and do all actions in that modal. 'new' // tab without modal. 'modal' will use modal to manipulate data and do all actions in that modal. 'new'
// will be open new page with response data // will be open new page with response data
var _do = { var _do = {
normal: function(){ normal: function () {
$log.debug('normal mode starts'); $log.debug('normal mode starts');
$scope.form_params.cmd = cmd; $scope.form_params.cmd = cmd;
$scope.form_params.object_id = key; $scope.form_params.object_id = key;
...@@ -321,8 +346,12 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -321,8 +346,12 @@ angular.module('formService', ['ui.bootstrap'])
$scope.form_params.token = $scope.token; $scope.form_params.token = $scope.token;
return generator.get_wf($scope); return generator.get_wf($scope);
}, },
modal: function(){$log.debug('modal mode is not not ready');}, modal: function () {
new: function(){$log.debug('new mode is not not ready');} $log.debug('modal mode is not not ready');
},
new: function () {
$log.debug('new mode is not not ready');
}
}; };
return _do[mode](); return _do[mode]();
}; };
...@@ -356,7 +385,16 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -356,7 +385,16 @@ angular.module('formService', ['ui.bootstrap'])
return $http return $http
.post(generator.makeUrl(scope), scope.form_params) .post(generator.makeUrl(scope), scope.form_params)
.then(function (res) { .then(function (res) {
if (res.data.client_cmd) {
return generator.pathDecider(res.data.client_cmd, scope, res.data); return generator.pathDecider(res.data.client_cmd, scope, res.data);
}
if (res.data.msgbox) {
scope.msgbox = res.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);
}
}); });
}; };
generator.isValidEmail = function (email) { generator.isValidEmail = function (email) {
...@@ -414,7 +452,10 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -414,7 +452,10 @@ angular.module('formService', ['ui.bootstrap'])
* @param data * @param data
*/ */
generator.pathDecider = function (client_cmd, $scope, data) { generator.pathDecider = function (client_cmd, $scope, data) {
if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') {$rootScope.$broadcast('reload_cmd', client_cmd[0]); return;} if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') {
$rootScope.$broadcast('reload_cmd', client_cmd[0]);
return;
}
/** /**
* @name redirectTo * @name redirectTo
* @description * @description
...@@ -479,7 +520,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -479,7 +520,7 @@ angular.module('formService', ['ui.bootstrap'])
* @param $scope * @param $scope
* @returns {*} * @returns {*}
*/ */
generator.submit = function ($scope) { generator.submit = function ($scope, redirectTo) {
// 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) {
...@@ -499,6 +540,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -499,6 +540,7 @@ angular.module('formService', ['ui.bootstrap'])
return $http.post(generator.makeUrl($scope), data) return $http.post(generator.makeUrl($scope), data)
.success(function (data) { .success(function (data) {
if (redirectTo === true) {
if (data.client_cmd) { if (data.client_cmd) {
generator.pathDecider(data.client_cmd, $scope, data); generator.pathDecider(data.client_cmd, $scope, data);
} }
...@@ -509,6 +551,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -509,6 +551,7 @@ angular.module('formService', ['ui.bootstrap'])
angular.element(document.querySelector('.main.ng-scope')).children().remove(); angular.element(document.querySelector('.main.ng-scope')).children().remove();
angular.element(document.querySelector('.main.ng-scope')).append(newElement); angular.element(document.querySelector('.main.ng-scope')).append(newElement);
} }
}
}); });
}; };
return generator; return generator;
...@@ -528,7 +571,21 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -528,7 +571,21 @@ angular.module('formService', ['ui.bootstrap'])
$scope[key] = items[key]; $scope[key] = items[key];
}); });
Generator.prepareFormItems($scope); $scope.$on('disposeModal', function () {
$scope.cancel();
});
$scope.$on('modalFormLocator', function (event) {
$scope.linkedModelForm = event.targetScope.linkedModelForm;
});
$scope.$on('submitModalForm', function () {
$scope.onSubmit($scope.linkedModelForm);
});
$scope.$on('validateModalDate', function (event, field) {
$scope.$broadcast('schemaForm.error.' + field, 'tv4-302', true);
});
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate'); $scope.$broadcast('schemaFormValidate');
...@@ -613,12 +670,13 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -613,12 +670,13 @@ angular.module('formService', ['ui.bootstrap'])
* @returns openmodal directive * @returns openmodal directive
*/ */
.directive('addModalForLinkedModel', function ($modal, $route, Generator) { .directive('addModalForLinkedModel', function ($modal, $rootScope, $route, Generator) {
return { return {
link: function (scope, element) { link: function (scope, element) {
element.on('click', function () { element.on('click', function () {
var modalInstance = $modal.open({ var modalInstance = $modal.open({
animation: false, animation: true,
backdrop:'static',
templateUrl: 'shared/templates/linkedModelModalContent.html', templateUrl: 'shared/templates/linkedModelModalContent.html',
controller: 'ModalCtrl', controller: 'ModalCtrl',
size: 'lg', size: 'lg',
...@@ -626,21 +684,40 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -626,21 +684,40 @@ angular.module('formService', ['ui.bootstrap'])
items: function () { items: function () {
return Generator.get_form({ return Generator.get_form({
url: scope.form.wf, url: scope.form.wf,
form_params: {model: scope.form.model_name, cmd: scope.form.add_cmd} form_params: {model: scope.form.model_name, cmd: scope.form.add_cmd},
modalElements: {
buttonPositions: {bottom: 'move-to-bottom-modal', top: 'move-to-top-modal', none: ''},
workOnForm: 'linkedModelForm',
workOnDiv: '-modal'
},
submitModalForm: function () {
$rootScope.$broadcast('submitModalForm');
},
validateModalDate: function (field) {
$rootScope.$broadcast('validateModalDate', field);
}
}); });
} }
} }
}); });
modalInstance.result.then(function (childscope, key) { modalInstance.result.then(function (childscope, key) {
Generator.submit(childscope); Generator.submit(childscope, false);
$route.reload(); //$route.reload();
}); });
}); });
} }
}; };
}) })
.directive('modalFormLocator', function () {
return {
link: function (scope) {
scope.$emit('modalFormLocator');
}
}
})
/** /**
* @name editModalForLinkedModel * @name editModalForLinkedModel
* @description * @description
......
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