PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-25 13:53:48 +01:00
Code Releases Activity

transform filterParams array to object to simplify code

Browse Source
This commit is contained in:
Mickaël Véril 2020-04-03 16:16:08 +02:00
parent a5886352fe
commit c8383c7b81
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/multipledataset.html
View File

@ -232,7 +232,7 @@ draft: false
for (const exc of d.excitations) { for (const exc of d.excitations) {
const key2 = JSON.stringify([d.molecule, exc.initial, exc.final, exc.cVertExcitationKind]) const key2 = JSON.stringify([d.molecule, exc.initial, exc.final, exc.cVertExcitationKind])
const keydic = sdatdic.get(key) const keydic = sdatdic.get(key)
if ((!exc.isUnsafe || window.filterParams[0]) && ((exc.type & window.filterParams[1]) !== 0) && ((exc.VertExcitationKind & window.filterParams[2]) !== 0)) { if ((!exc.isUnsafe || window.filterParams.unsafe) && ((exc.type & window.filterParams.exType) !== 0) && ((exc.VertExcitationKind & window.filterParams.exVertKind) !== 0)) {
if (!(keydic.has(key2))) { if (!(keydic.has(key2))) {
keydic.set(key2,exc.value) keydic.set(key2,exc.value)
} }
@ -319,7 +319,9 @@ draft: false
processingIndicator.isActive = false processingIndicator.isActive = false
} }
async function reloadContent() { async function reloadContent() {
window.filterParams = [$("#cb_unsafe").prop("checked"), Array.from(Array.from($("#cb_exTypeList>li>input[type=checkbox]:checked")).map(el => parseInt(el.value))).reduce((pv, cv) => pv + cv, 0), Array.from(Array.from($("#cb_exVertKindList>li>input[type=checkbox]:checked")).map(el => parseInt(el.value))).reduce((pv, cv) => pv + cv, 0)] window.filterParams = {unsafe:$("#cb_unsafe").prop("checked"),
exType:Array.from(Array.from($("#cb_exTypeList>li>input[type=checkbox]:checked")).map(el => parseInt(el.value))).reduce((pv, cv) => pv + cv, 0),
exVertKind:Array.from(Array.from($("#cb_exVertKindList>li>input[type=checkbox]:checked")).map(el => parseInt(el.value))).reduce((pv, cv) => pv + cv, 0)}
doiCache.clear() doiCache.clear()
processingIndicator.isActive = true processingIndicator.isActive = true
const LatexInline = ['\\(', '\\)'] const LatexInline = ['\\(', '\\)']
@ -396,7 +398,7 @@ draft: false
const key3 = JSON.stringify(dat.method) const key3 = JSON.stringify(dat.method)
for (const ex of dat.excitations) { for (const ex of dat.excitations) {
Reflect.setPrototypeOf(ex.type, excitationType.prototype) Reflect.setPrototypeOf(ex.type, excitationType.prototype)
if (((window.filterParams[1] & ex.type) !== 0) && ((window.filterParams[2] & ex.VertExcitationKind) !== 0)) { if (((window.filterParams.exType & ex.type) !== 0) && ((window.filterParams.exVertKind & ex.VertExcitationKind) !== 0)) {
const key2 = JSON.stringify([ex.initial, ex.final, ex.type, ex.VertExcitationKind]) const key2 = JSON.stringify([ex.initial, ex.final, ex.type, ex.VertExcitationKind])
if (!datadic.get(key1).has(key2)) { if (!datadic.get(key1).has(key2)) {
datadic.get(key1).set(key2, new Map()) datadic.get(key1).set(key2, new Map())
@ -437,7 +439,7 @@ draft: false
if (unsafe) { if (unsafe) {
td.append($("<span/>", { title: "unsafe value", role: "img", "aria-label": "Warning" }).addClass("emoji").text('⚠')) td.append($("<span/>", { title: "unsafe value", role: "img", "aria-label": "Warning" }).addClass("emoji").text('⚠'))
} }
if (unsafe && !$("#cb_unsafe").is(':checked')) { if (unsafe && !filterParams.unsafe) {
td.append($("<s/>").append(val.toString())) td.append($("<s/>").append(val.toString()))
} }
else { else {