Skip to content

Commit 2bc59b2

Browse files
committed
Cleanups.
1 parent 0a90f60 commit 2bc59b2

13 files changed

Lines changed: 47 additions & 50 deletions

File tree

js/charts.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* evolutility-server-node :: charts.js
3-
* Charts and grph data
3+
* Charts and graph data
44
*
55
* https://github.com/evoluteur/evolutility-server-node
66
* (c) 2023 Olivier Giulieri
@@ -59,10 +59,7 @@ function SQLchartField(m, fid) {
5959
sqlCount +
6060
sqlFrom +
6161
" LEFT JOIN " +
62-
schema +
63-
'."' +
64-
f.lovTable +
65-
'" AS t2' +
62+
`${schema}."${f.lovTable}" AS t2` +
6663
" ON t1." +
6764
col +
6865
"=t2.id GROUP BY t2.id, t2." +
@@ -122,14 +119,14 @@ function SQLchartField(m, fid) {
122119
errorMessage: withError,
123120
}
124121
: {
125-
sql: sql,
126-
sqlParams: sqlParams,
122+
sql,
123+
sqlParams,
127124
};
128125
}
129126

130127
// --------------------------------------------------------------------------------------
131128

132129
export default {
133-
chartField: chartField,
134-
SQLchartField: SQLchartField,
130+
chartField,
131+
SQLchartField,
135132
};

js/crud.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ function SQLgetOne(id, m, res) {
4343
}
4444
sql += " LIMIT 1;";
4545
return {
46-
sql: sql,
47-
sqlParams: sqlParams,
46+
sql,
47+
sqlParams,
4848
};
4949
}
5050

@@ -259,11 +259,11 @@ const SQLCollecOne = (collec) =>
259259

260260
export default {
261261
// - CRUD
262-
getOne: getOne,
263-
SQLgetOne: SQLgetOne,
264-
insertOne: insertOne,
265-
updateOne: updateOne,
266-
deleteX: deleteX,
262+
getOne,
263+
SQLgetOne,
264+
insertOne,
265+
updateOne,
266+
deleteX,
267267
// - Sub-collections
268268
getCollec: collecOne,
269269
};

js/designer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,6 @@ function getModels(req, res, callback) {
394394
}
395395

396396
export default {
397-
getModel: getModel,
398-
getModels: getModels,
397+
getModel,
398+
getModels,
399399
};

js/info.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ const entityAPIs = (model, protocol, baseUrl, fullDescription) => {
4242
id: model.id,
4343
title: model.title || model.label,
4444
list: pathToModel,
45-
lovs: lovs,
46-
charts: charts,
45+
lovs,
46+
charts,
4747
stats: pathToModel + "/stats",
4848
csv: pathToModel + "?format=csv",
4949
};
@@ -112,6 +112,6 @@ function version(req, res) {
112112
// --------------------------------------------------------------------------------------
113113

114114
export default {
115-
version: version,
116-
apis: apis,
115+
version,
116+
apis,
117117
};

js/list.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ function SQLgetMany(m, req, isCSV, wCount) {
255255
//group: '',
256256
order: sqlOrder,
257257
limit: qPageSize,
258-
offset: offset,
258+
offset,
259259
params: sqlParams,
260260
};
261261
}
@@ -287,6 +287,6 @@ export function getMany(req, res) {
287287
}
288288

289289
export default {
290-
getMany: getMany,
291-
SQLgetMany: SQLgetMany,
290+
getMany,
291+
SQLgetMany,
292292
};

js/lov.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ const SQLlovOne = (f, search) => {
6969

7070
export default {
7171
// - LOVs (for dropdowns)
72-
lovOne: lovOne,
73-
SQLlovOne: SQLlovOne,
72+
lovOne,
73+
SQLlovOne,
7474
};

js/stats.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,5 @@ function numbers(req, res) {
134134
// --------------------------------------------------------------------------------------
135135

136136
export default {
137-
numbers: numbers,
137+
numbers,
138138
};

js/utils/db-structure.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ function getColumns(req, res) {
4545
// -----------------------------------------------------------------------
4646

4747
export default {
48-
getTables: getTables,
49-
getColumns: getColumns,
48+
getTables,
49+
getColumns,
5050
};

js/utils/dico.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ export default {
108108

109109
fieldInMany: (f) => f.inList || f.inMany,
110110

111-
fieldIsText: fieldIsText,
112-
fieldIsNumber: fieldIsNumber,
113-
fieldIsNumeric: fieldIsNumeric,
114-
fieldIsDateOrTime: fieldIsDateOrTime,
111+
fieldIsText,
112+
fieldIsNumber,
113+
fieldIsNumeric,
114+
fieldIsDateOrTime,
115115

116-
fieldInCharts: fieldInCharts,
117-
fieldChartable: fieldChartable,
116+
fieldInCharts,
117+
fieldChartable,
118118

119-
systemFields: systemFields,
119+
systemFields,
120120
};

js/utils/errors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ function badRequest(res, msg, errorCode = 400) {
1010
}
1111

1212
export default {
13-
badRequest: badRequest,
13+
badRequest,
1414
};

0 commit comments

Comments
 (0)