Skip to content

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

Merge branch 'Feature/issue34'

parents 22e4a979 308715bd
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 30 deletions
app/components/crud/crud_controller.js
View file @ a5fdb461
......@@ -14,7 +14,7 @@ var crud = angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formSe
*/
crud.service('CrudUtility', function () {
return {
generateParam: function (scope, routeParams) {
generateParam: function (scope, routeParams, cmd) {
// define api request url path
scope.url = routeParams.wf;
angular.forEach(routeParams, function (value, key) {
......@@ -24,6 +24,7 @@ crud.service('CrudUtility', function () {
}
});
scope.form_params = {
cmd: cmd,
model: routeParams.model,
param: scope.param,
id: scope.param_id,
......@@ -44,6 +45,7 @@ crud.service('CrudUtility', function () {
*
*/
crud.controller('CRUDCtrl', function ($scope, $routeParams, Generator, CrudUtility) {
// get required params by calling CrudUtility.generateParam function
CrudUtility.generateParam($scope, $routeParams);
Generator.get_wf($scope);
});
......@@ -54,13 +56,10 @@ crud.controller('CRUDCtrl', function ($scope, $routeParams, Generator, CrudUtili
*/
crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $http, $log, $modal, $timeout, Generator, $routeParams, CrudUtility) {
CrudUtility.generateParam($scope, $routeParams);
$scope.form_params['cmd'] = 'form';
CrudUtility.generateParam($scope, $routeParams, 'form');
// get form with generator
if ($routeParams.pageData) {
console.log(Generator.getPageData());
Generator.generate($scope, Generator.getPageData());
} else {
Generator.get_form($scope);
......@@ -80,8 +79,7 @@ crud.controller('CRUDAddEditCtrl', function ($scope, $rootScope, $location, $htt
*/
crud.controller('CRUDListCtrl', function ($scope, $rootScope, Generator, $routeParams, CrudUtility) {
CrudUtility.generateParam($scope, $routeParams);
$scope.form_params['cmd'] = 'list';
CrudUtility.generateParam($scope, $routeParams, 'list');
if ($routeParams.pageData) {
var pageData = Generator.getPageData();
......@@ -100,20 +98,29 @@ crud.controller('CRUDListCtrl', function ($scope, $rootScope, Generator, $routeP
* CRUD Show Controller
*/
crud.controller('CRUDShowCtrl', function ($scope, $rootScope, $location, Generator, $routeParams, CrudUtility) {
CrudUtility.generateParam($scope, $routeParams);
$scope.form_params['cmd'] = 'show';
// call generator's get_single_item func
Generator.get_single_item($scope).then(function (res) {
$scope.listobjects = {};
$scope.object = res.data.object;
CrudUtility.generateParam($scope, $routeParams, 'show');
// todo: refactor createListObjects func
var createListObjects = function () {
angular.forEach($scope.object, function (value, key) {
if (typeof value == 'object') {
$scope.listobjects[key] = value;
delete $scope.object[key];
}
});
};
$scope.listobjects = {};
if ($routeParams.pageData) {
var pageData = Generator.getPageData();
$scope.object = pageData.object;
}
else {
// call generator's get_single_item func
Generator.get_single_item($scope).then(function (res) {
$scope.object = res.data.object;
$scope.model = $routeParams.model;
});
}
createListObjects();
});
\ No newline at end of file
app/components/crud/templates/list.html
View file @ a5fdb461
......@@ -19,8 +19,8 @@
Hepsini Seç
</label>
</td>
<td ng-repeat="value in objects[0]" ng-if="objects[0]!='-1' && !$last">{{ value }}</td>
<td ng-if="objects[0]=='-1'">{{ model }}</td>
<td ng-repeat="value in objects[0]" ng-if="objects[0]!='-1'">{{ value }}</td>
<td ng-if="objects[0]=='-1'">{{ model || wf }}</td>
<td>action</td>
</tr>
</thead>
......@@ -37,9 +37,9 @@
<a ng-href="{{object.detailLink}}">{{field}}</a>
</td>
<td ng-repeat="(key,value) in object.fieldset track by $index" ng-if="objects[0]!='-1'">
<a ng-href="{{object.detailLink}}" ng-if="$index==1">{{object.fields}}</a>
<span ng-if="$index!=1">{{object[key]}}</span>
<td ng-repeat="field in object.fields track by $index" ng-if="objects[0]!='-1'">
<a ng-href="{{object.detailLink}}" ng-if="$index==1">{{field}}</a>
<span ng-if="$index!=1">{{field}}</span>
</td>
<td>
<a ng-href="{{object.editLink}}">Edit</a>
......
app/components/version/version_test.js
View file @ a5fdb461
......@@ -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.1.0');
expect(version).toEqual('0.4.1');
}));
});
});
app/zetalib/forms/form_service.js
View file @ a5fdb461
......@@ -469,6 +469,11 @@ form_generator.factory('Generator', function ($http, $q, $timeout, $location, $c
redirectTo($scope, 'formwithlist');
}
if (client_cmd.indexOf('show') > -1) {
generator.setPageData(data);
redirectTo($scope, 'detail');
}
//todo: msgbox make it work
// if submit returns msgbox after save
//if (data.msgbox) {
......@@ -516,7 +521,9 @@ form_generator.factory('Generator', function ($http, $q, $timeout, $location, $c
return $http.post(generator.makeUrl($scope), data)
.success(function (data) {
if (data.client_cmd) {
generator.pathDecider(data.client_cmd, $scope, data);
}
});
};
return generator;
......
app/zetalib/forms/form_service_test.js
View file @ a5fdb461
......@@ -11,6 +11,10 @@ describe('form service module', function () {
beforeEach(module('ulakbus'));
beforeEach(module('formService'));
var location;
beforeEach(inject(function($location) {
location = $location;
}));
describe('form service', function () {
......@@ -18,7 +22,7 @@ describe('form service module', function () {
function (Generator) {
expect(Generator.group).not.toBe(null);
var generated_url = Generator.makeUrl({url: 'test', form_params: {}});
expect(generated_url).toEqual("http://api.ulakbus.net/test");
expect(generated_url).toEqual("http://api.ulakbus.net/test/");
}])
);
......@@ -110,7 +114,7 @@ describe('form service module', function () {
function (Generator) {
expect(Generator.dateformatter).not.toBe(null);
var generated_date = Generator.dateformatter('2001-01-01T01:00:00Z');
expect(generated_date).toEqual('1.0.2001');
expect(generated_date).toEqual('1.1.2001');
}])
);
......@@ -132,7 +136,7 @@ describe('form service module', function () {
it('should get form',
inject(function (Generator, $httpBackend, RESTURL) {
$httpBackend.expectPOST(RESTURL.url + 'add_student', {cmd: 'add'})
$httpBackend.expectPOST(RESTURL.url + 'add_student/', {cmd: 'add'})
.respond(200, {
forms: {
schema: {
......@@ -184,7 +188,7 @@ describe('form service module', function () {
});
var cred = {cmd: 'list', model: "personel", object_id: "5821bc25a90aa1"};
Generator.get_list({url: 'test/', form_params: cred})
Generator.get_list({url: 'test', form_params: cred})
.then(function (data) {
expect(data.data.items.token).toEqual("0122b2843f504c15821bc25a90aa1370");
});
......@@ -210,7 +214,7 @@ describe('form service module', function () {
});
var cred = {cmd: 'show', model: 'personel', param: 'personel_id', id: '123'};
Generator.get_single_item({url: 'test/', form_params: cred})
Generator.get_single_item({url: 'test', form_params: cred})
.then(function (data) {
expect(data.data.items.token).toEqual("da73993f439549e7855fd82deafbbc99");
});
......@@ -229,7 +233,7 @@ describe('form service module', function () {
model: {email: 'test@test.com'},
form_params: {cmd: 'add', model: 'testmodel'},
token: '123456',
url: 'student/add/'
url: 'student/add'
};
Generator.submit(scope)
.success(function(){
......@@ -294,6 +298,97 @@ describe('form service module', function () {
}
})
);
it('should get wf and redirect according to client_cmd',
inject(function (Generator, $httpBackend, RESTURL) {
$httpBackend.expectPOST(RESTURL.url + 'test/testModel?test=xyz123')
.respond(200, {
"client_cmd": "form",
"object": {
"ad": "name",
"soyad": "lastname",
},
forms: {
schema: {
type: "object",
properties: {
name: {type: "string", minLength: 2, title: "Name", description: "Name or alias"},
title: {
type: "string",
enum: ['dr', 'jr', 'sir', 'mrs', 'mr', 'NaN', 'dj']
}
}
},
form: [
"*",
{
type: "submit",
title: "Save"
}
],
model: {}
},
"token": "da73993f439549e7855fd82deafbbc99",
"is_login": true
});
console.log(32131);
scope.url = 'test';
scope.form_params = {
param: 'test',
id:'xyz123',
model:'testModel',
object_id: 'xxx11',
wf:'testModel'};
Generator.get_wf(scope);
$httpBackend.flush();
expect(location.path()).toEqual('/testModel/testModel/add');
})
);
});
describe('form service', function () {
var location, rootScope, scope, ctrl;
beforeEach(inject(function($location, $rootScope) {
location = $location;
rootScope = $rootScope;
scope = $rootScope.$new();
ctrl = $controller("CRUDCtrl", {$scope: scope});
}));
it('should generate itemlinks of objects in response data',
inject(function (Generator) {
var responseObject = {
"objects": [
"-1",
{
"fields": ["test object"],
"actions": [{"cmd": "delete", "name": "Sil"}, {"wf": "manage_permissions", "name": "Yetkilendir", "mode": "modal"}],
"do_list": true,
"key": "xx10"},
{
"fields": ["test object 2"],
"actions": [{"cmd": "delete", "name": "Sil"}, {"wf": "manage_permissions", "name": "Yetkilendir", "mode": "modal"}],
"do_list": true,
"key": "xx11"}
]
};
scope.url = 'test';
scope.form_params = {
param: 'test',
id:'xyz123',
model:'testModel',
object_id: 'xxx11',
wf:'testModel'};
Generator.itemLinksGenerator(scope, responseObject);
expect(responseObject.objects[1].detailLink).toEqual('#test/testModel/detail/xx10?test=xyz123');
})
);
});
......
karma.conf.js
View file @ a5fdb461
......@@ -32,7 +32,7 @@ module.exports = function (config) {
'app/components/**/*.js'
],
autoWatch: true,
autoWatch: false,
frameworks: ['jasmine'],
......
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