Fix ESLint errors
This commit is contained in:
Jan Tuomi
+251
@@ -0,0 +1,251 @@
|
||||
{
|
||||
"env": {
|
||||
"browser": true
|
||||
},
|
||||
"globals": {
|
||||
"angular": 1,
|
||||
"noty": 1,
|
||||
"app": 1,
|
||||
"_": 1,
|
||||
"moment": 1
|
||||
},
|
||||
"extends": "eslint:recommended",
|
||||
"rules": {
|
||||
"no-unused-vars": "warn",
|
||||
"accessor-pairs": "error",
|
||||
"array-bracket-spacing": "off",
|
||||
"array-callback-return": "error",
|
||||
"arrow-body-style": "error",
|
||||
"arrow-parens": "error",
|
||||
"arrow-spacing": "error",
|
||||
"block-scoped-var": "off",
|
||||
"block-spacing": "off",
|
||||
"brace-style": "off",
|
||||
"callback-return": "off",
|
||||
"camelcase": "off",
|
||||
"capitalized-comments": "off",
|
||||
"class-methods-use-this": "error",
|
||||
"comma-dangle": "off",
|
||||
"comma-spacing": "off",
|
||||
"comma-style": "off",
|
||||
"complexity": "off",
|
||||
"computed-property-spacing": "off",
|
||||
"consistent-return": "off",
|
||||
"consistent-this": "off",
|
||||
"curly": "off",
|
||||
"default-case": "off",
|
||||
"dot-location": [
|
||||
"error",
|
||||
"property"
|
||||
],
|
||||
"dot-notation": "off",
|
||||
"eol-last": "off",
|
||||
"eqeqeq": "off",
|
||||
"func-call-spacing": "error",
|
||||
"func-name-matching": "error",
|
||||
"func-names": "off",
|
||||
"func-style": "off",
|
||||
"generator-star-spacing": "error",
|
||||
"global-require": "off",
|
||||
"guard-for-in": "off",
|
||||
"handle-callback-err": "off",
|
||||
"id-blacklist": "error",
|
||||
"id-length": "off",
|
||||
"id-match": "error",
|
||||
"indent": "off",
|
||||
"init-declarations": "off",
|
||||
"jsx-quotes": "error",
|
||||
"key-spacing": "off",
|
||||
"keyword-spacing": "off",
|
||||
"line-comment-position": "off",
|
||||
"linebreak-style": "off",
|
||||
"lines-around-comment": "off",
|
||||
"lines-around-directive": "off",
|
||||
"max-depth": "off",
|
||||
"max-len": "off",
|
||||
"max-lines": "off",
|
||||
"max-nested-callbacks": "error",
|
||||
"max-params": "off",
|
||||
"max-statements": "off",
|
||||
"max-statements-per-line": "off",
|
||||
"multiline-ternary": "off",
|
||||
"new-parens": "off",
|
||||
"newline-after-var": "off",
|
||||
"newline-before-return": "off",
|
||||
"newline-per-chained-call": "off",
|
||||
"no-alert": "error",
|
||||
"no-array-constructor": "off",
|
||||
"no-await-in-loop": "error",
|
||||
"no-bitwise": "off",
|
||||
"no-caller": "error",
|
||||
"no-catch-shadow": "off",
|
||||
"no-confusing-arrow": "error",
|
||||
"no-constant-condition": [
|
||||
"error",
|
||||
{
|
||||
"checkLoops": false
|
||||
}
|
||||
],
|
||||
"no-continue": "off",
|
||||
"no-div-regex": "error",
|
||||
"no-duplicate-imports": "error",
|
||||
"no-else-return": "off",
|
||||
"no-empty-function": "off",
|
||||
"no-eq-null": "off",
|
||||
"no-eval": "error",
|
||||
"no-extend-native": "error",
|
||||
"no-extra-bind": "error",
|
||||
"no-extra-label": "error",
|
||||
"no-extra-parens": "off",
|
||||
"no-floating-decimal": "off",
|
||||
"no-implicit-coercion": [
|
||||
"error",
|
||||
{
|
||||
"boolean": false,
|
||||
"number": false,
|
||||
"string": false
|
||||
}
|
||||
],
|
||||
"no-implicit-globals": "off",
|
||||
"no-implied-eval": "error",
|
||||
"no-inline-comments": "off",
|
||||
"no-inner-declarations": [
|
||||
"error",
|
||||
"functions"
|
||||
],
|
||||
"no-invalid-this": "off",
|
||||
"no-iterator": "error",
|
||||
"no-label-var": "error",
|
||||
"no-labels": "error",
|
||||
"no-lone-blocks": "error",
|
||||
"no-lonely-if": "off",
|
||||
"no-loop-func": "error",
|
||||
"no-magic-numbers": "off",
|
||||
"no-mixed-operators": "off",
|
||||
"no-mixed-requires": "error",
|
||||
"no-multi-assign": "off",
|
||||
"no-multi-spaces": "off",
|
||||
"no-multi-str": "error",
|
||||
"no-multiple-empty-lines": "off",
|
||||
"no-native-reassign": "off",
|
||||
"no-negated-condition": "off",
|
||||
"no-negated-in-lhs": "error",
|
||||
"no-nested-ternary": "off",
|
||||
"no-new": "error",
|
||||
"no-new-func": "off",
|
||||
"no-new-object": "error",
|
||||
"no-new-require": "error",
|
||||
"no-new-wrappers": "error",
|
||||
"no-octal-escape": "error",
|
||||
"no-param-reassign": "off",
|
||||
"no-path-concat": "error",
|
||||
"no-plusplus": "off",
|
||||
"no-process-env": "error",
|
||||
"no-process-exit": "error",
|
||||
"no-proto": "error",
|
||||
"no-prototype-builtins": "off",
|
||||
"no-restricted-globals": "error",
|
||||
"no-restricted-imports": "error",
|
||||
"no-restricted-modules": "error",
|
||||
"no-restricted-properties": "error",
|
||||
"no-restricted-syntax": "error",
|
||||
"no-return-assign": "off",
|
||||
"no-return-await": "error",
|
||||
"no-script-url": "error",
|
||||
"no-self-compare": "error",
|
||||
"no-sequences": "off",
|
||||
"no-shadow": "off",
|
||||
"no-shadow-restricted-names": "error",
|
||||
"no-spaced-func": "error",
|
||||
"no-sync": "error",
|
||||
"no-tabs": "off",
|
||||
"no-template-curly-in-string": "error",
|
||||
"no-ternary": "off",
|
||||
"no-throw-literal": "off",
|
||||
"no-trailing-spaces": "off",
|
||||
"no-undef-init": "error",
|
||||
"no-undefined": "off",
|
||||
"no-underscore-dangle": "off",
|
||||
"no-unmodified-loop-condition": "error",
|
||||
"no-unneeded-ternary": [
|
||||
"error",
|
||||
{
|
||||
"defaultAssignment": true
|
||||
}
|
||||
],
|
||||
"no-unused-expressions": "off",
|
||||
"no-use-before-define": "off",
|
||||
"no-useless-call": "off",
|
||||
"no-useless-computed-key": "error",
|
||||
"no-useless-concat": "error",
|
||||
"no-useless-constructor": "error",
|
||||
"no-useless-escape": "off",
|
||||
"no-useless-rename": "error",
|
||||
"no-useless-return": "error",
|
||||
"no-var": "off",
|
||||
"no-void": "off",
|
||||
"no-warning-comments": "off",
|
||||
"no-whitespace-before-property": "error",
|
||||
"no-with": "error",
|
||||
"object-curly-newline": "off",
|
||||
"object-curly-spacing": "off",
|
||||
"object-property-newline": "off",
|
||||
"object-shorthand": "off",
|
||||
"one-var": "off",
|
||||
"one-var-declaration-per-line": "off",
|
||||
"operator-assignment": "off",
|
||||
"operator-linebreak": "off",
|
||||
"padded-blocks": "off",
|
||||
"prefer-arrow-callback": "off",
|
||||
"prefer-const": "error",
|
||||
"prefer-destructuring": [
|
||||
"error",
|
||||
{
|
||||
"array": false,
|
||||
"object": false
|
||||
}
|
||||
],
|
||||
"prefer-numeric-literals": "error",
|
||||
"prefer-promise-reject-errors": "error",
|
||||
"prefer-reflect": "off",
|
||||
"prefer-rest-params": "off",
|
||||
"prefer-spread": "off",
|
||||
"prefer-template": "off",
|
||||
"quote-props": "off",
|
||||
"quotes": "off",
|
||||
"radix": "off",
|
||||
"require-await": "error",
|
||||
"require-jsdoc": "off",
|
||||
"rest-spread-spacing": "error",
|
||||
"semi": "off",
|
||||
"semi-spacing": "off",
|
||||
"sort-imports": "error",
|
||||
"sort-keys": "off",
|
||||
"sort-vars": "off",
|
||||
"space-before-blocks": "off",
|
||||
"space-before-function-paren": "off",
|
||||
"space-in-parens": "off",
|
||||
"space-infix-ops": "off",
|
||||
"space-unary-ops": [
|
||||
"error",
|
||||
{
|
||||
"nonwords": false,
|
||||
"words": false
|
||||
}
|
||||
],
|
||||
"spaced-comment": "off",
|
||||
"strict": "off",
|
||||
"symbol-description": "error",
|
||||
"template-curly-spacing": "error",
|
||||
"unicode-bom": [
|
||||
"error",
|
||||
"never"
|
||||
],
|
||||
"valid-jsdoc": "off",
|
||||
"vars-on-top": "off",
|
||||
"wrap-iife": "off",
|
||||
"wrap-regex": "off",
|
||||
"yield-star-spacing": "error",
|
||||
"yoda": "off"
|
||||
}
|
||||
}
|
||||
@@ -44,10 +44,8 @@ app.service("InstanceList", ["$http", function($http){
|
||||
});
|
||||
}
|
||||
this.createRotation = function(name) {
|
||||
data = {'name': name}
|
||||
console.log(name)
|
||||
$http.post("/infoscreen/create_rotation", data).then(function(response) {
|
||||
});
|
||||
var data = {'name': name}
|
||||
$http.post("/infoscreen/create_rotation", data);
|
||||
}
|
||||
this.deleteRotation = function(id) {
|
||||
$http.delete("/infoscreen/delete_rotation/" + id).then(function(response) {
|
||||
@@ -145,7 +143,6 @@ app.controller('infoadmin_hslitem_create', function($scope, $http,ItemList){
|
||||
|
||||
app.controller('infoadmin_image_create', ['$scope', 'Upload', '$timeout',"ItemList", function ($scope, Upload, $timeout,ItemList) {
|
||||
$scope.send = function(file) {
|
||||
console.log("name: "+$scope.imagename);
|
||||
file.upload = Upload.upload({
|
||||
url: '/infoscreen/create_image',
|
||||
data: {name: $scope.imagename, image: file},
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
var activescope;
|
||||
var app = angular.module('infoApp', ['ngAnimate', 'ngRoute', 'monospaced.qrcode']);
|
||||
app.controller('infoscreen_main', function($scope,$http,$timeout){
|
||||
var templates = [];
|
||||
@@ -30,7 +29,7 @@ app.controller('infoscreen_main', function($scope,$http,$timeout){
|
||||
$scope.active = {
|
||||
template: temp.item.template_url,
|
||||
onload: function(){
|
||||
for (key in temp.item.options){
|
||||
for (var key in temp.item.options){
|
||||
$scope[key] = temp.item.options[key]
|
||||
}
|
||||
}
|
||||
@@ -92,60 +91,73 @@ app.controller('timetableCtrl',
|
||||
objects=data['data'];
|
||||
for(var objectIndex in objects){
|
||||
var stop = objects[objectIndex];
|
||||
for(var lineIndex in stop['lines']){
|
||||
|
||||
var lineIndex;
|
||||
for (lineIndex in stop['lines']){
|
||||
var elem=stop['lines'][lineIndex].split(":");
|
||||
dict[elem[0]]=elem[1];
|
||||
}
|
||||
for(var lineIndex in stop['departures']){
|
||||
for (lineIndex in stop['departures']){
|
||||
var line = stop['departures'][lineIndex];
|
||||
var time=line['time'];
|
||||
date=line['date'];
|
||||
var hours= Math.floor(line['time']/100);
|
||||
if(hours>=24){
|
||||
hours-=24;
|
||||
var time = line['time'];
|
||||
var date = line['date'];
|
||||
var hours = Math.floor(line['time'] / 100);
|
||||
var minutes = line['time'] % 100;
|
||||
if (hours >= 24) {
|
||||
hours -= 24;
|
||||
date++;
|
||||
}
|
||||
var minutes= line['time']%100;
|
||||
var code= line['code'].substring(1,5);
|
||||
if(code.charAt(0)=='0')
|
||||
code=code.substring(1,4);
|
||||
temp={"stop":stop['name'].split(",")[0],
|
||||
"dist":stop['dist'],
|
||||
"bus":code,
|
||||
"date":date,
|
||||
"time":pad(hours,2)+":"+pad(minutes,2),
|
||||
"laststop":dict[line['code']].split(",")[0].split(" l.")[0],
|
||||
"hurry":false
|
||||
};
|
||||
var trigger=true;
|
||||
for(var objectIndex= $scope.arr.length-1;objectIndex>=0;objectIndex--)
|
||||
if( $scope.arr[objectIndex]['bus']==temp['bus'] && $scope.arr[objectIndex]['laststop']==temp['laststop']){
|
||||
if( $scope.arr[objectIndex]['dist']==temp['dist']){
|
||||
break;
|
||||
}
|
||||
else if( $scope.arr[objectIndex]['dist'] > temp['dist']){
|
||||
$scope.arr.splice(objectIndex,1);
|
||||
}
|
||||
else
|
||||
trigger=false;
|
||||
}
|
||||
if(trigger){
|
||||
$scope.arr.push(temp);
|
||||
var code = line['code'].substring(1, 5);
|
||||
if (code.charAt(0) == '0') {
|
||||
code = code.substring(1,4);
|
||||
}
|
||||
|
||||
var departure = {
|
||||
"stop": stop['name'].split(",")[0],
|
||||
"dist": stop['dist'],
|
||||
"bus": code,
|
||||
"date": date,
|
||||
"time": pad(hours, 2) + ":" + pad(minutes, 2),
|
||||
"laststop": dict[line['code']].split(",")[0].split(" l.")[0],
|
||||
"hurry": false
|
||||
};
|
||||
|
||||
var trigger = true;
|
||||
for (var arrIndex = $scope.arr.length - 1; arrIndex >= 0; arrIndex--) {
|
||||
if ($scope.arr[arrIndex]['bus'] == departure['bus'] &&
|
||||
$scope.arr[arrIndex]['laststop'] == departure['laststop']) {
|
||||
|
||||
if ($scope.arr[arrIndex]['dist'] == departure['dist']){
|
||||
break;
|
||||
}
|
||||
else if ($scope.arr[arrIndex]['dist'] > departure['dist']){
|
||||
$scope.arr.splice(arrIndex, 1);
|
||||
}
|
||||
else {
|
||||
trigger = false;
|
||||
}
|
||||
}
|
||||
if (trigger) {
|
||||
$scope.arr.push(departure);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function pad(num, size) {
|
||||
var s = num+"";
|
||||
while (s.length < size) s = "0" + s;
|
||||
var s = num + "";
|
||||
while (s.length < size) {
|
||||
s = "0" + s;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
delOld();
|
||||
}
|
||||
function delOld(){
|
||||
tooSoon = typeof($scope.departureThreshold) != 'undefined' ? $scope.departureThreshold: 0;
|
||||
hurry = typeof($scope.hurryThreshold) != 'undefined' ? $scope.hurryThreshold : 0;
|
||||
f= new Date();
|
||||
var tooSoon = typeof($scope.departureThreshold) != 'undefined' ? $scope.departureThreshold: 0;
|
||||
var hurry = typeof($scope.hurryThreshold) != 'undefined' ? $scope.hurryThreshold : 0;
|
||||
f = new Date();
|
||||
for(var a=$scope.arr.length-1; a>=0; a--){
|
||||
var time=$scope.arr[a]['time'].split(":");
|
||||
date=$scope.arr[a]['date'].toString();
|
||||
@@ -154,11 +166,12 @@ app.controller('timetableCtrl',
|
||||
d.setHours(time[0]);
|
||||
d.setMinutes(time[1]);
|
||||
var diff=(d.getTime()-f.getTime());
|
||||
if(diff < tooSoon*60000)
|
||||
if(diff < tooSoon*60000) {
|
||||
$scope.arr.splice(a,1);
|
||||
else if(diff < hurry*60000)
|
||||
}
|
||||
else if (diff < hurry*60000) {
|
||||
$scope.arr[a]['hurry']=true;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ function memberDataEditor(returnpath) {
|
||||
});
|
||||
|
||||
$scope.send = function() {
|
||||
$http.put("/members/api/member/" + $scope.member.id, $scope.member).then( function(data){
|
||||
$http.put("/members/api/member/" + $scope.member.id, $scope.member).then(function(response){
|
||||
notySuccess("Jäsentiedot tallennettu");
|
||||
$location.path(returnpath);
|
||||
});
|
||||
@@ -62,7 +62,7 @@ app.directive('ngConfirmClick', [ function() { return {
|
||||
|
||||
// controllers
|
||||
|
||||
app.controller("getController", function($scope, $document, $http, $window, $location){
|
||||
app.controller("getController", function($scope, $document, $http){
|
||||
/* List of all members that are fetched from the database */
|
||||
$scope.members = [];
|
||||
|
||||
@@ -98,9 +98,8 @@ app.controller("getController", function($scope, $document, $http, $window, $loc
|
||||
/* Update the payment date of a single member to the current time and send
|
||||
* the member to the database */
|
||||
$scope.updatePayment= function(id){
|
||||
$http.put("/members/api/member/"+id, { paid: moment().format("YYYY-MM-DD kk:mm:ss") }).then(function(resp) {
|
||||
$http.put("/members/api/member/"+id, { paid: moment().format("YYYY-MM-DD kk:mm:ss") }).then(function(response) {
|
||||
$scope.updateMember(id);
|
||||
|
||||
notySuccess("Maksupäivämäärä päivitetty.");
|
||||
});
|
||||
};
|
||||
@@ -213,7 +212,7 @@ app.controller("getController", function($scope, $document, $http, $window, $loc
|
||||
app.controller("postController", function($scope, $http, $location) {
|
||||
$scope.member = {};
|
||||
$scope.send = function() {
|
||||
$http.post("/members/api/member/", $scope.member).then(function(data){
|
||||
$http.post("/members/api/member/", $scope.member).then(function(response){
|
||||
notySuccess("Jäsen lisätty!");
|
||||
$location.path("/list");
|
||||
});
|
||||
@@ -221,7 +220,7 @@ app.controller("postController", function($scope, $http, $location) {
|
||||
});
|
||||
|
||||
/* Controller for application page */
|
||||
app.controller("applController", function($scope, $http, $route, $routeParams, $window, $location){
|
||||
app.controller("applController", function($scope, $http){
|
||||
$scope.applUpdateAll = function() {
|
||||
$http.get("/members/api/requests").then(function(response){
|
||||
$scope.applications = response.data;
|
||||
@@ -236,7 +235,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
|
||||
$scope.sendAppl = function(id) {
|
||||
$http.post("/members/api/request/" + id).then(
|
||||
function(response) {
|
||||
notySuccess("Hakemus hyväksytty");
|
||||
notySuccess("Hakemus hyväksytty");
|
||||
$scope.applUpdateAll();
|
||||
},
|
||||
function(response) {
|
||||
|
||||
Reference in New Issue
Block a user