@igea/oac_frontend 1.0.55 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_frontend",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "Frontend service for the OAC project",
   "main": "src/index.js",
   "bin": {

package/src/locales/en.json

@@ -100,7 +100,9 @@
             "confirm": "Confirm",
             "download": "Download",
             "select_instance": "Select an instance",
-            "generated_output": "Generated output"
+            "generated_output": "Generated output",
+            "valid": "Valid",
+            "not_valid": "Not valid"
         }
     },
     "search": {

package/src/locales/it.json

@@ -103,7 +103,9 @@
             "confirm": "Conferma",
             "download": "Scarica",
             "select_instance": "Seleziona un'istanza",
-            "generated_output": "Output generato"
+            "generated_output": "Output generato",
+            "valid": "Valido",
+            "not_valid": "Non valido"
         }
     },
     "search": {

package/src/public/js/app/vue-investigation.js

@@ -3,7 +3,7 @@ const {createApp} = Vue;
 const appId = 'investigation-app';
 const shaclId = 'shacl-form';
 
-const templateIRIOfIndagine = "http://diagnostica/indagine/$UUID$";
+const templateIRIOfIndagine = "http://indagine/$SEQ1$";
 const templateIRIToExcludeFromSearch = [
     templateIRIOfIndagine
 ];

package/src/public/js/app/vue-vocabolary-view.js

@@ -23,7 +23,7 @@ const OAC_VOCABOLARIES = [
     { "name": "Strumentazione", "key": "strumentazione", "class": "crm:E55_Type" },
     { "name": "Tafonomia e stato di conservazione", "key": "tafonomia-e-stato-di-conservazione", "class": "crm:E55_Type" },
     { "name": "Tecnica diagnostica", "key": "tecnica-diagnostica", "class": "crm:E55_Type" },
-    { "name": "Tipo campione", "key": "Tipo-campione", "class": "crm:E55_Type" },
+    { "name": "Tipo campione", "key": "tipo-campione", "class": "crm:E55_Type" },
     { "name": "Tipo indagine", "key": "tipo-indagine", "class": "crm:E55_Type" },
     { "name": "Tipologia inquadramento cronologico", "key": "tipologia-inquadramento-cronologico", "class": "base:I2_Belief" },
     { "name": "Input", "key": "input", "class": "crm:E55_Type" },

package/src/views/investigation/form.twig

@@ -95,7 +95,7 @@
       {% if user.role != 3 %}
         <!-- Buttons -->
         <div class="col-12 text-center mt-4">
-            <button v-if="validForm" @click="save()" type="submit" class="btn btn-primary me-2">{{ t('investigation.new.submit') }}</button>
+
             <button style="margin-left:30px;" title="{{ t('investigation.new.download') }}"
               @click="download('xml')" type="button" class="btn btn-secondary">
                 <span>RDF/XML</span><i class="fa-solid fa-file-arrow-down"></i>
@@ -105,12 +105,14 @@
                 <span>TURTLE</span><i class="fa-solid fa-file-arrow-down"></i>
             </button>
 
+            <!--
             <button style="margin-left:30px;" title="{{ t('investigation.new.validate') }}"
               @click="validate()" type="button" class="btn btn-warning">
               <i class="fa-solid fa-certificate"></i>
             </button>
+            -->
 
-            <button style="margin-left:30px;" title="{{ t('investigation.new.confirm') }}"
+            <button v-if="validForm" style="margin-left:30px;" title="{{ t('investigation.new.confirm') }}"
               @click="save()" type="button" class="btn btn-primary">
               <i class="fa-solid fa-save"></i>
             </button>
@@ -119,13 +121,16 @@
               @click="reset()" type="button" class="btn btn-info">
               <i class="fa-solid fa-broom"></i>
             </button>
+
         </div>
         {% if user.role in [0, 1] %}
           <fieldset id="shacl-output" style="margin-top:10px;
               border: solid 1px gray;
               border-radius: 10px;
               padding: 10px;">
-            <legend>{{ t('investigation.new.generated_output') }}: [{@ validForm @}]</legend>
+            <legend>{{ t('investigation.new.generated_output') }}: 
+              [{@ validForm ? '{{ t('investigation.new.valid') }}': '{{ t('investigation.new.not_valid') }}' @}]
+            </legend>
             <pre :style="outputStyle">{@ serializedForm @}</pre>
           </fieldset>
         {% endif %}

package/src/views/search/advanced.twig

@@ -34,8 +34,9 @@
         <!-- The sparnatural web component with config attributes. -->
         <!-- See http://docs.sparnatural.eu/Javascript-integration.html#html-attributes-reference -->
         <spar-natural 
-            src="/backend/ontology/schema/ttl"
-            endpoint="https://dbpedia.org/sparql"
+            src="/backend/ontology/schema/ttl2"
+            endpoint="/backend/fuseki/endpoint/sparql"
+            endpoint_="https://dbpedia.org/sparql"
             lang="en"
             defaultLang="en"
             distinct="true"