Merge branch 'main' of https://github.com/sparna-git/referentiel-medicaments

Author: Marie-Sparna

dist/assets/css/sparnatural-form.css

@@ -1,25 +1,14 @@
 {
   "bindings": [
     {
-      "variable": "SubstanceActive",
+      "variable": "Substance",
       "node": {
         "type": "UserPrompt",
         "name": {
-          "fr": "Substance Active"
+          "fr": "Substance"
         }
       }
     } 
-,
-  {
-      "variable": "SubstanceFraction",
-      "node": {
-        "type": "UserPrompt",
-        "name": {
-          "fr": "Fraction thérapeutique"
-        }
-      }
-    } 
-
 ,
 {
       "variable": "Voie",

dist/assets/js/sparnatural-form.js

@@ -9,14 +9,6 @@
       "termType": "Variable",
       "value": "Code"
     },
-    {
-      "termType": "Variable",
-      "value": "SubstanceActive"
-    },
-    {
-      "termType": "Variable",
-      "value": "SubstanceFraction"
-    },
     {
       "termType": "Variable",
       "value": "Voie"
@@ -50,7 +42,7 @@
       "value": "Date"
     }
   ],
-  "order": null,
+  "order": "asc",
   "branches": [
     {
       "line": {
@@ -63,29 +55,7 @@
       },
       "children": []
     },
-    {
-      "line": {
-        "s": "SpecialitePharmaceutique",
-        "p": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique_substanceActive",
-        "o": "SubstanceActive",
-        "sType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique",
-        "oType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#Substance",
-        "values": []
-      },
-      "children": []
-    },
-    {
-      "line": {
-        "s": "SpecialitePharmaceutique",
-        "p": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique_fractionTherapeutique",
-        "o": "SubstanceFraction",
-        "sType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique",
-        "oType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#Substance",
-        "values": []
-      },
-      "children": []
-    },
-    {
+        {
       "line": {
         "s": "SpecialitePharmaceutique",
         "p": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique_voie",
@@ -173,6 +143,17 @@
         "values": []
       },
       "children": []
+    },
+    {
+      "line": {
+        "s": "SpecialitePharmaceutique",
+        "p": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique_SAouFT",
+        "o": "Substance",
+        "sType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#SpecialitePharmaceutique",
+        "oType": "https://sparna-git.github.io/referentiel-medicaments/configs/sparnatural-config.ttl#Substance",
+        "values": []
+      },
+      "children": []
     }
   ],
   "limit": -1

dist/assets/js/sparnatural-form.js.map

@@ -120,7 +120,7 @@ <h1><a href="index.html" data-i18n="page.title"></a></h1>
 
           <spar-natural 
             src="https://xls2rdf.sparna.fr/rest/convert?noPostProcessings=true&url=https%3A%2F%2Fdocs.google.com%2Fspreadsheets%2Fd%2F1ZkgVyfG1rnl3yZALOdxovj7ommoKDn7ieudi7jCwoYw%2Fexport%3Fformat%3Dxlsx"
-            endpoint="https://proxy.sparnatural.eu/sparql-proxy/sparql?endpoint=https%3A%2F%2Fsmt.esante.gouv.fr%2Fapi%2Fsparql"
+            endpoint="https://smt.esante.gouv.fr/api/sparql"
             typePredicate="<http://www.w3.org/2000/01/rdf-schema#subClassOf>"
             prefixes="med:http://data.esante.gouv.fr/ansm/medicament/ skos:http://www.w3.org/2004/02/skos/core# dct:http://purl.org/dc/terms/"
             lang="fr"
@@ -202,7 +202,7 @@ <h1><a href="index.html" data-i18n="page.title"></a></h1>
 
           <div class="col-lg-2 col-md-2">
             <div class="contact-about">
-              <a href="http://sparna.fr"><img src="assets/img/sparna.png" style="width:100%;" /></a>
+              <a href="http://sparna.fr"><img src="../assets/img/sparna.png" style="width:100%;" /></a>
             </div>
           </div>
 

dist/assets/js/sparnatural-yasgui-plugins.js

@@ -386,8 +386,8 @@ <h1><a href="index.html" data-i18n="page.title"></a></h1>
     delete Yasr.plugins['table'];
     delete Yasr.plugins['response'];
     const yasr = new Yasr(document.getElementById("yasr"), {
-      pluginOrder: ["TableX", "Grid", "Stats"],
-      defaultPlugin: "TableX",
+      pluginOrder: ["Grid", "TableX", "Stats"],
+      defaultPlugin: "Grid",
       // disable persistency
       persistencyExpire: 0,
       maxPersistentResponseSize: 0