Skip to content

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

form submit on header submit button

parent 9ec7cbbd
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 174 deletions
app/components/crud/crud_controller.js
View file @ a2e27992
...@@ -27,86 +27,16 @@ crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $htt ...@@ -27,86 +27,16 @@ crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $htt
$scope.form_params['cmd'] = 'add'; $scope.form_params['cmd'] = 'add';
} }
$scope.today = function() {
$scope.dt = new Date();
};
$scope.today();
$scope.clear = function () {
$scope.dt = null;
};
// Disable weekend selection
$scope.disabled = function(date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
};
$scope.toggleMin = function() {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.maxDate = new Date(2020, 5, 22);
$scope.open = function() {
debugger;
$scope.status.opened = true;
};
$scope.dateOptions = {
formatYear: 'yy',
startingDay: 1,
initDate: new Date('01-01-1900')
};
$scope.format = 'dd.MM.yyyy';
$scope.status = {
opened: false
};
var tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
var afterTomorrow = new Date();
afterTomorrow.setDate(tomorrow.getDate() + 2);
$scope.events =
[
{
date: tomorrow,
status: 'full'
},
{
date: afterTomorrow,
status: 'partially'
}
];
$scope.getDayClass = function(date, mode) {
if (mode === 'day') {
var dayToCheck = new Date(date).setHours(0,0,0,0);
for (var i=0;i<$scope.events.length;i++){
var currentDay = new Date($scope.events[i].date).setHours(0,0,0,0);
if (dayToCheck === currentDay) {
return $scope.events[i].status;
}
}
}
return '';
};
// get form with generator // get form with generator
$scope.loaddata = function() {
Generator.get_form($scope); Generator.get_form($scope);
};
// todo remove timeout to load controller efficiently
//$timeout($scope.loaddata, 1000);
$scope.loaddata();
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate'); $scope.$broadcast('schemaFormValidate');
debugger;
if (form.$valid) { if (form.$valid) {
debugger;
Generator.submit($scope) Generator.submit($scope)
.success(function(data){ .success(function(data){
$location.path("/crud"); $location.path("/crud");
...@@ -117,7 +47,6 @@ crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $htt ...@@ -117,7 +47,6 @@ crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $htt
} }
}; };
console.log($scope);
}); });
/** /**
......
app/index.html
View file @ a2e27992
...@@ -13,16 +13,13 @@ ...@@ -13,16 +13,13 @@
<title>ULAKBUS</title> <title>ULAKBUS</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">--> <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<link href="styles/roboto/roboto.css" rel="stylesheet"> <link href="styles/roboto/roboto.css" rel="stylesheet">
<link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css"> <link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css">
<link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css"> <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css">
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css"> <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css">
<!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css">-->
<!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/quantumui.min.css">-->
</head> </head>
<body> <body>
......
app/shared/directives.js
View file @ a2e27992
...@@ -30,7 +30,7 @@ app.directive('headerNotification', function () { ...@@ -30,7 +30,7 @@ app.directive('headerNotification', function () {
return { return {
templateUrl: 'shared/templates/directives/header-notification.html', templateUrl: 'shared/templates/directives/header-notification.html',
restrict: 'E', restrict: 'E',
replace: true, replace: true
} }
}); });
...@@ -38,7 +38,26 @@ app.directive('headerSubMenu', function () { ...@@ -38,7 +38,26 @@ app.directive('headerSubMenu', function () {
return { return {
templateUrl: 'shared/templates/directives/header-sub-menu.html', templateUrl: 'shared/templates/directives/header-sub-menu.html',
restrict: 'E', restrict: 'E',
controller: "CRUDAddEditCtrl",
replace: true, replace: true,
link: function($scope){
$scope.triggerSubmit = function() {
// todo: double make it but single not solve this!
angular.element($('#submitbutton')).triggerHandler('click');
angular.element($('#submitbutton')).triggerHandler('click');
//$scope.$broadcast('schemaFormValidate');
//$scope.onSubmit(angular.element($('#submitbutton')).scope().formgenerated);
}
}
}
});
// todo: unused delete
app.directive('headerSubMenuButtons', function () {
return {
templateUrl: 'shared/templates/directives/header-sub-menu-buttons.html',
restrict: 'E',
replace: true
} }
}); });
......
app/shared/templates/add.html
View file @ a2e27992
<h1>{{ schema.title }}</h1> <h1>{{ schema.title }}</h1>
<form name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"></form> <form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"></form>
<div ng-repeat="node in listnodes"> <div ng-repeat="node in listnodes">
<h3>{{ node.title }} <h3>{{ node.title }}
<span> <span>
...@@ -34,3 +34,7 @@ ...@@ -34,3 +34,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<button id="submitbutton" type="button" class="btn btn-primary" ng-click="onSubmit(formgenerated)">Kaydet</button>
<button type="button" class="btn btn-warning">Düzenle</button> <!-- todo: make it conditional -->
<button type="button" class="btn btn-danger">İptal</button> <!-- todo: turn back to previous page -->
\ No newline at end of file
app/shared/templates/datefield.html
View file @ a2e27992
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
type="date" type="date"
datepicker-popup datepicker-popup
is-open="status.opened" is-open="status.opened"
datepicker-options="dateOptions"
date-disabled="disabled(date, mode)" date-disabled="disabled(date, mode)"
close-text="Close"/> close-text="Close"/>
<span class="input-group-btn"> <span class="input-group-btn">
......
app/shared/templates/directives/header-sub-menu.html
View file @ a2e27992
...@@ -4,5 +4,10 @@ ...@@ -4,5 +4,10 @@
<li><a href="#">Liste</a></li> <li><a href="#">Liste</a></li>
<li class="active">Tablo</li> <li class="active">Tablo</li>
</ul> </ul>
<button type="button" class="btn btn-primary">Kaydet</button> <!--<header-sub-menu-buttons></header-sub-menu-buttons>-->
<div id="header-buttons">
<button type="button" class="btn btn-primary" ng-click="triggerSubmit()">Kaydet</button>
<button type="button" class="btn btn-warning">Düzenle</button>
<button type="button" class="btn btn-danger">İptal</button>
</div>
</div> </div>
\ No newline at end of file
app/zetalib/forms/form_service.js
View file @ a2e27992
...@@ -37,76 +37,75 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, ...@@ -37,76 +37,75 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout,
"title": k.title, "title": k.title,
"key": k.name, "key": k.name,
}; };
var parentScope = scope.$parent.$parent.$parent.$parent; //var parentScope = scope.$parent.$parent.$parent.$parent;
debugger; //scope.today = function() {
scope.today = function() { // scope.dt = new Date();
scope.dt = new Date(); //};
}; //scope.today();
scope.today(); //
//scope.clear = function () {
scope.clear = function () { // scope.dt = null;
scope.dt = null; //};
}; //
//// Disable weekend selection
// Disable weekend selection //scope.disabled = function(date, mode) {
scope.disabled = function(date, mode) { // return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) ); //};
}; //
//scope.toggleMin = function() {
scope.toggleMin = function() { // scope.minDate = scope.minDate ? null : new Date();
scope.minDate = scope.minDate ? null : new Date(); //};
}; //scope.toggleMin();
scope.toggleMin(); //scope.maxDate = new Date(2020, 5, 22);
scope.maxDate = new Date(2020, 5, 22); //
//scope.open = function($event) {
scope.open = function($event) { // debugger;
debugger; // scope.status.opened = true;
scope.status.opened = true; //};
}; //
//scope.dateOptions = {
scope.dateOptions = { // formatYear: 'yy',
formatYear: 'yy', // startingDay: 1,
startingDay: 1, // initDate: new Date('01-01-1900')
initDate: new Date('01-01-1900') //};
}; //
//scope.format = 'dd.MM.yyyy';
scope.format = 'dd.MM.yyyy'; //
//scope.status = {
scope.status = { // opened: false
opened: false //};
}; //
//var tomorrow = new Date();
var tomorrow = new Date(); //tomorrow.setDate(tomorrow.getDate() + 1);
tomorrow.setDate(tomorrow.getDate() + 1); //var afterTomorrow = new Date();
var afterTomorrow = new Date(); //afterTomorrow.setDate(tomorrow.getDate() + 2);
afterTomorrow.setDate(tomorrow.getDate() + 2); //scope.events =
scope.events = // [
[ // {
{ // date: tomorrow,
date: tomorrow, // status: 'full'
status: 'full' // },
}, // {
{ // date: afterTomorrow,
date: afterTomorrow, // status: 'partially'
status: 'partially' // }
} // ];
]; //
//scope.getDayClass = function(date, mode) {
scope.getDayClass = function(date, mode) { // if (mode === 'day') {
if (mode === 'day') { // var dayToCheck = new Date(date).setHours(0,0,0,0);
var dayToCheck = new Date(date).setHours(0,0,0,0); //
// for (var i=0;i<$scope.events.length;i++){
for (var i=0;i<$scope.events.length;i++){ // var currentDay = new Date($scope.events[i].date).setHours(0,0,0,0);
var currentDay = new Date($scope.events[i].date).setHours(0,0,0,0); //
// if (dayToCheck === currentDay) {
if (dayToCheck === currentDay) { // return $scope.events[i].status;
return $scope.events[i].status; // }
} // }
} // }
} //
// return '';
return ''; //};
};
} }
...@@ -163,6 +162,11 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, ...@@ -163,6 +162,11 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout,
scope.object_id = scope.form_params['object_id']; scope.object_id = scope.form_params['object_id'];
//scope.triggerItem = function(id) {
// angular.element($(id));
// angular.element($(id)).triggerHandler('click');
//}
return generator.group(scope); return generator.group(scope);
}; };
generator.group = function (formObject) { generator.group = function (formObject) {
...@@ -207,6 +211,12 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, ...@@ -207,6 +211,12 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout,
var re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i; var re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
return re.test(email); return re.test(email);
}; };
generator.generateButtons = function (scope) {
//scope.buttonplace = angular.element($('#myElement'));
scope.$watch("form", function(){
debugger;
});
};
generator.asyncValidators = { generator.asyncValidators = {
emailNotValid: function (value) { emailNotValid: function (value) {
var deferred = $q.defer(); var deferred = $q.defer();
...@@ -229,6 +239,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, ...@@ -229,6 +239,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout,
"model": $scope.form_params.model, "model": $scope.form_params.model,
"token": $scope.token "token": $scope.token
}; };
debugger;
if ($scope.object_id) { if ($scope.object_id) {
var get_diff = FormDiff.get_diff($scope.model, $scope.initialModel); var get_diff = FormDiff.get_diff($scope.model, $scope.initialModel);
var data = { var data = {
......
index.html
View file @ a2e27992
...@@ -14,15 +14,13 @@ ...@@ -14,15 +14,13 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- @if NODE_ENV == 'DEVELOPMENT' --> <!-- @if NODE_ENV == 'DEVELOPMENT' -->
<!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">--> <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<link href="styles/roboto/roboto.css" rel="stylesheet"> <link href="styles/roboto/roboto.css" rel="stylesheet">
<link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css"> <link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css">
<link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css"> <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css">
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css"> <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css">
<!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css">-->
<!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/quantumui.min.css">-->
<!-- @endif --> <!-- @endif -->
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
...@@ -51,23 +49,17 @@ ...@@ -51,23 +49,17 @@
<header-notification></header-notification> <header-notification></header-notification>
</nav> </nav>
<sidebar></sidebar> <sidebar ng-if="$root.loggedInUser"></sidebar>
<div class="manager-view"> <div class="manager-view">
<div class="manager-view-inner"> <div class="manager-view-inner">
<!-- manager-header --> <!-- manager-header -->
<div class="manager-view-header container-fluid"> <header-sub-menu ng-if="$root.loggedInUser"></header-sub-menu>
<ul class="breadcrumb">
<li><a href="#">Personeller</a></li>
<li><a href="#">Liste</a></li>
<li class="active">Tablo</li>
</ul>
<button type="button" class="btn btn-primary">Kaydet</button>
</div>
<!-- end of manager-header --> <!-- end of manager-header -->
<div class="manager-view-content"> <div class="manager-view-content">
<div class="row"> <div class="row">
<div class="main" ng-view> <div class="main" ng-view>
</div> </div>
</div> </div>
...@@ -83,19 +75,14 @@ ...@@ -83,19 +75,14 @@
<script src="bower_components/angular-cookies/angular-cookies.min.js"></script> <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
<script src="bower_components/angular-resource/angular-resource.min.js"></script> <script src="bower_components/angular-resource/angular-resource.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script> <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<script src="bower_components/tv4/tv4.js"></script> <script src="bower_components/tv4/tv4.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script> <script src="bower_components/objectpath/lib/ObjectPath.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script>
<script src="bower_components/angular-schema-form/dist/schema-form.min.js"></script> <script src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>
<script src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script> <script src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script>
<!--<script src="bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>-->
<script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script> <script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
<!-- TODO: check all js and remove unused -->
<script src="bower_components/json3/lib/json3.min.js"></script> <script src="bower_components/json3/lib/json3.min.js"></script>
<script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script> <script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
<script src="bower_components/metisMenu/dist/metisMenu.min.js"></script> <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
...@@ -121,7 +108,6 @@ ...@@ -121,7 +108,6 @@
<script src="components/staff/staff_controller.js"></script> <script src="components/staff/staff_controller.js"></script>
<script src="components/student/student_controller.js"></script> <script src="components/student/student_controller.js"></script>
<script src="components/version/version.js"></script> <script src="components/version/version.js"></script>
<!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>-->
<!-- @endif --> <!-- @endif -->
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
......
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