Skip to content

Commit

Permalink
Revert "merge devel branch"
Browse files Browse the repository at this point in the history
  • Loading branch information
@andras-tim
andras-tim committed Aug 29, 2015
1 parent 0208ee9 commit caf1768
Show file tree
Hide file tree
Showing 15 changed files with 137 additions and 156 deletions.
2 changes: 1 addition & 1 deletion client/app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div ng-include="'partials/footer.html'"></div>

<script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/lodash/lodash.min.js"></script>
<script src="bower_components/lodash/dist/lodash.min.js"></script>
<script src="bower_components/angular/angular.min.js"></script>

<script src="bower_components/angular-route/angular-route.min.js"></script>
Expand Down
83 changes: 36 additions & 47 deletions client/app/js/src/controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var appControllers = angular.module('appControllers', []);

appControllers.controller('CommonController', ['$scope', 'ConfigFactory', 'PageFactory', 'SessionFactory',
'CommonFactory',
function CommonController ($scope, ConfigFactory, PageFactory, SessionFactory, CommonFactory) {
function ($scope, ConfigFactory, PageFactory, SessionFactory, CommonFactory) {
$scope.isAuthenticated = SessionFactory.isAuthenticated;

ConfigFactory.getConfig().then(function (config) {
Expand All @@ -17,9 +17,9 @@ appControllers.controller('CommonController', ['$scope', 'ConfigFactory', 'PageF


appControllers.controller('MainMenuController', ['$scope', 'gettextCatalog', 'ConfigFactory', 'CommonFactory',
function MainMenuController ($scope, gettextCatalog, ConfigFactory, CommonFactory) {
function ($scope, gettextCatalog, ConfigFactory, CommonFactory) {
function initializeLanguages() {
var languages = [
$scope.languages = [
{
'language': 'en',
'title': 'English',
Expand All @@ -30,17 +30,13 @@ appControllers.controller('MainMenuController', ['$scope', 'gettextCatalog', 'Co
}
];

function getCurrentLanguage() {
$scope.getCurrentLanguage = function getCurrentLanguage () {
return gettextCatalog.currentLanguage;
}
};

function changeLanguage(lang) {
$scope.changeLanguage = function changeLanguage (lang) {
gettextCatalog.setCurrentLanguage(lang);
}

$scope.languages = languages;
$scope.getCurrentLanguage = getCurrentLanguage;
$scope.changeLanguage = changeLanguage;
};
}

ConfigFactory.getConfig().then(function (config) {
Expand All @@ -52,23 +48,21 @@ appControllers.controller('MainMenuController', ['$scope', 'gettextCatalog', 'Co


appControllers.controller('UserMenuController', ['$scope', '$location', 'SessionFactory', 'CommonFactory',
function UserMenuController ($scope, $location, SessionFactory, CommonFactory) {
function logout() {
function ($scope, $location, SessionFactory, CommonFactory) {
$scope.logout = function () {
CommonFactory.handlePromise(
SessionFactory.logout(),
null,
function () {
$location.path('/login');
});
}

$scope.logout = logout;
};
}]);


appControllers.controller('LoginController', ['$scope', '$location', 'SessionFactory', 'CommonFactory',
function LoginController ($scope, $location, SessionFactory, CommonFactory) {
function login() {
function ($scope, $location, SessionFactory, CommonFactory) {
$scope.login = function () {
$scope.$broadcast('show-errors-check-validity');
if (!$scope.userForm.$valid) {
return;
Expand All @@ -81,15 +75,14 @@ appControllers.controller('LoginController', ['$scope', '$location', 'SessionFac
$scope.userForm.$setPristine();
$location.path('/');
});
}
};

$scope.user = {'username': '', 'password': '', 'remember': false};
$scope.login = login;
$scope.user = { username: '', password: '', remember: false };
}]);


appControllers.controller('ItemsController', ['$scope', 'ItemService', 'CommonFactory',
function ItemsController ($scope, ItemService, CommonFactory) {
function ($scope, ItemService, CommonFactory) {
CommonFactory.handlePromise(
ItemService.getList(),
null,
Expand All @@ -100,24 +93,37 @@ appControllers.controller('ItemsController', ['$scope', 'ItemService', 'CommonFa


appControllers.controller('ItemController', ['$scope', 'Restangular', 'VendorService', 'UnitService', 'CommonFactory',
function ItemController ($scope, Restangular, VendorService, UnitService, CommonFactory) {
function isFilled(modelRef) {
function ($scope, Restangular, VendorService, UnitService, CommonFactory) {
CommonFactory.handlePromise(
VendorService.getList(),
null,
function (vendors) {
$scope.vendors = vendors;
});

CommonFactory.handlePromise(
UnitService.getList(),
null,
function (units) {
$scope.units = units;
});

$scope.isFilled = function (modelRef) {
return typeof modelRef === 'object';
}
};

function createVendor() {
$scope.createVendor = function () {
var completedNewVendor = {'name': $scope.vendor};

CommonFactory.handlePromise(
VendorService.post(Restangular.copy(completedNewVendor)),
'creatingVendor',
function (resp) {
$scope.vendors.push(resp);
$scope.vendor = resp;
});
}
};

function createUnit() {
$scope.createUnit = function () {
var completedNewUnit = { 'unit': $scope.unit };

CommonFactory.handlePromise(
Expand All @@ -127,23 +133,6 @@ appControllers.controller('ItemController', ['$scope', 'Restangular', 'VendorSer
$scope.units.push(resp);
$scope.unit = resp;
});
}

CommonFactory.handlePromise(
VendorService.getList(),
null,
function (vendors) {
$scope.vendors = vendors;
});

CommonFactory.handlePromise(
UnitService.getList(),
null,
function (units) {
$scope.units = units;
});
};

$scope.isFilled = isFilled;
$scope.createVendor = createVendor;
$scope.createUnit = createUnit;
}]);
94 changes: 45 additions & 49 deletions client/app/js/src/directives.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,48 @@
var appDirectives = angular.module('appDirectives', []);


appDirectives.directive('appSpinner',
function appSpinner () {
return {
restrict: 'A',
scope: {
appSpinner: '='
},
template: ' <i ng-if="appSpinner" class="fa fa-spinner fa-pulse"></i>'
};
});


appDirectives.directive('appPageInput',
function appPager () {
return {
restrict: 'E',
template: '<input type="text" class="select-page" ng-model="inputPage" ng-change="selectPage(inputPage)">',
link: function (scope) {
scope.$watch('currentPage', function (newValue) {
scope.inputPage = newValue;
});
}
};
});


appDirectives.directive('appDetailsModal',
function appDetailsModal () {
return {
restrict: 'A',
transclude: true,
replace: true,
scope: true,
templateUrl: 'partials/widgets/details_modal.html'
};
});


appDirectives.directive('appDetailsModalNavbar',
function appDetailsModalNavbar () {
return {
require: '^appDetailsModal',
restrict: 'A',
transclude: true,
replace: true,
scope: true,
templateUrl: 'partials/widgets/details_modal_navbar.html'
};
});
appDirectives.directive('appSpinner', function () {
return {
restrict: 'A',
scope: {
spinning: '=appSpinner'
},
templateUrl: 'partials/widgets/spinner.html'
};
});


appDirectives.directive('appPager', function () {
return {
restrict: 'E',
template: '<input type="text" class="select-page" ng-model="inputPage" ng-change="selectPage(inputPage)">',
link: function (scope) {
scope.$watch('currentPage', function (newValue) {
scope.inputPage = newValue;
});
}
};
});


appDirectives.directive('appDetailsModal', function () {
return {
restrict: 'A',
transclude: true,
replace: true,
scope: true,
templateUrl: 'partials/widgets/details_modal.html'
};
});


appDirectives.directive('appDetailsModalNavbar', function () {
return {
require: '^appDetails',
restrict: 'A',
transclude: true,
replace: true,
scope: true,
templateUrl: 'partials/widgets/details_modal_navbar.html'
};
});
8 changes: 4 additions & 4 deletions client/app/js/src/factories.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var appFactories = angular.module('appFactories', []);


appFactories.factory('CommonFactory', ['$rootScope', '$alert', '$log', 'gettextCatalog', 'ConfigFactory',
function CommonFactory ($rootScope, $alert, $log, gettextCatalog, ConfigFactory) {
function ($rootScope, $alert, $log, gettextCatalog, ConfigFactory) {
function showErrorPopup(title, content) {
$alert({
title: title,
Expand Down Expand Up @@ -63,7 +63,7 @@ appFactories.factory('CommonFactory', ['$rootScope', '$alert', '$log', 'gettextC


appFactories.factory('ConfigFactory', ['$q', 'Restangular', 'ConfigService',
function ConfigFactory ($q, Restangular, ConfigService) {
function ($q, Restangular, ConfigService) {
var config = {
app_name: undefined,
app_title: undefined,
Expand Down Expand Up @@ -94,7 +94,7 @@ appFactories.factory('ConfigFactory', ['$q', 'Restangular', 'ConfigService',


appFactories.factory('PageFactory', ['ConfigFactory',
function PageFactory (ConfigFactory) {
function (ConfigFactory) {
var appTitle,
windowTitle = '';

Expand Down Expand Up @@ -128,7 +128,7 @@ appFactories.factory('PageFactory', ['ConfigFactory',


appFactories.factory('SessionFactory', ['$q', 'Restangular', 'SessionService', 'CommonFactory',
function SessionFactory ($q, Restangular, SessionService, CommonFactory) {
function ($q, Restangular, SessionService, CommonFactory) {
var session = {},
initialized = false;

Expand Down
21 changes: 9 additions & 12 deletions client/app/js/src/filters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ var appFilters = angular.module('appFilters', []);


appFilters.filter('setTitle', ['PageFactory',
function setTitle (PageFactory) {
function (PageFactory) {
return function (title) {
PageFactory.setPageTitle(title);
return title;
};
}]);


appFilters.filter('isContainedInNested', ['$parse', '$filter',
function isContainedInNested ($parse, $filter) {
appFilters.filter('nestedIsContained', ['$parse', '$filter',
function ($parse, $filter) {
function filterInAllFields(items, filters) {
var filter = $filter('filter');
return filter(items, {'$': filters.$});
var f = $filter('filter');
return f(items, {'$': filters.$});
}

function filter(items, filters) {
return function (items, filters) {
var itemsLeft;
if ('$' in filters) {
itemsLeft = filterInAllFields(items, filters);
Expand All @@ -31,18 +31,15 @@ appFilters.filter('isContainedInNested', ['$parse', '$filter',
if (model === '$') {
return false;
}

var expected = filters[model].name.toLowerCase(),
var expected = filters[model].toLowerCase(),
getter = $parse(model);

itemsLeft = itemsLeft.filter(function (item) {
var actual = getter(item);
return actual.name.toLowerCase().indexOf(expected) !== -1;
return actual.toLowerCase().indexOf(expected) !== -1;
});
});

return itemsLeft;
}

return filter;
};
}]);

0 comments on commit caf1768

Please sign in to comment.