Commit 5d257b00 authored by Evren Kutar's avatar Evren Kutar

datetime field and pagination condition

parent babb90b8
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</ul> </ul>
</div> </div>
<nav ng-if="pagination" class="text-center"> <nav ng-if="pagination && pagination.total_pages > 1" class="text-center">
<ul class="pagination"> <ul class="pagination">
<li ng-class="{disabled:pagination.page===1}"> <li ng-class="{disabled:pagination.page===1}">
<a href="javascript:void(0)" aria-label="Önceki" ng-click="reload({page:pagination.page-1})"> <a href="javascript:void(0)" aria-label="Önceki" ng-click="reload({page:pagination.page-1})">
......
...@@ -193,7 +193,8 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -193,7 +193,8 @@ angular.module('formService', ['ui.bootstrap'])
'dateNotValid': function (value) { 'dateNotValid': function (value) {
var deferred = $q.defer(); var deferred = $q.defer();
$timeout(function () { $timeout(function () {
if (isNaN(Date.parse(value)) || value.split('.').length !== 3) { var dateValue = d = value.split('.');
if (isNaN(Date.parse([d[1],d[0],d[2]].join('.'))) || dateValue.length !== 3) {
deferred.reject(); deferred.reject();
} else { } else {
deferred.resolve(); deferred.resolve();
...@@ -216,10 +217,8 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -216,10 +217,8 @@ angular.module('formService', ['ui.bootstrap'])
if (scope.modalElements) { if (scope.modalElements) {
scope.validateModalDate(k); scope.validateModalDate(k);
} }
else {
scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true); scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
} }
}
}); });
}); });
} }
...@@ -407,7 +406,6 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -407,7 +406,6 @@ angular.module('formService', ['ui.bootstrap'])
url: scope.url url: scope.url
}); });
scope[v.type][k].model = angular.copy(scope.model[k]) || {};
if (v.type === 'ListNode') { if (v.type === 'ListNode') {
scope[v.type][k].items = []; scope[v.type][k].items = [];
} }
...@@ -431,8 +429,14 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -431,8 +429,14 @@ angular.module('formService', ['ui.bootstrap'])
scope[v.type][k].form.push(item.name); scope[v.type][k].form.push(item.name);
} }
if (item.type === 'date') {
scope.model[k][item.name] = generator.dateformatter(scope.model[k][item.name]);
}
}); });
scope[v.type][k].model = angular.copy(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;
...@@ -581,7 +585,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -581,7 +585,7 @@ angular.module('formService', ['ui.bootstrap'])
*/ */
generator.pathDecider = function (client_cmd, $scope, data) { generator.pathDecider = function (client_cmd, $scope, data) {
if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') { if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') {
$rootScope.$broadcast('reload_cmd', client_cmd[0]); $rootScope.$broadcast('reload_cmd', $scope.reload_cmd);
return; return;
} }
/** /**
......
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