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

Allow to load Absorbtion and fluorescence at the same time

This commit is contained in:
Mickaël Véril 2020-01-14 10:06:31 +01:00
parent bd6dd042bd
commit 18be81d5ba

View File

@ -63,34 +63,28 @@ draft: false
delete (cbextl) delete (cbextl)
delete (allc) delete (allc)
window.doiCache = new DOICache() window.doiCache = new DOICache()
$('#form_dat > fieldset > input[type=radio]').on('change', async function (event) { }
async function loadFiles() {
processingIndicator.isActive = true processingIndicator.isActive = true
$("#Geom_th,#GSGeom_th,#ESGeom_th").each(function () { var chks=[]
$(this).attr("hidden", true) var chks = $("#form_datFiles > ul > ul > li >input[type=checkbox]:checked")
}) var proms = Array.from(chks).flatMap((c) => {
var result = $(this).val(); switch (c.value) {
var proms = [];
switch (result) {
case "abs": case "abs":
proms = getAbsFilesName().map((f) => AbsDataFile.loadAsync(f)); return getAbsFilesName().map((f) => AbsDataFile.loadAsync(f));
$("#Geom_th").attr("hidden", false)
break; break;
case "fluo": case "fluo":
proms = getFluoFilesName().map((f) => FluoDataFile.loadAsync(f)); return getFluoFilesName().map((f) => FluoDataFile.loadAsync(f));
$("#Geom_th").attr("hidden", false)
break; break;
case "zpe": default:
proms = getZPEFilesName().map((f) => ZPEDataFile.loadAsync(f)); return []
$("#GSGeom_th,#ESGeom_th").each(function () {
$(this).attr("hidden", false)
})
break; break;
} }
})
window.dats = await Promise.all(proms) window.dats = await Promise.all(proms)
processingIndicator.isActive = false processingIndicator.isActive = false
reloadFileSelector() reloadFileSelector()
await reloadSelect() await reloadSelect()
})
} }
function reloadFileSelector() { function reloadFileSelector() {
$("#customFiles_input").attr("value", "").attr("disabled", false) $("#customFiles_input").attr("value", "").attr("disabled", false)
@ -434,16 +428,26 @@ draft: false
<li>Now you can see the list of selected data and some statistics about these data</li> <li>Now you can see the list of selected data and some statistics about these data</li>
</ol> </ol>
</p> </p>
<form id="form_dat" action="javascript:submitdat()" method="post"> <form id="form_datFiles" action="javascript:loadFiles()" method="post">
<fieldset>
<legend>Data type</legend> <legend>Data type</legend>
<input type="radio" id="abs" value="abs" name="datatype"> <ul class="nestedCbList" style="padding-left: 0em;">
<label for="abs">Absorption</label> <li>
<input type="radio" id="fluo" value="fluo" name="datatype"> <input type="checkbox" onchange="nestedCheckbox_change(event)" id="cb_fileType_All"></input>
<label for="cb_fileType_All"> All</label>
</li>
<ul class="nestedCbList">
<li>
<input type="checkbox" onchange="nestedCheckbox_change(event)" id="cb_abs" value="abs" name="datatype">
<label for="cb_abs">Absorption</label>
</li>
<li>
<input type="checkbox" onchange="nestedCheckbox_change(event)" id="cb_fluo" value="fluo" name="datatype">
<label for="fluo">Fluorescence</label> <label for="fluo">Fluorescence</label>
<input type="radio" id="zpe" value="zpe" name="datatype"> </ul>
<label for="zpe">\(\Delta \text{ZPE}\)</label> </li>
</fieldset> <input type="submit" value="Load files" />
</form>
<form id="form_dat" action="javascript:submitdat()" method="post">
<fieldset> <fieldset>
<div> <div>
<label for="customFiles_input">Add custom data file</label> <label for="customFiles_input">Add custom data file</label>