Alessia пре 1 година
родитељ
комит
5876165bd0
3 измењених фајлова са 54 додато и 10 уклоњено
  1. 11 3
      OA.html
  2. 35 7
      js/OA.js
  3. 8 0
      js/query/managerQuery.js

+ 11 - 3
OA.html

@@ -161,6 +161,13 @@
 													<div class="col connected_subject" id="connected_subject"></div>
 												</div>
 
+												<div class="row mb-2" id="ICON" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Iconclass:</span>
+													</div>
+													<div class="col iconclass" id="iconclass"></div>
+												</div>
+
 												<div class="row mb-2" id="OGTD" style="display:none;">
 													<div class="col-sm-4">
 														<span class="label">Tipo:</span>
@@ -307,9 +314,10 @@
 											<h2 id="OA_images_titolo">Immagine <span id="img_title">Opera</span></h2>
 										</div>
 
-										<button title="Lente d\'ingrandimento" type="button" value="zoom" class="zoomImg btn btn-default" alt="scheda"><i class="fa fa-search-plus"></i></button>
-										
-										
+										<div class="d-flex justify-content-end">
+											<button title="Lente d\'ingrandimento" type="button" value="zoom" class="zoomImg btn btn-default" alt="scheda"><i class="fa fa-search-plus" style="font-size:x-large;"></i></button>
+										</div>
+
 										<div id="images_container" class="row border-grey center">
 											<div class="col-3" id="image_min">
 												<div class="row">

+ 35 - 7
js/OA.js

@@ -17,6 +17,9 @@ doJsonQuery(queryPic).done(function(data) { handle_Picture(data); });
 querySc = prefixes + (queryManager['querySchedaOpera']['querySchedeStoriche']).replace('{URI}', link);
 doJsonQuery(querySc).done(function(data) { handle_SchedeStoriche(data); });
 
+queryIcon = prefixes + (queryManager['querySchedaOpera']['queryIconclass']).replace('{URI}', link);
+doJsonQuery(queryIcon).done(function(data) { handle_Iconclass(data); });
+
 var img_pic = "";
 var img_cat = "";
 var img_sc = "";
@@ -43,6 +46,7 @@ function handle_OAdata(json) {
         var identifier = "";
         var unit = "";
         var inscription = "";
+        var conn_subject = "";
         var src_picture = "";
         var picture = "";
 
@@ -97,11 +101,12 @@ function handle_OAdata(json) {
           inscription = value['iscrizione']['value'];
         }
         if (value.hasOwnProperty('uriSubjectPer')) {
+          $("#SGTI_C").css("display", "flex");
           var givenName = value['personName']['value'];
           var surname = value['personSurname']['value'];
           var patronymic = value['personPatronymic']['value'];
           var name = givenName + " " + patronymic + " " + titleCase(surname);
-          subject += "<br /><div class='d-flex'><div class='mr-3'><a href='" + value['uriSubjectPer']['value'] + "'>" +
+          conn_subject = "<div class='d-flex'><div class='mr-3'><a href='" + value['uriSubjectPer']['value'] + "'>" +
           name + "</a></div><div class='d-flex ml-auto'><div class='persona btn-icon' style='cursor:pointer' id='" +
           value['uriSubjectPer']['value'] + "'><i class='fa fa-user'></i><p class='btn-text'>PERSONA</p></div></div></div></div>";
           
@@ -127,17 +132,14 @@ function handle_OAdata(json) {
         <button title="Permalink" type="button" value="artwork" id="' + uri + '" class="hyp btn btn-default" alt="scheda" title="Hyperlink"><i class="fa fa-link"></i></button> \
         <a href="http://dev.restore.ovi.cnr.it/lodlive/?' + uri + '" target="_blank"><button type="button" title="Naviga il grafo" class="btn btn-default info" alt="LOD" title="LodLive"><i class="fa fa-share-alt"></i></button></a></div></div>';
 
-        var subjects = document.getElementsByClassName("subject");
-
-        for (i in subjects) {
-          subjects[i].innerHTML = subject;
-        }
 
         document.getElementById("grafo").innerHTML = dataset;
         document.getElementById("nome_oggetto").innerHTML = label;
         document.getElementById("identifier").innerHTML = identifier;
         document.getElementById("type").innerHTML = type;
         document.getElementById("owner").innerHTML = current_owner;
+        document.getElementById("subject").innerHTML = subject;
+        document.getElementById("connected_subject").innerHTML = conn_subject;
         document.getElementById("dimensions").innerHTML = dimensions + unit;
         document.getElementById("materials").innerHTML = materials;
         document.getElementById("condition").innerHTML = condition;
@@ -309,7 +311,7 @@ function handle_Bibliography(json) {
 
         if (value.hasOwnProperty('catalog')) {
           if (value['catalog']['value'] != "") {
-            bibCit = value['bibliography']['value'];
+            bibCit = value['bibliography']['value'] + " " + pages;
             cc = value['catalog']['value'];
             cat = cc.split(", ");
             for (i in cat) {
@@ -346,6 +348,32 @@ function handle_Bibliography(json) {
   
 }
 
+function handle_Iconclass(json) {
+  
+  console.log(json['results']['bindings']);
+
+  var Icon = "";
+
+  $.each(
+      json['results']['bindings'],
+      function (index, value) {
+        var uri_icon = value['scheda']['value'];
+        var sigla_icon = scheda.replace(".jpg", "");
+        
+        Icon += '<a href="' + uri_icon + '">' + sigla_icon + '</a>';
+        
+      });
+  
+  document.getElementById("iconclass").innerHTML = Icon;
+
+
+  if (Icon != "") {
+    $("#ICON").css("display", "flex");
+  } else {
+    $("#ICON").css("display", "none");
+  }
+}
+
 function handle_SchedeStoriche(json) {
 
   console.log(json['results']['bindings']);

+ 8 - 0
js/query/managerQuery.js

@@ -914,6 +914,14 @@ var queryManager = {
             ?uri_objInscr crm:P3_has_note ?iscrizione . } \
             }",
 
+            queryIconclass = " SELECT DISTINCT uri_iconclass ?iconclass \
+            WHERE { \
+            VALUES ?uri {<URI>} \
+            ?uri crm:P62_depicts ?uri_iconclass . \
+            ?uri_iconclass rdfs:label ?iconclass ; \
+            crm:P2_has_type 'Sigla Iconclass' . \
+            }",
+
             queryProduction : " SELECT DISTINCT (GROUP_CONCAT(DISTINCT CONCAT(?uriPerson, '; ', ?person, '; ', ?role) ; SEPARATOR = '<br />') AS ?Partecipants) (group_concat(distinct ?time_span ;separator='-') as ?time) (GROUP_CONCAT(DISTINCT CONCAT(?uriTecne, '; ', ?technique) ; SEPARATOR = '<br />') AS ?techniques) \
             WHERE { \
             VALUES ?uri {<{URI}>} \