Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
ccc8eb21
Commit
ccc8eb21
authored
Sep 30, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v0.0.3 BUG: datepicker select by year
linkedmodel modal fix
parent
c2b396e5
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
form_service.js
app/zetalib/forms/form_service.js
+9
-8
app.js
dist/app.js
+1
-1
No files found.
app/zetalib/forms/form_service.js
View file @
ccc8eb21
...
@@ -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
);
});
});
});
});
}
}
...
...
dist/app.js
View file @
ccc8eb21
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment