Style with jscs.
This commit is contained in:
parent
655d72d4ae
commit
e5721b3573
35
.jscsrc
Normal file
35
.jscsrc
Normal file
@ -0,0 +1,35 @@
|
||||
{
|
||||
"preset": "google",
|
||||
"fileExtensions": [".js", "jscs"],
|
||||
|
||||
"requireSemicolons": true,
|
||||
"requireParenthesesAroundIIFE": true,
|
||||
"maximumLineLength": 120,
|
||||
"validateLineBreaks": "LF",
|
||||
"validateIndentation": 4,
|
||||
"disallowTrailingComma": true,
|
||||
"disallowUnusedParams": true,
|
||||
|
||||
"disallowSpacesInsideObjectBrackets": null,
|
||||
"disallowImplicitTypeConversion": ["string"],
|
||||
|
||||
"safeContextKeyword": "_this",
|
||||
|
||||
"jsDoc": {
|
||||
"checkAnnotations": "closurecompiler",
|
||||
"checkParamNames": true,
|
||||
"requireParamTypes": true,
|
||||
"checkRedundantParams": true,
|
||||
"checkReturnTypes": true,
|
||||
"checkRedundantReturns": true,
|
||||
"requireReturnTypes": true,
|
||||
"checkTypes": "capitalizedNativeCase",
|
||||
"checkRedundantAccess": true,
|
||||
"requireNewlineAfterDescription": true
|
||||
},
|
||||
|
||||
"excludeFiles": [
|
||||
"test/data/**",
|
||||
"patterns/*"
|
||||
]
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
// vim: set tw=80 ts=4 sw=4 sts=4:
|
||||
/*
|
||||
This file is part of Accountant.
|
||||
|
||||
@ -14,7 +15,6 @@
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||
'use strict';
|
||||
|
||||
angular.module('accountant.accounts', [
|
||||
@ -66,15 +66,19 @@ angular.module('accountant.accounts', [
|
||||
* overdraft.
|
||||
*/
|
||||
$scope.rowClass = function(account) {
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
if (!account || !account.authorized_overdraft || !account.current) {
|
||||
return;
|
||||
}
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
if (account.current < account.authorized_overdraft) {
|
||||
return 'danger';
|
||||
} else if (account.current < 0) {
|
||||
return 'warning';
|
||||
}
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
};
|
||||
|
||||
/*
|
||||
@ -85,11 +89,13 @@ angular.module('accountant.accounts', [
|
||||
return;
|
||||
}
|
||||
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
if (value < account.authorized_overdraft) {
|
||||
return 'text-danger';
|
||||
} else if (value < 0) {
|
||||
return 'text-warning';
|
||||
}
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
};
|
||||
|
||||
/*
|
||||
@ -97,7 +103,9 @@ angular.module('accountant.accounts', [
|
||||
*/
|
||||
$scope.add = function() {
|
||||
var account = new Account({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
authorized_overdraft: 0
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
|
||||
// Insert account at the begining of the array.
|
||||
@ -182,7 +190,9 @@ angular.module('accountant.accounts', [
|
||||
}
|
||||
|
||||
// Authorized overdraft is a positive integer but data is a negative integer.
|
||||
scope.data.authorized_overdraft = -scope.data.authorized_overdraft
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
scope.data.authorized_overdraft = -scope.data.authorized_overdraft;
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
|
||||
angular.copy(scope.data, scope.account);
|
||||
|
||||
@ -208,7 +218,9 @@ angular.module('accountant.accounts', [
|
||||
// Create new account if not passed in ng-model.
|
||||
if (!scope.account) {
|
||||
scope.account = new Account({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
authorized_overdraft: 0
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
}
|
||||
|
||||
@ -216,7 +228,9 @@ angular.module('accountant.accounts', [
|
||||
angular.copy(scope.account, scope.data);
|
||||
|
||||
// Authorized overdraft must be positive in form.
|
||||
scope.data.authorized_overdraft = -scope.data.authorized_overdraft
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
scope.data.authorized_overdraft = -scope.data.authorized_overdraft;
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
|
||||
// Open dialog with form.
|
||||
$ngBootbox.customDialog({
|
||||
@ -240,4 +254,5 @@ angular.module('accountant.accounts', [
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
);
|
||||
|
@ -1,3 +1,4 @@
|
||||
// vim: set tw=80 ts=4 sw=4 sts=4:
|
||||
/*
|
||||
This file is part of Accountant.
|
||||
|
||||
@ -14,7 +15,6 @@
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||
'use strict';
|
||||
|
||||
angular.module('accountant', [
|
||||
@ -33,8 +33,8 @@ angular.module('accountant', [
|
||||
var token = $storage.get('token');
|
||||
|
||||
if (token) {
|
||||
var token_type = $storage.get('token_type');
|
||||
var authorization = token_type + ' ' + token;
|
||||
var tokenType = $storage.get('token_type');
|
||||
var authorization = tokenType + ' ' + token;
|
||||
config.headers.Authorization = authorization;
|
||||
}
|
||||
|
||||
@ -71,7 +71,6 @@ angular.module('accountant', [
|
||||
.otherwise({
|
||||
redirectTo: '/accounts'
|
||||
});
|
||||
|
||||
}])
|
||||
|
||||
.config(['$storageProvider', function($storageProvider) {
|
||||
@ -128,9 +127,13 @@ angular.module('accountant', [
|
||||
).success(function(result) {
|
||||
// TODO Alexis Lahouze 2015-08-28 Handle callback.
|
||||
// Call to /api/login to retrieve the token
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
$storage.set('token_type', result.token_type);
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
$storage.set('token', result.token);
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
$storage.set('expiration_date', result.expiration_date);
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
|
||||
authService.loginConfirmed();
|
||||
});
|
||||
|
@ -1,3 +1,4 @@
|
||||
// vim: set tw=80 ts=4 sw=4 sts=4:
|
||||
/*
|
||||
This file is part of Accountant.
|
||||
|
||||
@ -14,7 +15,6 @@
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||
'use strict';
|
||||
|
||||
angular.module('accountant.operations', [
|
||||
@ -24,7 +24,7 @@ angular.module('accountant.operations', [
|
||||
'ngBootbox',
|
||||
'ui-notification',
|
||||
'mgcrea.ngStrap',
|
||||
'highcharts-ng',
|
||||
'highcharts-ng'
|
||||
])
|
||||
|
||||
.config(['$resourceProvider', function($resourceProvider) {
|
||||
@ -44,7 +44,9 @@ angular.module('accountant.operations', [
|
||||
function($resource, $routeParams) {
|
||||
return $resource(
|
||||
'/api/account/:account_id/ohlc', {
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
}
|
||||
);
|
||||
}])
|
||||
@ -53,7 +55,9 @@ angular.module('accountant.operations', [
|
||||
function($resource, $routeParams) {
|
||||
return $resource(
|
||||
'/api/account/:account_id/category', {
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
}
|
||||
);
|
||||
}])
|
||||
@ -62,7 +66,9 @@ angular.module('accountant.operations', [
|
||||
function($resource, $routeParams) {
|
||||
return $resource(
|
||||
'/api/account/:account_id/balance', {
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
}
|
||||
);
|
||||
}])
|
||||
@ -70,11 +76,9 @@ angular.module('accountant.operations', [
|
||||
/*
|
||||
* Controller for category chart.
|
||||
*/
|
||||
.controller(
|
||||
'CategoryChartController', [
|
||||
.controller('CategoryChartController', [
|
||||
'$rootScope', '$scope', '$http', 'Category', 'Balance',
|
||||
function($rootScope, $scope, $http, Category, Balance) {
|
||||
|
||||
var colors = Highcharts.getOptions().colors;
|
||||
$scope.revenueColor = colors[2];
|
||||
$scope.expenseColor = colors[3];
|
||||
@ -128,7 +132,7 @@ angular.module('accountant.operations', [
|
||||
dataLabels: {
|
||||
formatter: function() {
|
||||
return this.point.name !== null && this.percentage >= 2.5 ? this.point.name : null;
|
||||
},
|
||||
}
|
||||
}
|
||||
}]
|
||||
};
|
||||
@ -147,7 +151,8 @@ angular.module('accountant.operations', [
|
||||
begin: begin.format('YYYY-MM-DD'),
|
||||
end: end.format('YYYY-MM-DD')
|
||||
}, function(data) {
|
||||
var expenses = [], revenues = [];
|
||||
var expenses = [];
|
||||
var revenues = [];
|
||||
|
||||
var expenseColor = $scope.brightenColor($scope.expenseColor);
|
||||
var revenueColor = $scope.brightenColor($scope.revenueColor);
|
||||
@ -193,7 +198,7 @@ angular.module('accountant.operations', [
|
||||
}, {
|
||||
name: 'Expenses',
|
||||
y: -balance.expenses,
|
||||
color: $scope.expenseColor,
|
||||
color: $scope.expenseColor
|
||||
}];
|
||||
});
|
||||
};
|
||||
@ -203,13 +208,13 @@ angular.module('accountant.operations', [
|
||||
$scope.load(args.begin, args.end);
|
||||
$scope.getBalance(args.begin, args.end);
|
||||
});
|
||||
}])
|
||||
}
|
||||
])
|
||||
|
||||
/*
|
||||
* Controller for the sold chart.
|
||||
*/
|
||||
.controller(
|
||||
'SoldChartController', [
|
||||
.controller('SoldChartController', [
|
||||
'$rootScope', '$scope', '$http', 'OHLC',
|
||||
function($rootScope, $scope, $http, OHLC) {
|
||||
// Configure chart for operations.
|
||||
@ -239,7 +244,7 @@ angular.module('accountant.operations', [
|
||||
type: 'all',
|
||||
text: 'All'
|
||||
}],
|
||||
selected: 0,
|
||||
selected: 0
|
||||
},
|
||||
navigator: {
|
||||
enabled: true
|
||||
@ -310,7 +315,9 @@ angular.module('accountant.operations', [
|
||||
|
||||
angular.forEach(data, function(operation) {
|
||||
$scope.config.series[0].data.push([
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
moment.utc(operation.operation_date).valueOf(),
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
operation.open, operation.high, operation.low, operation.close
|
||||
]);
|
||||
});
|
||||
@ -336,18 +343,20 @@ angular.module('accountant.operations', [
|
||||
|
||||
// Update authorized overdraft on account loading.
|
||||
$rootScope.$on('accountLoadedEvent', function(e, account) {
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
$scope.config.yAxis.plotLines[1].value = account.authorized_overdraft;
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
|
||||
// Select beginning and end of month.
|
||||
$scope.loadSolds();
|
||||
}])
|
||||
}
|
||||
])
|
||||
|
||||
/*
|
||||
* Controller for the operations.
|
||||
*/
|
||||
.controller(
|
||||
'OperationController', [
|
||||
.controller('OperationController', [
|
||||
'$scope', '$rootScope', '$routeParams', '$ngBootbox', 'Notification', 'Account', 'Operation',
|
||||
function($scope, $rootScope, $routeParams, $ngBootbox, Notification, Account, Operation) {
|
||||
// List of operations.
|
||||
@ -358,7 +367,9 @@ angular.module('accountant.operations', [
|
||||
*/
|
||||
$scope.add = function() {
|
||||
var operation = new Operation({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
|
||||
$scope.operations.splice(0, 0, operation);
|
||||
@ -369,7 +380,9 @@ angular.module('accountant.operations', [
|
||||
*/
|
||||
$scope.load = function(begin, end) {
|
||||
$scope.operations = Operation.query({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId,
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
begin: begin.format('YYYY-MM-DD'),
|
||||
end: end.format('YYYY-MM-DD')
|
||||
});
|
||||
@ -463,10 +476,10 @@ angular.module('accountant.operations', [
|
||||
$rootScope.$on('rangeSelectedEvent', function(e, args) {
|
||||
$scope.load(args.begin, args.end);
|
||||
});
|
||||
}])
|
||||
}
|
||||
])
|
||||
|
||||
.directive(
|
||||
'operationFormDialog', function($ngBootbox) {
|
||||
.directive('operationFormDialog', function($ngBootbox) {
|
||||
return {
|
||||
restrict: 'A',
|
||||
scope: {
|
||||
|
@ -1,3 +1,4 @@
|
||||
// vim: set tw=80 ts=4 sw=4 sts=4:
|
||||
/*
|
||||
This file is part of Accountant.
|
||||
|
||||
@ -14,7 +15,6 @@
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||
'use strict';
|
||||
|
||||
angular.module('accountant.scheduler', [
|
||||
@ -38,8 +38,7 @@ angular.module('accountant.scheduler', [
|
||||
);
|
||||
}])
|
||||
|
||||
.controller(
|
||||
'SchedulerController', [
|
||||
.controller('SchedulerController', [
|
||||
'$scope', '$rootScope', '$routeParams', '$ngBootbox', 'Notification', 'ScheduledOperation',
|
||||
function($scope, $rootScope, $routeParams, $ngBootbox, Notification, ScheduledOperation) {
|
||||
// Operation store.
|
||||
@ -50,7 +49,9 @@ angular.module('accountant.scheduler', [
|
||||
*/
|
||||
$scope.add = function() {
|
||||
var operation = new ScheduledOperation({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
|
||||
// Insert new operation at the beginning of the array.
|
||||
@ -62,7 +63,9 @@ angular.module('accountant.scheduler', [
|
||||
*/
|
||||
$scope.load = function() {
|
||||
$scope.operations = ScheduledOperation.query({
|
||||
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||
account_id: $routeParams.accountId
|
||||
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
|
||||
});
|
||||
};
|
||||
|
||||
@ -118,4 +121,5 @@ angular.module('accountant.scheduler', [
|
||||
|
||||
// Load operations on controller initialization.
|
||||
$scope.load();
|
||||
}]);
|
||||
}
|
||||
]);
|
||||
|
@ -1,7 +1,6 @@
|
||||
module.exports = {
|
||||
options: {
|
||||
config: '.jscsrc',
|
||||
verbose: true
|
||||
config: '.jscsrc'
|
||||
},
|
||||
frontend_js: [
|
||||
'<%= accountant.frontend.src %>/js/*.js'
|
||||
|
Loading…
Reference in New Issue
Block a user