Commit 8c40c5eb authored by Evren Kutar's avatar Evren Kutar

dosyalar okunabilirlik prensibine göre düzenlendi

parent 7ef6d9b3
......@@ -28,7 +28,7 @@ var app = angular.module(
* the lines below are config of oclazyload
* turn debug false when production
*/
config(['$ocLazyLoadProvider', function($ocLazyLoadProvider) {
config(['$ocLazyLoadProvider', function ($ocLazyLoadProvider) {
$ocLazyLoadProvider.config({
// todo: turn debug false on prod
debug: true
......@@ -38,11 +38,11 @@ var app = angular.module(
* RESTURL is the url of rest api to talk
* Based on the environment it changes from dev to prod
*/
constant("RESTURL", (function(){
constant("RESTURL", (function () {
var dev = "http://127.0.0.1:3000/api/";
var prod = "";
var ENV = "dev"; // change to prod in production
return ENV =="dev" ? {url:dev} : {url:prod};
return ENV == "dev" ? {url: dev} : {url: prod};
//return "http://127.0.0.1:3000/api/";
})()).
/**
......
......@@ -15,15 +15,15 @@ auth.factory('LoginService', function ($http, $rootScope, $location, $log, $cook
loginService.login = function (credentials) {
// TODO: change this getParams var to service to use app-wide
var getParams = "?";
for (var k in credentials){
getParams += k+"="+credentials[k]+"&";
for (var k in credentials) {
getParams += k + "=" + credentials[k] + "&";
}
return $http
.get(RESTURL.url + 'login' + getParams)
.then(function (res) {
$log.info(res.data[0]);
res.data = res.data[0];
if (res.data.success){
if (res.data.success) {
$rootScope.loggedInUser = true;
$location.path("/dashboard");
var session = Session.create(res.data.id, res.data.user.id,
......@@ -48,7 +48,7 @@ auth.factory('LoginService', function ($http, $rootScope, $location, $log, $cook
loginService.indexOf(Session.userRole) !== -1);
};
loginService.isValidEmail = function(email){
loginService.isValidEmail = function (email) {
var re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
return re.test(email);
};
......
......@@ -54,22 +54,28 @@ describe('zaerp.auth module', function () {
}])
);
it('ensures user can log in', function() {
it('ensures user can log in', function () {
// todo: after backend api ready implement this
});
it('should get login success',
inject(function(LoginService, $httpBackend, $location, RESTURL) {
inject(function (LoginService, $httpBackend, $location, RESTURL) {
// use httpBackend to imitate login api
$httpBackend.expectGET(RESTURL.url + 'login?email=test@test.com&password=password&')
// todo: with real api change response data from list to obj
.respond(200, [{'id': 1, 'user': {'id': 12, 'role': 'admin'}, 'success': true}]);
.respond(200, [{
'id': 1, 'user': {
'id': 12
, 'role': 'admin'
}, 'success': true
}]);
var cred = {email: 'test@test.com', password: 'password'};
LoginService.login(cred)
.then(function(data) {
.then(function (data) {
expect(data).not.toBe(null);
// after login path need to be change dashboard
expect($location.path()).toBe('/dashboard');
......
......@@ -8,7 +8,7 @@
'use strict';
var staff = angular.module('zaerp.staff',['ngRoute','schemaForm', 'formService']);
var staff = angular.module('zaerp.staff', ['ngRoute', 'schemaForm', 'formService']);
/**
......@@ -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('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $routeParams) {
Generator.get_form('add_staff', $routeParams).then(function (d) {
$scope.schema = d.schema;
$scope.form = d.form;
$scope.model = d.model ? d.model : {};
......@@ -29,7 +29,7 @@ staff.controller('StaffAddEditCtrl', function($scope, $http, $log, Generator, $r
}
);
});
$scope.onSubmit = function(form){
$scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate');
if (form.$valid) {
// todo: implement form diff here
......
......@@ -12,7 +12,7 @@ describe('staff controller module', function () {
var $controller;
beforeEach(inject(function(_$controller_){
beforeEach(inject(function (_$controller_) {
$controller = _$controller_;
}));
......
......@@ -16,7 +16,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL
return form_items;
};
generator.get_form = function (url, getParams) {
if (getParams){
if (getParams) {
// if form for edit then url will be
var params = "";
for (var k in getParams) {
......@@ -37,7 +37,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL
// todo: cover all other exceptions (4xx, 5xx)
});
};
generator.isValidEmail = function(email){
generator.isValidEmail = function (email) {
var re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
return re.test(email);
};
......@@ -58,7 +58,9 @@ form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL
$scope.$broadcast('schemaFormValidate');
//if ($scope.form.$valid) {
// todo: change post url, this is not correct!
$http.post('http://127.0.0.1:3000/api/add_student', $scope.model).then(function(res){$log.info(res);});
$http.post('http://127.0.0.1:3000/api/add_student', $scope.model).then(function (res) {
$log.info(res);
});
//}
};
return generator;
......
......@@ -18,7 +18,11 @@ describe('form service module', function () {
function (Generator) {
expect(Generator.generate).not.toBe(null);
var form_json = {email: 'test@test.com', id: 2, name: 'travolta'};
var form_json = {
email: 'test@test.com',
id: 2,
name: 'travolta'
};
var form_generated = Generator.generate(form_json);
expect(form_generated).toEqual(form_json);
......@@ -26,24 +30,29 @@ describe('form service module', function () {
);
it('should group form', inject(['Generator',
function(Generator){
function (Generator) {
expect(Generator.group).not.toBe(null);
var group_json = {group_objects : {1:['email', 'name'], 2:['password']}};
var group_json = {
group_objects: {
1: ['email', 'name'],
2: ['password']
}
};
var grouped_form = Generator.group(group_json);
expect(grouped_form).toEqual(group_json);
}])
);
it('should get form',
inject(function(Generator, $httpBackend, RESTURL) {
inject(function (Generator, $httpBackend, RESTURL) {
$httpBackend.expectGET(RESTURL.url + 'student/add?email=test@test.com&')
.respond(200, [{form: 'form'}]);
var cred = {email: 'test@test.com'};
Generator.get_form('student/add', cred)
.then(function(data) {
.then(function (data) {
expect(data).toEqual({form: 'form'});
});
......
......@@ -13,7 +13,7 @@
*/
var general = angular.module('general', []);
general.factory('FormDiff', function(){
general.factory('FormDiff', function () {
/**
* function to return diff of models of submitted form
* @type {{}}
......
......@@ -19,17 +19,17 @@ describe('general module', function () {
// test cases - testing for success
var same_json = [
{email:'test@test.com', id:2, name:'travolta'},
{email:'test@test.com', id:2, name:'travolta'}
{email: 'test@test.com', id: 2, name: 'travolta'},
{email: 'test@test.com', id: 2, name: 'travolta'}
];
// test cases - testing for failure
var different_json = [
{email:'test@test.com', id:2, name:'travolta'},
{email:'test1@test.com', id:2, name:'john'}
{email: 'test@test.com', id: 2, name: 'travolta'},
{email: 'test1@test.com', id: 2, name: 'john'}
];
var diff = {email:'test1@test.com', name:'john'};
var diff = {email: 'test1@test.com', name: 'john'};
var nodiff = {};
var same = FormDiff.get_diff(same_json[0], same_json[1]);
......
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