diff --git a/content/multipledataset.html b/content/multipledataset.html
index 414dbf4b..adde19fb 100644
--- a/content/multipledataset.html
+++ b/content/multipledataset.html
@@ -16,19 +16,19 @@ draft: false
window.onload= async ()=>{
$('#form input[type=radio]').on('change', async function(event) {
var result = $(this).val();
- var files=[];
+ var proms=[];
switch (result) {
case "abs":
- files=getAbsFilesName();
+ proms==getAbsFilesName().map((f) => absDataFile.loadAsync(f));
break;
case "fluo":
- files=getFluoFilesName();
+ proms=getFluoFilesName().map((f) => fluoDataFile.loadAsync(f));
break;
case "zpe":
- files=getZPEFilesName();
+ proms=getZPEFilesName().map((f) => ZPEDataFile.loadAsync(f));
break;
}
- window.dats=await Promise.all(files.map((f) => ZPEDataFile.loadAsync(f)))
+ window.dats=await Promise.all(proms)
reloadSelect()
reloadContent()
})
@@ -47,16 +47,14 @@ draft: false
}
function reloadContent(){
var filt=window.dats
- $('#dat_table > thead > tr > th > select').each(function(){
- const prop=$(this).data("prop")
- const value=$(this).val()
+ $('#form > select').each(function(){
+ const prop=$(this).attr("name")
+ const values=$(this).val()
filt=filt.filter((d)=>{
- if(value==""){
- return true
- }
- else {
- return d[prop]==value
+ if(typeof values=="undefined" || values==null){
+ return false
}
+ return values.map((v)=>JSON.stringify(v)).includes(JSON.stringify(d[prop]))
})
})
var tb=document.getElementById("table_b");
@@ -84,21 +82,13 @@ draft: false
-
+
-
+
-
+
-
+