Commit ccc8eb21 authored by Evren Kutar's avatar Evren Kutar

v0.0.3 BUG: datepicker select by year

linkedmodel modal fix
parent c2b396e5
...@@ -41,7 +41,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal ...@@ -41,7 +41,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
// here change to true because the view retrieves form from api // here change to true because the view retrieves form from api
$rootScope.showSaveButton = true; $rootScope.showSaveButton = true;
return generator.group(scope); return scope;
}; };
generator.group = function (formObject) { generator.group = function (formObject) {
return formObject; return formObject;
...@@ -58,16 +58,18 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal ...@@ -58,16 +58,18 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
scope.model[v] = generator.dateformatter(scope.model[v]); scope.model[v] = generator.dateformatter(scope.model[v]);
// seek for datepicker field and initialize datepicker // seek for datepicker field and initialize datepicker
scope.$watch($('#' + v), function () { //scope.$watch($('#' + v), function () {
$timeout(function () { $timeout(function () {
jQuery('#' + v).datepicker({ jQuery('#' + v).datepicker({
changeMonth: true,
changeYear: true,
dateFormat: "dd.mm.yy", dateFormat: "dd.mm.yy",
onSelect: function (date) { onSelect: function (date) {
scope.model[v] = date; scope.model[v] = date;
} }
}); });
}); });
}); //});
} }
if (k.type == 'int' || k.type == 'float') { if (k.type == 'int' || k.type == 'float') {
...@@ -248,8 +250,6 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal ...@@ -248,8 +250,6 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
//data.form = get_diff; //data.form = get_diff;
} }
debugger;
return $http.post(generator.makeUrl($scope.url), data); return $http.post(generator.makeUrl($scope.url), data);
//.success(function () { //.success(function () {
// //
...@@ -281,8 +281,8 @@ form_generator.controller('ModalCtrl', function ($scope, $modalInstance, Generat ...@@ -281,8 +281,8 @@ form_generator.controller('ModalCtrl', function ($scope, $modalInstance, Generat
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate'); $scope.$broadcast('schemaFormValidate');
console.log(form.$valid); console.log(form.$valid);
//if(form.$valid){ if(form.$valid){
if (1 == 1) { //if (1 == 1) {
// send form to modalinstance result function // send form to modalinstance result function
$modalInstance.close($scope); $modalInstance.close($scope);
...@@ -370,6 +370,7 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator) ...@@ -370,6 +370,7 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
size: 'lg', size: 'lg',
resolve: { resolve: {
items: function () { items: function () {
return Generator.get_form({ return Generator.get_form({
url: 'crud', url: 'crud',
form_params: {'model': scope.form.model_name, "cmd": "add"} form_params: {'model': scope.form.model_name, "cmd": "add"}
...@@ -380,7 +381,7 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator) ...@@ -380,7 +381,7 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
modalInstance.result.then(function (childmodel, key) { modalInstance.result.then(function (childmodel, key) {
// todo: run form validator here // todo: run form validator here
Generator.submit(scope); Generator.submit(childmodel);
}); });
}); });
} }
......
This diff is collapsed.
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