From cf683fb59dd487357ff5a80e784b8fb6d5825f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Mon, 13 Jan 2020 14:29:48 +0100
Subject: [PATCH] dissociate Method and basis selector

---
 content/multipledataset.html | 40 +++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/content/multipledataset.html b/content/multipledataset.html
index 7a25b42c..3e318b47 100644
--- a/content/multipledataset.html
+++ b/content/multipledataset.html
@@ -120,10 +120,22 @@ draft: false
       $(this).empty()
     })
     $('#form_dat > fieldset > div > select').each(async function () {
-      const vals = uniq(window.dats.map((d) => { return d[$(this).attr("name")] }))
+      const vals = uniq(window.dats.map((d) => {
+        switch ($(this).attr("name")) {
+          case "method":
+            return d.method.name
+            break;
+          case "basis":
+            return d.method.basis
+          default:
+            return d[$(this).attr("name")]
+            break;
+        }
+       }))
       var sets = await getSets()
       for (const val of vals) {
-        var op = $("<option/>", {
+        if(val!==null) {
+          var op = $("<option/>", {
           value: JSON.stringify(val)
         })
         if ($(this).attr("name") == "DOI") {
@@ -131,7 +143,7 @@ draft: false
             str=sets.get(val.string)
             if(val.IsSupporting){
               str+=" (SI)"
-            } 
+            }
           }
           else{
             str=val.toString()
@@ -141,7 +153,8 @@ draft: false
         else {
           $(op).text(val.toString())
         }
-        op.appendTo(this)
+        op.appendTo(this)          
+        }
       }
     })
     $('#form_dat > input[type="submit"').prop('disabled', false);
@@ -267,7 +280,20 @@ draft: false
         if (typeof values == "undefined" || values == null) {
           return false
         }
-        return values.includes(JSON.stringify(d[prop]))
+        var val=null
+        switch (prop) {
+          case "method":
+            val=d.method.name
+            break;
+          case "basis":
+            val=d.method.basis
+            break;
+          default:
+            val=d[prop]
+            break;
+        }
+        return values.includes(JSON.stringify(val))
+        delete(val)
       })
     })
     await window.doiCache.addRange(window.filtData.map((d) => d.DOI.string))
@@ -433,6 +459,10 @@ draft: false
       <label for="method_select">Method</label>
       <select multiple id="method_select" name="method"></select>
     </div>
+    <div>
+      <label for="basis_select">Basis</label>
+      <select multiple id="basis_select" name="basis"></select>
+    </div>
     <div>
       <label for="DOI_select">Publication</label>
       <select multiple id="DOI_select" name="DOI"></select>