add ve edit fonksiyonları ayrıldı.

testve route'lar güncellendi

app/app_routes.js

@@ -68,13 +68,46 @@ app.config(['$routeProvider', function ($routeProvider) {
         })
         .when('/staff/add', {
             templateUrl: 'components/staff/staff_add_template.html',
-            controller: 'StaffAddEditCtrl',
+            controller: 'StaffAddCtrl',
             resolve: {
                 loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) {
                     return $ocLazyLoad.load('components/staff/staff_controller.js');
                 }],
                 loadMyService: ['$ocLazyLoad', function ($ocLazyLoad) {
                     return $ocLazyLoad.load('zetalib/forms/form_service.js');
+                }],
+                loadMyService2: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('zetalib/general.js');
+                }]
+            }
+        })
+        .when('/staff/edit/:id', {
+            templateUrl: 'components/staff/staff_add_template.html',
+            controller: 'StudentEditCtrl',
+            resolve: {
+                loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('components/student/student_controller.js');
+                }],
+                loadMyService: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('zetalib/forms/form_service.js');
+                }],
+                loadMyService2: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('zetalib/general.js');
+                }]
+            }
+        })
+        .when('/staffs', {
+            templateUrl: 'components/staff/staff_list_template.html',
+            controller: 'StaffListCtrl',
+            resolve: {
+                loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('components/student/student_controller.js');
+                }],
+                loadMyService: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('zetalib/forms/form_service.js');
+                }],
+                loadMyService2: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('zetalib/general.js');
                 }]
             }
         })

app/components/staff/staff_controller.js

@@ -16,8 +16,8 @@ var staff = angular.module('zaerp.staff', ['ngRoute', 'schemaForm', 'formService
  * which provide a form with form generator.
  */
 
-staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $routeParams) {
-    Generator.get_form('add_staff', $routeParams).then(function (d) {
+staff.controller('StaffAddCtrl', function ($scope, $http, $log, Generator, $routeParams) {
+    Generator.get_form('add_staff', '').then(function (d) {
         $scope.schema = d.schema;
         $scope.form = d.form;
         $scope.model = d.model ? d.model : {};
@@ -28,6 +28,7 @@ staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $
                 title: "Save"
             }
         );
+        return $scope;
     });
     $scope.onSubmit = function (form) {
         $scope.$broadcast('schemaFormValidate');
@@ -36,4 +37,37 @@ staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $
             $log.info($scope);
         }
     }
+});
+
+staff.controller('StaffEditCtrl', function ($scope, $http, $log, Generator, $routeParams) {
+    Generator.get_form('add_staff', $routeParams.id).then(function (d) {
+        $scope.schema = d.schema;
+        $scope.form = d.form;
+        $scope.model = d.model ? d.model : {};
+        $scope.form[0].$asyncValidators = Generator.asyncValidators;
+        $scope.form.push(
+            {
+                type: "submit",
+                title: "Save"
+            }
+        );
+        return $scope;
+    });
+    $scope.onSubmit = function (form) {
+        $scope.$broadcast('schemaFormValidate');
+        if (form.$valid) {
+            // todo: implement form diff here
+            $log.info($scope);
+        }
+    }
+});
+
+/**
+ * Staff List Controller
+ */
+
+staff.controller('StaffListCtrl', function($scope, $http){
+    $http.get('http://127.0.0.1:3000/api/list_staff').then(function(res){
+        $scope.staffs = res.data;
+    })
 });
\ No newline at end of file

app/components/staff/staff_controller_test.js

@@ -8,6 +8,8 @@
 'use strict';
 
 describe('staff controller module', function () {
+
+    beforeEach(module('zaerp'));
     beforeEach(module('zaerp.staff'));
 
     var $controller;
@@ -16,22 +18,18 @@ describe('staff controller module', function () {
         $controller = _$controller_;
     }));
 
-    //describe('$scope.grade', function() {
-    //    it('', function() {
-    //        var $scope = {};
-    //        var controller = $controller('StaffAddEditCtrl', { $scope: $scope });
-    //        expect($scope).not.toBe(null);
-    //    });
-    //});
-    //
-    //describe('staff add controller', function () {
-    //
-    //    it('should have StaffAddEditCtrl', inject(function (ctrl) {
-    //        expect(ctrl).toBeDefined();
-    //    }));
-    //
-    //    it('should get form', inject(function () {
-    //        expect($scope.form).not.toBe(null);
-    //    }));
-    //});
+    describe('staff add controller', function() {
+        it('should get form', function() {
+            var $scope = {};
+            var controller = $controller('StaffAddCtrl', { $scope: $scope });
+            expect($scope).not.toEqual(null);
+        });
+    });
+
+    describe('staff add controller', function () {
+
+        it('should have StaffAddEditCtrl', inject(function ($controller) {
+            expect($controller).toBeDefined();
+        }));
+    });
 });
\ No newline at end of file

app/components/staff/staff_list_template.html

+<table class="table table-bordered">
+    <thead>
+    <tr>
+        <th ng-repeat="(key,value) in staffs[0]">{{ key }}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="staff in staffs">
+        <td ng-repeat="(key,value) in staff">{{value}}</td>
+        <td><a ng-href="#/s/edit/{{staff.id}}">Edit</a></td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file