Moment + adapter, sorting when no order by clause in alasql query.

This commit is contained in:
Mario Zechner 2023-06-14 02:56:31 +02:00
parent 7b9a6fe969
commit 38a11e0e79
3 changed files with 22 additions and 1 deletions

19
package-lock.json generated
View File

@ -13,9 +13,11 @@
"axios": "^1.4.0",
"better-sqlite3": "^8.4.0",
"chart.js": "^4.3.0",
"chartjs-adapter-moment": "^1.0.1",
"chokidar": "^3.5.3",
"compression": "^1.7.4",
"express": "^4.18.2",
"moment": "^2.29.4",
"n-readlines": "^1.0.1",
"node-html-parser": "^6.1.5"
},
@ -1005,6 +1007,15 @@
"pnpm": ">=7"
}
},
"node_modules/chartjs-adapter-moment": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.1.tgz",
"integrity": "sha512-Uz+nTX/GxocuqXpGylxK19YG4R3OSVf8326D+HwSTsNw1LgzyIGRo+Qujwro1wy6X+soNSnfj5t2vZ+r6EaDmA==",
"peerDependencies": {
"chart.js": ">=3.0.0",
"moment": "^2.10.2"
}
},
"node_modules/chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@ -2439,6 +2450,14 @@
"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
},
"node_modules/moment": {
"version": "2.29.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"engines": {
"node": "*"
}
},
"node_modules/mri": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",

View File

@ -24,9 +24,11 @@
"axios": "^1.4.0",
"better-sqlite3": "^8.4.0",
"chart.js": "^4.3.0",
"chartjs-adapter-moment": "^1.0.1",
"chokidar": "^3.5.3",
"compression": "^1.7.4",
"express": "^4.18.2",
"moment": "^2.29.4",
"n-readlines": "^1.0.1",
"node-html-parser": "^6.1.5"
},

View File

@ -376,7 +376,7 @@ class ItemsList extends View {
}
let items = [...this.model.filteredItems];
if (this.model.lastQuery && this.model.lastQuery.charAt(0) == "!") {
if (this.model.lastQuery && this.model.lastQuery.charAt(0) == "!" && this.model.lastQuery.toLowerCase().indexOf("order by") >= 0) {
elements.sort.parentElement.classList.add("hidden");
} else {
if (!this._noSort) {