Luogo aggiornato

Luogo.html

@@ -183,7 +183,7 @@
 											<div class="inner_results container-fluid">
 												<div class="row def_res">
 													<div class="col">
-														<b>Oggetti realizzati a <span id="nome_lu"></span></b>
+														<b>Documenti redatti a <span id="nome_lu"></span></b>
 													</div>
 													<div class="col num_res">
 														<span><span id="n_send"></span> risultati</span>
@@ -199,7 +199,7 @@
 											<div class="inner_results container-fluid">
 												<div class="row def_res">
 													<div class="col">
-														<b>Oggetti arrivati a <span id="nome_lp"></span></b>
+														<b>Documenti inviati a <span id="nome_lp"></span></b>
 													</div>
 													<div class="col num_res">
 														<span><span id="n_receive"></span> risultati</span>

css/place_people.css

@@ -215,7 +215,7 @@ a {
   border: 1px solid;
 }
 
-.inner_results a:link {
+.inner_results .title_doc {
     color: #000;
     background-color: transparent;
     text-decoration: none;

js/map.js

@@ -109,27 +109,30 @@ crm:P4_has_time-span ?uri_ts . \
 ?uri_ts rdfs:label ?time_span . } \
 } "
 
-queryPersone = prefixes + " SELECT DISTINCT ?role ?range ?label COUNT(?range) AS ?count \
+queryPersone = prefixes + " SELECT DISTINCT ?role ?range SAMPLE(?name) AS ?label COUNT(?range) AS ?count \
 WHERE{ \
-  {?place owl:sameAs <" + thisUrlParams.link + "> . \
-  ?event_to crm:P26_moved_to ?place ; \
-  rdf:type crm:EL3_Receive_Letter ; \
-  crm:P01_has_domain ?domain . \
-  ?domain crm:P02_has_range ?range ; \
-  crm:P14.1_in_the_role_of ?uri_role . \
-  ?uri_role rdfs:label ?role . \
-  ?range rdfs:label ?label . \
+{?place owl:sameAs <" + thisUrlParams.link + "> . \
+?event_to crm:P26_moved_to ?place ; \
+rdf:type crm:EL3_Receive_Letter ; \
+crm:P01_has_domain ?domain . \
+?domain crm:P02_has_range ?range ; \
+crm:P14.1_in_the_role_of ?uri_role . \
+?uri_role rdfs:label ?role . \
+?range rdfs:label ?lb ; \
+foaf:name ?name . \
 } UNION { \
-  ?place owl:sameAs <" + thisUrlParams.link + "> . \
-  ?event_to crm:P27_moved_from ?place ; \
-  rdf:type crm:EL2_Send_Letter ; \
-  crm:P01_has_domain ?domain . \
-  ?domain crm:P02_has_range ?range ; \
-  crm:P14.1_in_the_role_of ?uri_role . \
-  ?uri_role rdfs:label ?role . \
-  ?range rdfs:label ?label . \
-  } \
-} GROUP BY ?role ?range ?label"
+?place owl:sameAs <" + thisUrlParams.link + "> . \
+?event_to crm:P27_moved_from ?place ; \
+rdf:type crm:EL2_Send_Letter ; \
+crm:P01_has_domain ?domain . \
+?domain crm:P02_has_range ?range ; \
+crm:P14.1_in_the_role_of ?uri_role . \
+?uri_role rdfs:label ?role . \
+?range rdfs:label ?lb ; \
+foaf:name ?name . \
+} \
+} GROUP BY ?role ?range \
+ORDER BY ?label"
 
 queryCount = prefixes + " SELECT ?place ?label COUNT(?label) AS ?Count \
 WHERE{ \
@@ -400,25 +403,31 @@ function handle_receive(json) {
   var myArray = "";
 
   for (var i=0; i<received.length; i++) {
-    var letter = '<a href=' + received[i][0] + ' target="_blank">' + received[i][1] + '</a>';
+    var letter = "";
     var infObject_button = "";
-    if (received[i][2] != "") {
-      letter = letter + "<br />Segnatura: " + received[i][2];
-    }
-    if (received[i][3] != "") {
-      letter = letter + "<br />Data: " + received[i][3];
-    }
+
 
     if (received[i][4] != "") {
+          letter = '<div class="col-8"><p><span id="' + received[i][0] + '" class="title_doc lettera">'+ received[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + received[i][4] + 
           '" class="lettera btn btn-default" alt="lettera" ><i class="fa fa-envelope"></i><p class="btn-text">Scheda Lettera</p></button>';
     } else {
+          letter = '<div class="col-8"><p><span id="' + received[i][0] + '" class="title_doc object">'+ received[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + received[i][0] + 
           '" class="object btn btn-default" alt="oggetto" title="' + received[i][1] + 
           '"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
     }
 
-    myArray += '<div class="row res"><div class="col-8"><p>'+ letter +'</p></div>' + 
+    if (received[i][2] != "") {
+      letter = letter + "<br />Segnatura: " + received[i][2];
+    }
+    if (received[i][3] != "") {
+      letter = letter + "<br />Data: " + received[i][3];
+    }
+
+    letter = letter + '</p></div>';
+
+    myArray += '<div class="row res">'+ letter + 
         '<div class="col d-flex align-items-start justify-content-end">' + infObject_button +
         '<button type="button" id="' + received[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="' + received[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
@@ -465,25 +474,30 @@ function handle_send(json) {
   var myArray = "";
 
   for (var i=0; i<sent.length; i++) {
-    var letter = '<a href=' + sent[i][0] + ' target="_blank">' + sent[i][1] + '</a>';
+    var letter = "";
     var infObject_button = "";
-    if (sent[i][2] != "") {
-      letter = letter + "<br />Segnatura: " + sent[i][2];
-    }
-    if (sent[i][3] != "") {
-      letter = letter + "<br />Data: " + sent[i][3];
-    }
 
     if (sent[i][4] != "") {
+          letter = '<div class="col-8"><p><span id="' + sent[i][0] + '" class="title_doc lettera">'+ sent[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + sent[i][4] + 
           '" class="lettera btn btn-default" alt="lettera" ><i class="fa fa-envelope"></i><p class="btn-text">Scheda Lettera</p></button>';
     } else {
+          letter = '<div class="col-8"><p><span id="' + sent[i][0] + '" class="title_doc object">'+ sent[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + sent[i][0] + 
           '" class="object btn btn-default" alt="oggetto" title="' + sent[i][1] + 
           '"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
     }
 
-    myArray += '<div class="row res"><div class="col-8"><p>'+ letter +'</p></div>' + 
+    if (sent[i][2] != "") {
+      letter = letter + "<br />Segnatura: " + sent[i][2];
+    }
+    if (sent[i][3] != "") {
+      letter = letter + "<br />Data: " + sent[i][3];
+    }
+
+    letter = letter + '</p></div>';
+
+    myArray += '<div class="row res">'+ letter + 
         '<div class="col d-flex align-items-start justify-content-end">' + infObject_button +
         '<button type="button" id="' + sent[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="' + sent[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
@@ -529,25 +543,30 @@ function handle_cit(json) {
   var myArray = "";
 
   for (var i=0; i<citations.length; i++) {
-    var letter = '<a href=' + citations[i][0] + ' target="_blank">' + citations[i][1] + '</a>';
+    var letter = "";
     var infObject_button = "";
-    if (citations[i][2] != "") {
-      letter = letter + "<br />Segnatura: " + citations[i][2];
-    }
-    if (citations[i][3] != "") {
-      letter = letter + "<br />Data: " + citations[i][3];
-    }
 
     if (citations[i][4] != "") {
+          letter = '<div class="col-8"><p><span id="' + citations[i][0] + '" class="title_doc lettera">'+ citations[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + citations[i][4] + 
           '" class="lettera btn btn-default" alt="lettera" ><i class="fa fa-envelope"></i><p class="btn-text">Scheda Lettera</p></button>';
     } else {
+          letter = '<div class="col-8"><p><span id="' + citations[i][0] + '" class="title_doc object">'+ citations[i][1] + '</span>';
           infObject_button  += '<button type="button" id="' + citations[i][0] + 
           '" class="object btn btn-default" alt="oggetto" title="' + citations[i][1] + 
           '"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
     }
 
-    myArray += '<div class="row res"><div class="col-8"><p>'+ letter +'</p></div>' + 
+    if (citations[i][2] != "") {
+      letter = letter + "<br />Segnatura: " + citations[i][2];
+    }
+    if (citations[i][3] != "") {
+      letter = letter + "<br />Data: " + citations[i][3];
+    }
+
+    letter = letter + "</p></div>";
+
+    myArray += '<div class="row res">'+ letter + 
         '<div class="col d-flex align-items-start justify-content-end">' + infObject_button +
         '<button type="button" id="' + citations[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="' + citations[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
@@ -613,7 +632,7 @@ function handle_persons(json) {
       }
 
       Person += '<div class="row res"><div class="col-8">' +
-      '<a href=' + people[i][0] + ' target="_blank">' + people[i][1] + '</a><br />' + info + '</div>' +
+      '<p><span id="' + people[i][0] + '" class="title_doc persona">'+ people[i][1] + '</span><br />' + info + '</p></div>' +
       '<div class="col d-flex align-items-start justify-content-end"><button type="button" id="' + people[i][0] + '" class="persona btn btn-default" alt="persona" title="' +
       people[i][1] + '"><i class="fa fa-user"></i><p class="btn-text">Scheda Persona</p></button>' +
       '<button type="button" id="' + people[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>' +