Update new files

Persona.html

@@ -344,18 +344,17 @@
 										<div class="inner_results container-fluid">
 											<div class="row def_res">
 												<div class="col">
-													<b>Documenti redatti da <span id="nome_al" class="PN"></span></b>
+													<b>Opere d'arte realizzate da <span id="nome_al" class="PN"></span></b>
 												</div>
 												<div class="col num_res">
-													<span><span id="n_cit"></span> risultati</span>
+													<span><span id="n_oa"></span> risultati</span>
 												</div>
 											</div>
 											<div class="row res_list">
-												<div class="container-fluid" id="object_cit"></div>
+												<div class="container-fluid" id="object_oa"></div>
 											</div>
 										</div>
 									</div>
-								</div>
 
 								<div class="row" id="statistiche">
 									<div class="box_results col-12" id="stat1">

js/OA.js

@@ -149,19 +149,19 @@ function handle_OAdata(json) {
         }
         if (value.hasOwnProperty('identifier')) {
           $("#NCT").css("display", "flex");
-          identifier = "0" + value['identifier']['value'];
+          identifier = value['identifier']['value'];
         }
         if (value.hasOwnProperty('type')) {
           $("#OGTD").css("display", "flex");
           type = "<div class='d-flex'><div class='mr-3'>" +
                   value['type']['value'] + "</div><div class='d-flex ml-auto'><div class='mr-3'><a class='btn-icon' target='_blank' href='" +
-                  value['uriType']['value'] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text' style='border-bottom: none;'>AAT</p></a></div></div></div></div>";
+                  value['uriType']['value'] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text'>AAT</p></a></div></div></div></div>";
         }
         if (value.hasOwnProperty('current_owner')) {
           $("#LDCN").css("display", "flex");
           current_owner = "<div class='d-flex'><div class='mr-3'>" +
                             value['current_owner']['value'] + "</div><div class='d-flex ml-auto'><div class='mr-3'><a class='btn-icon' target='_blank' href='" +
-                            value['uriOwner']['value'] + "'><i class='fas fa-external-link-alt' aria-hidden='true'></i><p class='btn-text' style='border-bottom: none;'>LINK</p></a></div></div></div></div>";
+                            value['uriOwner']['value'] + "'><i class='fas fa-external-link-alt' aria-hidden='true'></i><p class='btn-text'>LINK</p></a></div></div></div></div>";
         }
         if (value.hasOwnProperty('current_location')) {
           $("#LDCS").css("display", "flex");
@@ -199,7 +199,7 @@ function handle_OAdata(json) {
 
                 materials += "<div class='d-flex'><div class='mr-3'>" +
                           slice[1] + "</div><div class='d-flex ml-auto'><div class='mr-3'><a class='btn-icon' target='_blank' href='" +
-                          slice[0] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text' style='border-bottom: none;'>AAT</p></a></div></div></div></div>";
+                          slice[0] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text'>AAT</p></a></div></div></div></div>";
             }
           }
         }
@@ -266,7 +266,7 @@ function handle_Production(json) {
 
                 teche += "<div class='d-flex'><div class='mr-3'>" +
                           slice[1] + "</div><div class='d-flex ml-auto'><div class='mr-3'><a class='btn-icon' target='_blank' href='" +
-                          slice[0] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text' style='border-bottom: none;'>AAT</p></a></div></div></div></div>";
+                          slice[0] + "'><i class='fa fa-bullseye' aria-hidden='true'></i><p class='btn-text'>AAT</p></a></div></div></div></div>";
             }
           }
         }
@@ -283,8 +283,8 @@ function handle_Production(json) {
                 artist_name += slice[1];
                 artist += "<div class='d-flex'><div class='mr-3'>" +
                           slice[1] + "</div><div class='d-flex ml-auto'><div class='mr-3'><a class='btn-icon' target='_blank' href='" +
-                          slice[0] + "'><i class='fas fa-external-link-alt' aria-hidden='true'></i><p class='btn-text' style='border-bottom: none;'>LINK</p></a></div><div class='persona' id='" +
-                          slice[0] + "'><i class='fa fa-user' style='cursor:pointer'></i><p class='btn-text' style='border-bottom: none;'>SCHEDA <br />PERSONA</p></div></div></div></div>";
+                          slice[0] + "'><i class='fas fa-external-link-alt' aria-hidden='true'></i><p class='btn-text'>LINK</p></a></div><div class='persona btn-icon' style='cursor:pointer' id='" +
+                          slice[0] + "'><i class='fa fa-user'></i><p class='btn-text'>SCHEDA<br />PERSONA</p></div></div></div></div>";
               }
           }
         }

js/people.js

@@ -121,6 +121,18 @@ OPTIONAL {?ev_move crm:P4_has_time-span ?uri_ts . \
 ?uri_ts rdfs:label ?time_span . } \
 }"
 
+queryOpere = prefixes + " SELECT DISTINCT ?subject ?label ?nct (group_concat(distinct ?time_span ;separator='-') as ?time_span) \
+WHERE {?subject rdf:type crm:E22_Man-Made_Object ; \
+rdfs:label ?label ; \
+crm:P1_is_identified_by ?uri_nct . \
+?uri_nct rdfs:label ?nct . \
+?production crm:P108_has_produced ?subject . \
+OPTIONAL {?production crm:P4_has_time-span ?uri_time_span . \
+?uri_time_span rdfs:label ?time_span } \
+?pc crm:P01_has_domain ?production ; \
+crm:P02_has_range <" + thisUrlParams.link + "> } \
+GROUP BY ?subject ?label ?nct "
+
 queryNetwork = prefixes + " SELECT DISTINCT COUNT(?event) AS ?count ?uri2 SAMPLE(?label2) AS ?text \
 WHERE { \
 {?event rdf:type crm:EL1_Exchange_Letters . \
@@ -155,6 +167,8 @@ queryURL = prepareQueryURL(query);
 
 queryNet = prepareQueryURL(queryNetwork);
 
+queryOA = prepareQueryURL(queryOpere);
+
 query = prepareQueryURL(queryInfo);
 
 queryEx = prepareQueryURL(queryLetters);
@@ -199,6 +213,16 @@ responseLet = $.ajax({
     error: function (e) {}
 });
 
+responseOA = $.ajax({
+
+  url: queryOA,
+  dataType: "json",
+  success: function (data){
+    handle_Artwork(data);
+  },
+  error: function (e) {}
+});
+
 
 
 function handle_data(json) {
@@ -292,9 +316,12 @@ function handle_data(json) {
           group = value['group']['value'];
         }
         if (value.hasOwnProperty('variants')) {
-          $("#otherNames").css("display", "flex");
-          let strings = value['variants']['value'];
-          variants = strings.split(";");
+          if (value['variants']['value'] != "| ") {
+            alert(value['variants']['value']);
+            $("#otherNames").css("display", "flex");
+            let strings = value['variants']['value'];
+            variants = strings.split(";");
+          }
         }
         
         var dataset = get_dataset_name(graph);
@@ -475,6 +502,69 @@ function handle_Letters(json) {
 }
 
 
+function handle_Artwork(json) {
+
+  console.log(json);
+
+  const oa = [];
+
+  $.each(
+      json['results']['bindings'],
+      function (index, value) {
+        uri = value['subject']['value'];
+        label = value['label']['value'];
+        nct = value['nct']['value'];
+        var data = "";
+        
+        if (value.hasOwnProperty('time_span')) {
+            data = value['time_span']['value'];
+        }
+
+        oa.push([uri, label, nct, data]);
+        
+      });
+
+  var Artworks = "";
+
+  for (var i=0; i<oa.length; i++) {
+    var artwork = '<a href=' + oa[i][0] + ' target="_blank">' + oa[i][1] + '</a><br />NCT: ' + oa[i][2];
+    if (oa[i][3] != "") {
+      artwork = artwork + "<br />Data: " + oa[i][3];
+    }
+
+    var object_button  = '<button type="button" id="' + oa[i][0] + 
+      '" class="artwork btn btn-default" alt="opera d\'arte" title="' + oa[i][1] + 
+      '"><i class="fas fa-paint-brush"></i><p class="btn-text">Scheda Opera d\'Arte</p></button>';
+
+    Artworks += '<div class="row res"><div class="col-8"><p>'+ artwork +'</p></div>' + 
+    '<div class="col d-flex align-items-start justify-content-end">' + object_button +
+    '<button type="button" id="' + oa[i][0] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+    '<button type="button" id="' + oa[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+    '<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + oa[i][0] + '" target="_blank"><button type="button" class="btn btn-default info" alt="LOD"><i class="fa fa-share-alt"></i><p class="btn-text">Lod</p></button></a></div></div>';
+  }
+
+    /*if (receive[i][4] != "") {
+          infObject_button  += '<button type="button" id="' + receive[i][4] + 
+          '" class="lettera btn btn-default" alt="lettera" ><i class="fa fa-envelope"></i><p class="btn-text">Scheda Lettera</p></button>';
+    } else {
+          infObject_button  += '<button type="button" id="' + receive[i][0] + 
+          '" class="object btn btn-default" alt="oggetto" title="' + receive[i][1] + 
+          '"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
+    }
+
+    Receive_Letters += '<div class="row res"><div class="col-8"><p>'+ artwork +'</p></div>' + 
+        '<div class="col d-flex align-items-start justify-content-end">' + infObject_button +
+        '<button type="button" id="' + receive[i][0] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+        '<button type="button" id="' + receive[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+        '<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + receive[i][0] + '" target="_blank"><button type="button" class="btn btn-default info" alt="LOD"><i class="fa fa-share-alt"></i><p class="btn-text">Lod</p></button></a></div></div>';
+  }*/
+
+  document.getElementById("n_oa").innerHTML = oa.length;
+  document.getElementById("object_oa").innerHTML = Artworks;
+
+}
+
+
 function handle_map(json) {
   console.log(json);
 
@@ -743,8 +833,15 @@ $(document).on("click", ".hyp", function (ev) {
   $('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" +
     link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
-  
+});
+
+$(document).on("click", ".artwork", function (ev) {
 
+  var link = this.id;
+  //alert(nome_autore);
+  //$('#myModal').text("");
+  window.open("OA.html?link="+this.id);
+  
 });
 
 $(document).on("click", ".close", function (ev) {