versioning 0.6.0

Gruntfile.js

@@ -79,9 +79,7 @@ module.exports = function (grunt) {
                     {expand: true, cwd: 'app/styles/images/', src: '*', dest: 'dist/css/images/', flatten: true},
                     {expand: true, cwd: 'app/bower_components/bootstrap/dist/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'},
                     {expand: true, cwd: 'app/bower_components/jquery/dist/', src: 'jquery.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    {expand: true, cwd: 'app/bower_components/angular/', src: 'angular.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    //{expand: true, cwd: 'app/shared/scripts/', src: 'theme.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    {expand: true, cwd: 'app/shared/scripts/', src: 'jquery-ui.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
+                    {expand: true, cwd: 'app/bower_components/angular/', src: 'angular.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
                 ]
             },
             local_prod: {
@@ -94,8 +92,7 @@ module.exports = function (grunt) {
                     {expand: true, cwd: 'app/styles/images/', src: '*', dest: 'dist/css/images/', flatten: true},
                     {expand: true, cwd: 'app/bower_components/bootstrap/dist/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'},
                     {expand: true, cwd: 'app/bower_components/jquery/dist/', src: 'jquery.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    {expand: true, cwd: 'app/bower_components/angular/', src: 'angular.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    {expand: true, cwd: 'app/shared/scripts/', src: 'jquery-ui.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
+                    {expand: true, cwd: 'app/bower_components/angular/', src: 'angular.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
                 ]
             }
         },
@@ -127,8 +124,7 @@ module.exports = function (grunt) {
             },
             components: {
                 src: [
-                    //"app/bower_components/angular/angular.js",
-                    //"app/bower_components/jquery/dist/jquery.js",
+                    "app/bower_components/angular-i18n/angular-locale_tr.js",
                     "app/bower_components/bootstrap/dist/js/bootstrap.js",
                     "app/bower_components/angular-route/angular-route.js",
                     "app/bower_components/angular-cookies/angular-cookies.js",
@@ -179,7 +175,7 @@ module.exports = function (grunt) {
             },
             components_branch: {
                 src: [
-                    //"app/bower_components/jquery/dist/jquery.min.js",
+                    "app/bower_components/angular-i18n/angular-locale_tr.js",
                     "app/bower_components/angular-route/angular-route.min.js",
                     "app/bower_components/angular-cookies/angular-cookies.min.js",
                     "app/bower_components/angular-resource/angular-resource.min.js",

app/app_routes.js

@@ -51,6 +51,7 @@ app.config(['$routeProvider', function ($routeProvider, $route) {
     .run(function ($rootScope) {
 
         $rootScope.loggedInUser = true;
+        $rootScope.loginAttempt = 0;
         $rootScope.$on("$routeChangeStart", function (event, next, current) {
             // will be used when needed
         });

app/components/auth/auth_controller.js

@@ -9,7 +9,7 @@
 'use strict';
 
 var auth = angular.module('ulakbus.auth', ['ngRoute', 'schemaForm', 'ngCookies']);
-auth.controller('LoginCtrl', function ($scope, $q, $timeout, $routeParams, Generator, LoginService) {
+auth.controller('LoginCtrl', function ($scope, $q, $timeout, $routeParams, $rootScope, $log, Generator, LoginService) {
     $scope.url = 'login';
     $scope.form_params = {};
     $scope.form_params['clear_wf'] = 1;
@@ -23,13 +23,16 @@ auth.controller('LoginCtrl', function ($scope, $q, $timeout, $routeParams, Gener
     $scope.onSubmit = function (form) {
         $scope.$broadcast('schemaFormValidate');
         if (form.$valid) {
+            $rootScope.loginAttempt = 1;
             LoginService.login($scope.url, $scope.model)
                 .error(function(data){
                     $scope.message = data.title;
                 })
         }
         else {
-            console.log("not valid");
-        }
+            $log.debug("not valid");
         }
+    };
+    $log.debug('login attempt: ', $rootScope.loginAttempt);
+
 });
\ No newline at end of file

app/components/crud/crud_controller.js

@@ -29,24 +29,29 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
              * @returns {*}
              */
             generateParam: function (scope, routeParams, cmd) {
-                // define api request url path
                 scope.url = routeParams.wf;
-                // why do this??
+
                 angular.forEach(routeParams, function (value, key) {
                     if (key.indexOf('_id') > -1 && key !== 'param_id') {
                         scope.param = key;
                         scope.param_id = value;
                     }
                 });
+
                 scope.form_params = {
                     //cmd: cmd,
                     model: routeParams.model,
                     param: scope.param || routeParams.param,
                     id: scope.param_id || routeParams.param_id,
                     wf: routeParams.wf,
-                    object_id: routeParams.key
+                    object_id: routeParams.key,
+                    filters: []
                 };
-                scope.form_params[scope.param] = scope.param_id;
+
+                if (scope.param_id) {
+                    scope.form_params.filters.push({field: scope.param, values: [scope.param_id], type: 'check'});
+                }
+
                 scope.model = scope.form_params.model;
                 scope.wf = scope.form_params.wf;
                 scope.param = scope.form_params.param;
@@ -150,16 +155,6 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
             }
         };
 
-        $scope.filter = {};
-
-        $scope.addToFilter = function (field, filterValue) {
-
-        };
-
-        $scope.filterSubmit = function () {
-
-        };
-
         $scope.do_action = function (key, cmd, mode) {
             Generator.doItemAction($scope, key, cmd, mode || 'normal');
         };
@@ -168,22 +163,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
             return new Array(num);
         };
 
-        $timeout(function () {
-            jQuery('.filterDate').datepicker({
-                changeMonth: true,
-                changeYear: true,
-                dateFormat: "dd.mm.yy",
-                onSelect: function (date, inst) {
-                    //scope.model[k] = date;
-                    //if (scope.modalElements) {
-                    //    scope.validateModalDate(k);
-                    //}
-                    //else {
-                    //    scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
-                    //}
-                }
-            }).datepicker("setDate", new Date());
-        });
+        ;
 
         //
         $scope.showCmd = function () {
@@ -299,6 +279,70 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
         return {
             templateUrl: 'components/crud/templates/filter.html',
             restrict: 'E',
-            replace: true
+            replace: true,
+            link: function ($scope) {
+                $scope.filters = {};
+                angular.forEach($scope.listFilters, function (value, key) {
+                    $scope.filters[value.field] = {field: value.field, values: [], type: value.type};
+                    //if (value.type === 'date') {
+                    //    $scope.form_params.filters.push({field: value.field, values: [$scope.filterStartDate, $scope.filterEndDate], type: value.type});
+                    //}
+                });
+                $scope.filterStartDate;
+                $scope.filterEndDate;
+                $scope.status = {startOpened: false, endOpened: false};
+                $scope.dateFilterOpen = function ($event, which) {
+                    this.status[which] = true;
                 };
+                $scope.format = 'dd.MM.yyyy'
+            }
+        };
+    })
+    .directive('dateFilter', function () {
+        return {
+            templateUrl: 'components/crud/templates/dateFilter.html',
+            restrict: 'E',
+            replace: true,
+            link: function ($scope) {
+                $scope.filterStartDate;
+                $scope.filterEndDate;
+                $scope.status = {startOpened: false, endOpened: false};
+                $scope.dateFilterOpen = function ($event, which) {
+                    this.status[which] = true;
+                };
+                $scope.format = 'dd.MM.yyyy'
+            }
+        }
+    })
+    .directive('checkboxFilter', function () {
+        return {
+            templateUrl: 'components/crud/templates/dateFilter.html',
+            restrict: 'E',
+            replace: true,
+            link: function ($scope) {
+                $scope.filterStartDate;
+                $scope.filterEndDate;
+                $scope.status = {startOpened: false, endOpened: false};
+                $scope.dateFilterOpen = function ($event, which) {
+                    this.status[which] = true;
+                };
+                $scope.format = 'dd.MM.yyyy'
+            }
+        }
+    })
+    .directive('selectFilter', function () {
+        return {
+            templateUrl: 'components/crud/templates/dateFilter.html',
+            restrict: 'E',
+            replace: true,
+            link: function ($scope) {
+                $scope.filterStartDate;
+                $scope.filterEndDate;
+                $scope.status = {startOpened: false, endOpened: false};
+                $scope.dateFilterOpen = function ($event, which) {
+                    this.status[which] = true;
+                };
+                $scope.format = 'dd.MM.yyyy'
+            }
+        }
     });
\ No newline at end of file

app/components/crud/templates/filter.html

 <div>
     <h2>Filtrele</h2>
+
     <div ng-repeat="filter in list_filters">
         <div>
             <div class=" clearfix">
@@ -8,28 +9,57 @@
 
             <div ng-if="filter.type==='check' || !filter.type">
                 <div class="checkbox" ng-repeat="filterItem in filter.values">
-                    <input type="checkbox" name="filter_group[]" value="{{filterItem.value}}"/>{{filterItem.name}}<br />
+                    <label class="checkbox-inline">
+                        <input type="checkbox" name="filter_group[]" value="{{filterItem.value}}"/>
+                        {{filterItem.name}}
+                    </label>
                 </div>
             </div>
 
             <div ng-if="filter.type==='select'">
                 <div class="col-md-12">
                     <select name="filterSelect" id="filterSelect" class="form-control">
-                        <option ng-repeat="filterItem in filter.values" value="{{filterItem.value}}">{{filterItem.name}}</option>
+                        <option ng-repeat="filterItem in filter.values" value="{{filterItem.value}}">
+                            {{filterItem.name}}
+                        </option>
                     </select>
                 </div>
             </div>
 
             <div ng-if="filter.type==='date'">
-                <div class="col-md-6">
-                    <br>
+                <div class="col-md-12">
                     <label class="control-label" for="startDate">Başlangıç</label>
-                    <input type="text" name="startDate" class="form-control filterDate"/>
+
+                    <p class="input-group">
+                        <span class="input-group-btn">
+                            <button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'startOpened')">
+                                <i class="fa fa-calendar"></i>
+                            </button>
+                        </span>
+                        <input type="text" name="startDate" class="form-control" ng-model="filterStartDate"
+                               uib-datepicker-popup="{{format}}"
+                               is-open="status.startOpened"
+                               close-text="Kapat"
+                               current-text="Bugün"
+                               clear-text="Temizle"
+                               ng-click="dateFilterOpen($event, 'startOpened')"/></p>
                 </div>
-                <div class="col-md-6">
-                    <br>
+                <div class="col-md-12">
                     <label class="control-label" for="endDate">Bitiş</label>
-                    <input type="text" name="endDate" class="form-control filterDate"/>
+
+                    <p class="input-group">
+                        <span class="input-group-btn">
+                            <button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'endOpened')">
+                                <i class="fa fa-calendar"></i>
+                            </button>
+                        </span>
+                        <input type="text" name="endDate" class="form-control" ng-model="filterEndDate"
+                               uib-datepicker-popup="{{format}}"
+                               is-open="status.endOpened"
+                               close-text="Kapat"
+                               current-text="Bugün"
+                               clear-text="Temizle"
+                               ng-click="dateFilterOpen($event, 'endOpened')"/></p>
                 </div>
             </div>
         </div>

app/components/dashboard/dashboard.html

@@ -12,7 +12,7 @@
                  <div class="dashboard-search-results">
                  	<ul ng-if="students.length > 0">
                     	<li ng-repeat="student in students">
-                            <a href="javascript:void(0)" ng-click="select(student, 'ogrenci')">{{student}}</a>
+                            <a href="javascript:void(0)" ng-click="select(student, 'ogrenci')">{{student[0]}}</a>
                         </li>
                     </ul>
                  </div>

app/components/version/version.js

@@ -5,4 +5,4 @@ angular.module('ulakbus.version', [
   'ulakbus.version.version-directive'
 ])
 
-.value('version', '0.5.1');
+.value('version', '0.6.0');

app/components/version/version_test.js

@@ -5,7 +5,7 @@ describe('ulakbus.version module', function() {
 
   describe('version service', function() {
     it('should return current version', inject(function(version) {
-      expect(version).toEqual('0.5.1');
+      expect(version).toEqual('0.6.0');
     }));
   });
 });

app/index.html

@@ -93,7 +93,7 @@
 <script src="tmp/templates.js"></script>
 <script src="app.js"></script>
 <script src="app_routes.js"></script>
-<script src="shared/scripts/jquery-ui.min.js"></script>
+<!--<script src="shared/scripts/jquery-ui.min.js"></script>-->
 <script src="shared/directives.js"></script>
 <script src="zetalib/interceptors.js"></script>
 <script src="zetalib/form_service.js"></script>

app/main.html

@@ -101,7 +101,7 @@
 <script src="tmp/templates.js"></script>
 <script src="app.js"></script>
 <script src="app_routes.js"></script>
-<script src="shared/scripts/jquery-ui.min.js"></script>
+<!--<script src="shared/scripts/jquery-ui.min.js"></script>-->
 <script src="shared/directives.js"></script>
 <script src="zetalib/interceptors.js"></script>
 <script src="zetalib/form_service.js"></script>

app/shared/directives.js

@@ -331,8 +331,9 @@ app.directive('logout', function ($http, $location, RESTURL) {
                 // changing menu items by listening for broadcast
 
                 $scope.$on("menuitems", function (event, data) {
-                    var menu = {other: $scope.allMenuItems.other};
+                    var menu = {};
                     menu[data] = $scope.allMenuItems[data];
+                    menu['other'] = $scope.allMenuItems.other;
                     $scope.menuItems = $scope.prepareMenu(menu);
                     $timeout(function () {
                         sidebarmenu.metisMenu()

app/zetalib/form_service.js

@@ -184,12 +184,17 @@ angular.module('formService', ['ui.bootstrap'])
 
                 // check if type is date and if type date found change it to string
                 if (v.type === 'date') {
-                    var modelDate = angular.copy(scope.model[k]);
+                    if (isNaN(new Date(scope.model[k]))) {
+                        var modelDate;
+                    }
+                    else {
+                        var modelDate = new Date(scope.model[k]);
+                    }
                     scope.model[k] = generator.dateformatter(scope.model[k]);
                     scope.form[scope.form.indexOf(k)] = {
                         key: k, name: k, title: v.title,
                         type: 'template',
-                        modelDate: new Date(modelDate),
+                        modelDate: modelDate,
                         templateUrl: 'shared/templates/datefield.html',
                         validationMessage: {
                             'dateNotValid': "Girdiğiniz tarih geçerli değildir. <i>orn: '01.01.2015'<i/>",
@@ -200,6 +205,9 @@ angular.module('formService', ['ui.bootstrap'])
                                 var deferred = $q.defer();
                                 $timeout(function () {
                                     scope.model[k] = angular.copy(generator.dateformatter(value));
+                                    if (scope.schema.required.indexOf(k) > -1) {
+                                        deferred.resolve();
+                                    }
                                     if (value.constructor === Date) {
                                         deferred.resolve();
                                     }

app/zetalib/form_service_test.js

@@ -12,7 +12,7 @@ describe('form service module', function () {
     beforeEach(module('ulakbus'));
     beforeEach(module('formService'));
     var location;
-    beforeEach(inject(function($location, $injector) {
+    beforeEach(inject(function ($location, $injector) {
         location = $location;
         // Set up the mock http service responses
         $httpBackend = $injector.get('$httpBackend');
@@ -81,16 +81,30 @@ describe('form service module', function () {
                 expect(Generator.prepareFormItems).not.toBe(null);
 
                 var scope = {
-                        form: ['email', 'id', 'name'],
+                    form: ['email', 'id', 'name', 'save', 'select', 'date'],
                     schema: {
                         properties: {
                             email: {title: 'email', type: 'email'},
                             id: {title: 'id', type: 'int'},
-                                name: {title: 'name', type: 'string'}
+                            name: {title: 'name', type: 'string'},
+                            save: {title: 'save', type: 'submit'},
+                            select: {title: 'select', type: 'select'},
+                            date: {title: 'date', type: 'date'},
+                            text_general: {title: 'text_general', type: 'text_general'},
+                            model: {title: 'model', type: 'model'},
+                            node: {title: 'Node', type: 'Node'},
+                            listnode: {title: 'ListNode', type: 'ListNode'}
                         }, required: [], type: 'object', title: 'servicetest'
                     },
                     model: {
-                            email: 'test@test.com', id: 2, name: 'travolta'
+                        email: 'test@test.com', id: 2, name: 'travolta',
+                        save: {title: 'save', type: 'submit'},
+                        select: 2,
+                        date: '12.12.2012',
+                        text_general: 'test',
+                        model: '32gy1ukf3qiryv',
+                        node: '',
+                        listnode: ''
                     },
                     form_params: {}
                 };
@@ -138,8 +152,7 @@ describe('form service module', function () {
             }])
         );
 
-        it('should get form',
-            inject(function (Generator, $httpBackend, RESTURL) {
+        it('should get form', inject(function (Generator, $httpBackend, RESTURL) {
 
                 $httpBackend.expectPOST(RESTURL.url + 'add_student/', {cmd: 'add'})
                     .respond(200, {
@@ -179,12 +192,16 @@ describe('form service module', function () {
         it('should get list',
             inject(function (Generator, $httpBackend, RESTURL) {
 
-                $httpBackend.expectPOST(RESTURL.url + 'test/personel', {cmd: 'list', model: "personel", object_id: "5821bc25a90aa1"})
+                $httpBackend.expectPOST(RESTURL.url + 'test/personel', {
+                        cmd: 'list',
+                        model: "personel",
+                        object_id: "5821bc25a90aa1"
+                    })
                     .respond(200, {
                         items: {
                             "client_cmd": "list_objects",
                             "is_login": true,
-                            "objects":[
+                            "objects": [
                                 ["Ad\u0131", "Soyad\u0131", "TC No", "Durum"],
                                 ["4MsKRH9435cdKOzKCITNPml5bhB", "firstname", "lastname", "dksoap", false]
                             ],
@@ -215,7 +232,7 @@ describe('form service module', function () {
                     url: 'student/add'
                 };
                 Generator.submit(scope)
-                    .success(function(){
+                    .success(function () {
 
                     })
                     .then(function (data) {
@@ -226,7 +243,7 @@ describe('form service module', function () {
         );
 
         it('should validate email',
-            inject(function(Generator){
+            inject(function (Generator) {
                 var validEmails = [
                     'test@test.com',
                     'test@test.co.uk',
@@ -253,7 +270,7 @@ describe('form service module', function () {
         );
 
         it('should validate tcNo',
-            inject(function(Generator){
+            inject(function (Generator) {
                 var validTCNos = [
                     '12345678902',
                     '18307990654'
@@ -277,6 +294,38 @@ describe('form service module', function () {
                 }
             })
         );
+
+        it('should validate date',
+            inject(function (Generator) {
+                var validDates = [
+                    '12.12.2012',
+                    '12/12/2012'
+                ];
+
+                var invalidDates = [
+                    '00000000000',
+                    'dsad',
+                    '0.0.0',
+                    '12.15.2012',
+                    ''
+                ];
+
+                for (var i in validDates) {
+                    var valid = Generator.isValidDate(validDates[i]);
+                    console.log(validDates[i]);
+                    expect(valid).toBeTruthy();
+                }
+                for (var i in invalidDates) {
+                    console.log(invalidDates[i]);
+
+                    var valid = Generator.isValidDate(invalidDates[i]);
+
+                    console.log(valid)
+                    expect(valid).toBeFalsy();
+                }
+            })
+        );
+
         it('should get wf and redirect according to client_cmd',
             inject(function (Generator, $httpBackend, RESTURL) {
 
@@ -316,10 +365,11 @@ describe('form service module', function () {
                 //scope.url = 'test';
                 scope.form_params = {
                     param: 'test',
-                    id:'xyz123',
-                    model:'testModel',
+                    id: 'xyz123',
+                    model: 'testModel',
                     object_id: 'xxx11',
-                    wf:'testModel'};
+                    wf: 'testModel'
+                };
 
                 scope.url = 'test';
 
@@ -331,7 +381,7 @@ describe('form service module', function () {
         );
 
         it('should return diff object',
-            inject( function (Generator) {
+            inject(function (Generator) {
                 expect(Generator.get_diff).not.toBe(null);
 
                 // test cases - testing for success
@@ -378,7 +428,7 @@ describe('form service module', function () {
 
     describe('form service', function () {
         var location, rootScope, scope, ctrl;
-        beforeEach(inject(function($location, $rootScope) {
+        beforeEach(inject(function ($location, $rootScope) {
             location = $location;
             rootScope = $rootScope;
             scope = $rootScope.$new();
@@ -403,15 +453,15 @@ describe('form service module', function () {
     // here begin the directive tests
     var compile, scope, directiveElem;
 
-    beforeEach(function(){
-        inject(function($compile, $rootScope){
+    beforeEach(function () {
+        inject(function ($compile, $rootScope) {
             compile = $compile;
             scope = $rootScope.$new();
         });
         // directiveElem = getCompiledElement();
     });
 
-    function getCompiledElement(){
+    function getCompiledElement() {
         var element = angular.element('<div modal-for-nodes="Personel,ListNode,add"></div>');
         var compiledElement = compile(element)(scope);
         scope.$digest();

app/zetalib/interceptors.js

@@ -39,6 +39,7 @@ app.config(['$httpProvider', function ($httpProvider) {
                 }
                 if (response.data.is_login === true) {
                     $rootScope.loggedInUser = true;
+                    $rootScope.loginAttempt = 1; // this needs for popup errors
                     if ($location.path() === "/login") {
                         $location.path("/dashboard");
                     }
@@ -52,6 +53,10 @@ app.config(['$httpProvider', function ($httpProvider) {
             'responseError': function (rejection) {
 
                 var errorModal = function () {
+                    if ($rootScope.loginAttempt === 0) {
+                        console.log('not logged in, no alert message triggered');
+                        return;
+                    }
                     var codefield = "";
                     if (rejection.data.error) {
                         codefield = '<p><pre>' +