Merge branch 'Feature/#114/PersonelEkleListele'

app/app_routes.js

@@ -68,7 +68,7 @@ app.config(['$routeProvider', function ($routeProvider) {
         })
         .when('/staff/add', {
             templateUrl: 'components/staff/staff_add_template.html',
-            controller: 'StaffCtrl',
+            controller: 'StaffAddEditCtrl',
             resolve: {
                 loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) {
                     return $ocLazyLoad.load('components/staff/staff_controller.js');

app/components/staff/staff_controller.js

@@ -8,7 +8,7 @@
 'use strict';
 
 
-var staff = angular.module('zaerp.staff.add',['ngRoute','schemaForm', 'formService']);
+var staff = angular.module('zaerp.staff',['ngRoute','schemaForm', 'formService']);
 
 
 /**
@@ -16,7 +16,7 @@ var staff = angular.module('zaerp.staff.add',['ngRoute','schemaForm', 'formServi
  * which provide a form with form generator.
  */
 
-staff.controller('StaffCtrl', function($scope, $http, $log, Generator, $routeParams){
+staff.controller('StaffAddEditCtrl', function($scope, $http, $log, Generator, $routeParams){
     Generator.get_form('add_staff', $routeParams).then(function(d){
         $scope.schema = d.schema;
         $scope.form = d.form;
@@ -28,7 +28,6 @@ staff.controller('StaffCtrl', function($scope, $http, $log, Generator, $routePar
                 title: "Save"
             }
         );
-
     });
     $scope.onSubmit = function(form){
         $scope.$broadcast('schemaFormValidate');
@@ -37,5 +36,4 @@ staff.controller('StaffCtrl', function($scope, $http, $log, Generator, $routePar
             $log.info($scope);
         }
     }
-
 });
\ No newline at end of file

app/components/staff/staff_controller_test.js

+/**
+ * Copyright (C) 2015 ZetaOps Inc.
+ *
+ * This file is licensed under the GNU General Public License v3
+ * (GPLv3).  See LICENSE.txt for details.
+ */
+
+'use strict';
+
+describe('staff controller module', function () {
+    var $controller;
+    beforeEach(inject(function (_$controller_) {
+        // The injector unwraps the underscores (_) from around the parameter names when matching
+        $controller = _$controller_;
+    }));
+
+    describe('staff add controller', function () {
+
+        it('should have a scope object', inject(function () {
+            expect($scope).toBeDefined();
+        }));
+
+        it('should get form', inject(function () {
+            expect($scope.form).not.toBe(null);
+        }));
+    });
+});
\ No newline at end of file

app/index.html

@@ -36,8 +36,6 @@
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav navbar-right">
                 <li><a href="#/dashboard">Dashboard</a></li>
-                <li><a href="#/test">Test</a></li>
-                <li><a href="#/profile">Profile</a></li>
                 <li><a href="#/login">Login</a></li>
             </ul>
             <form class="navbar-form navbar-right">
@@ -50,8 +48,7 @@
     <div class="row">
         <div class="col-sm-3 col-md-2 sidebar">
             <ul class="nav nav-sidebar">
-                <li class="active"><a href="#">Overview <span class="sr-only">(current)</span></a></li>
-                <li><a href="#/student/add">New Student</a></li>
+                <li class="active"><a href="#/student/add">New Student</a></li>
                 <li><a href="#/staff/add">New Staff</a></li>
                 <li><a href="#/input_types">Types</a></li>
             </ul>

bower.json

 {
-  "name": "zaerp-ui",
-  "description": "UI project for ZAERP",
+  "name": "ulakbus-ui",
+  "description": "UI project for ulakbüs",
   "version": "0.0.1",
-  "homepage": "https://github.com/zetaops/zaerp-ui",
+  "homepage": "https://github.com/zetaops/ulakbus-ui",
   "license": "GPL",
   "private": false,
   "dependencies": {

karma.conf.js

@@ -22,9 +22,7 @@ module.exports = function (config) {
             'app/bower_components/angular-mocks/angular-mocks.js',
             'app/app.js',
             'app/components/**/*.js',
-            'app/zlib/*.js',
-            'app/login/*.js',
-            'app/dashboard/*.js'
+            'app/zetalib/**/*.js'
         ],
 
         //preprocessors: {

package.json

 {
-  "name": "zaerp-ui",
+  "name": "ulakbus-ui",
   "private": true,
   "version": "0.0.1",
   "description": "",
-  "repository": "https://github.com/zetaops/zaerp-ui",
+  "repository": "https://github.com/zetaops/ulakbus-ui",
   "license": "GPL",
   "devDependencies": {
     "bower": "^1.3.1",
@@ -12,7 +12,7 @@
     "karma-chrome-launcher": "^0.1.12",
     "karma-opera-launcher": "^0.1",
     "karma-junit-reporter": "^0.2.2",
-    "karma-coverage": "*",
+    "karma-coverage": "^0.4.2",
     "protractor": "^1.1.1",
     "shelljs": "^0.2.6"
   },