Add images to OA

OA.html

@@ -122,7 +122,10 @@
 											<button type="button" class="nav-link active" data-toggle="tab" onClick="show_OA()">Opera</button>
 										</li>
 										<li class="nav-item infoChoice">
-											<button type="button" class="nav-link" data-toggle="tab" onClick="show_CAT()">Catalogo</button>
+											<button type="button" class="nav-link" data-toggle="tab" onClick="show_INV()">Scheda Storica</button>
+										</li>
+										<li class="nav-item infoChoice">
+											<button type="button" class="nav-link" data-toggle="tab" onClick="show_CAT()">Catalogo Marchini</button>
 										</li>
 									</ul>
 					
@@ -141,7 +144,7 @@
 													<div class="col-sm-4">
 														<span class="label">Data:</span>
 													</div>
-													<div class="col" id="time"></div>
+													<div class="col" id="date"></div>
 												</div>
 
 												<div class="row mb-2" id="SGTI" style="display:none;">
@@ -184,7 +187,7 @@
 
 												<div class="row mb-2" id="LDCN" style="display:none;">
 													<div class="col-sm-4">
-														<span class="label">Collocazione:</span>
+														<span class="label">Istituto di conservazione:</span>
 													</div>
 													<div class="col" id="owner"></div>
 												</div>
@@ -205,11 +208,18 @@
 
 												<div class="row mb-2" id="STCC" style="display:none;">
 													<div class="col-sm-4">
-														<span class="label">Stato di Conservazione:</span>
+														<span class="label">Stato di conservazione:</span>
 													</div>
 													<div class="col" id="condition"></div>
 												</div>
 
+												<div class="row mb-2" id="ISCR" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Iscrizione:</span>
+													</div>
+													<div class="col" id="inscription"></div>
+												</div>
+
 												<div class="row mb-2" id="NCT" style="display:none;">
 													<div class="col-sm-4">
 														<span class="label">Codice Univoco del Bene (NCT):</span>
@@ -217,6 +227,49 @@
 													<div class="col" id="identifier"></div>
 												</div>
 											</div>
+
+											<div id="catalogo_info" style="display:none;">
+												<div class="row mb-2" id="CAT_name">
+													<div class="col-sm-4">
+														<span class="label">Nome:</span>
+													</div>
+													<div class="col" id="catalog_name"></div>
+												</div>
+												<div class="row mb-2" id="CAT_num">
+													<div class="col-sm-4">
+														<span class="label">Numero inventario:</span>
+													</div>
+													<div class="col" id="catalog_name"></div>
+												</div>
+												<div class="row mb-2" id="CAT_info">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="catalog_name"></div>
+												</div>
+											</div>
+
+											<div id="scheda_info" style="display:none;">
+												<div class="row mb-2" id="SCT_name">
+													<div class="col-sm-4">
+														<span class="label">Nome:</span>
+													</div>
+													<div class="col" id="scheda_name"></div>
+												</div>
+												<div class="row mb-2" id="SCT_num">
+													<div class="col-sm-4">
+														<span class="label">Numero scheda:</span>
+													</div>
+													<div class="col" id="scheda_name"></div>
+												</div>
+												<div class="row mb-2" id="SCT_info">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="scheda_name"></div>
+												</div>
+											</div>
+
 										</div>
 									</div>
 								</div>
@@ -226,9 +279,19 @@
 								<div class="col" id="container_images">
 									<div id="OA_images">
 										<div class="headInfo" id="head_image">
-											<h2 id="OA_images_titolo">Immagine</h2>
+											<h2 id="OA_images_titolo">Immagine <span id="img_title">Opera</span></h2>
 										</div>
-										<!--<div id="description"></div>-->
+											<div class="border-grey center" id="image_body">
+												<div id="image_artwork">
+													<img class="viewImage" src="img/mpp_img/00000170e848f4658f120b2100c1002b006a007b.jpeg" />
+												</div>
+												<div class="center" id="image_scheda" style="display:none;">
+													<img class="viewImage" src="img/mpp_img/00000171bb65f52199367c7600c1002b006a007b-1.jpg" />
+												</div>
+												<div class="center" id="image_catalog" style="display:none;">
+													<img class="viewImage" src="img/mpp_img/0000017351b4ae0d11b0ff5100c1002b006a007b-1.jpg" />
+												</div>
+											</div>
 									</div>
 								</div>
 							</div>
@@ -239,7 +302,36 @@
 										<div class="headInfo" id="head_NSC">
 											<h2 id="NSC_titolo">Notizie Storico-Critiche</h2>
 										</div>
-										<div id="description"></div>
+										<div class="border-grey" id="description"></div>
+									</div>
+								</div>
+							</div>
+
+							<div class="row box-info-container">
+								<div class="col" id="container_BIB">
+									<div id="info_BIB">
+										<div class="headInfo" id="head_BIB">
+											<h2 id="BIB_titolo">Bibliografia</h2>
+										</div>
+										<div class="border-grey" id="bibliography">
+											<ul>
+												<li>Catra, Elena [Herausgeber]
+													Michele Fanoli  : dalla Venezia di Canova alla Parigi della Maison Goupil.
+													Possagno, Treviso : Museo Gypsotheca Antonio Canova,  2021
+												</li>
+												<li>
+													Bastogi, Nadia [Herausgeber]
+Dopo Caravaggio  : fiori dipinti del Seicento napoletano nelle collezioni di Palazzo Pretorio e della Fondazione De Vito.
+[Prato] : Claudio Martini editore,  2020
+												</li>
+												<li>
+													Bastogi, Nadia [Herausgeber] [Verfasser von ergänzendem Text]
+Dopo Caravaggio  : il Seicento napoletano nelle collezioni di Palazzo Pretorio e della Fondazione De Vito.
+[Prato] : Claudio Martini Editore,  2019
+												</li>
+											</ul>
+
+										</div>
 									</div>
 								</div>
 							</div>

css/OA.css

@@ -0,0 +1,19 @@
+.viewImage {
+    width: 100%;
+    height: auto;
+}
+
+.center {
+    text-align: center;
+}
+
+#image_body {
+    overflow: scroll;
+    max-height: 800px;
+    vertical-align: middle;
+}
+
+.border-grey {
+    border: 1px solid #dee2e6;
+    padding: 16px 20px;
+}

js/OA.js

@@ -30,6 +30,7 @@ function handle_OAdata(json) {
         var note = "";
         var identifier = "";
         var unit = "";
+        var inscription = "";
 
         var dataset = get_dataset_name(graph);
         
@@ -77,6 +78,16 @@ function handle_OAdata(json) {
           $("#NSC").css("display", "flex");
           note = value['note']['value'];
         }
+        if (value.hasOwnProperty('iscrizione')) {
+          $("#ISCR").css("display", "flex");
+          inscription = value['iscrizione']['value'];
+        }
+        if (value.hasOwnProperty('uriSubjectPer')) {
+          subject += "<br /><div class='d-flex'><div class='mr-3'><a href='" + value['uriSubjectPer']['value'] + "'>" +
+          value['subject_person']['value'] + "</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>";
+          
+        }
         if (value.hasOwnProperty('Materials')) {
           if (value['Materials']['value'] != "") {
             $("#MTC").css("display", "flex");
@@ -109,6 +120,7 @@ function handle_OAdata(json) {
         document.getElementById("materials").innerHTML = materials;
         document.getElementById("condition").innerHTML = condition;
         document.getElementById("description").innerHTML = note;
+        document.getElementById("inscription").innerHTML = inscription;
         document.getElementById("link_buttons").innerHTML = Buttons;
 
         
@@ -176,21 +188,52 @@ function handle_Production(json) {
                 artist_name += slice[1];
                 artist += "<div class='d-flex'><div class='mr-3'><a href='" + slice[0] + "'>" +
                           slice[1] + "</a></div><div class='d-flex ml-auto'><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>";
+                          slice[0] + "'><i class='fa fa-user'></i><p class='btn-text'>PERSONA</p></div></div></div></div>";
               }
           }
         }
         
-        if (value.hasOwnProperty('time')) {
+        if (value.hasOwnProperty('time') && (value['time']['value'] != "")) {
+          $("#DT").css("display", "flex");
           time = value['time']['value'];
         }
         
         
         document.getElementById("technique").innerHTML = teche;
-        document.getElementById("time").innerHTML = time;
+        document.getElementById("date").innerHTML = time;
         document.getElementById("artist").innerHTML = artist;
         document.getElementById("client").innerHTML = client;
         
       });
   
 }
+
+function show_OA(){
+  document.getElementById("OA_info").style.display = "block";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "none";
+	document.getElementById("image_artwork").style.display = "block";
+  document.getElementById("image_catalog").style.display = "none";
+  document.getElementById("image_scheda").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Opera";
+}
+
+function show_CAT(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "block";
+  document.getElementById("scheda_info").style.display = "none";
+	document.getElementById("image_artwork").style.display = "none";
+  document.getElementById("image_catalog").style.display = "block";
+  document.getElementById("image_scheda").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Catalogo";
+}
+
+function show_INV(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "block";
+	document.getElementById("image_artwork").style.display = "none";
+  document.getElementById("image_catalog").style.display = "none";
+  document.getElementById("image_scheda").style.display = "block";
+  document.getElementById("img_title").innerHTML = "Scheda Storica";
+}

js/object.js

@@ -435,7 +435,7 @@ function handle_treeview(json, uri_subject) {
 
       if (tree_doc != "") {
 
-          var tree_list = '<li class="upLevelTree"><span style="cursor:pointer;" class="caret"><i class="fa fa-folder-open"></i>' + 
+          var tree_list = '<li class="upLevelTree"><span style="cursor:pointer;" class="caret link"><i class="fa fa-folder-open"></i>' + 
         '<w>' + upLevel + '</w></span><ul id="nested" style="display: none;">' + tree_doc + '</ul></li>';
 
           document.getElementById("treeView").innerHTML = tree_list;

js/query/managerQuery.js

@@ -877,7 +877,7 @@ var queryManager = {
     },
 
     querySchedaOpera : {
-            queryInfo : " SELECT DISTINCT ?graph ?uri ?identifier ?label ?title ?uriType ?type ?uriOwner ?current_owner ?current_location ?subject (group_concat(distinct ?value ; separator='x') as ?dimensions) SAMPLE(?unit) AS ?unit (GROUP_CONCAT(DISTINCT CONCAT(?uriMaterial, '; ', ?material) ; SEPARATOR = '<br />') AS ?Materials) ?condition ?note \
+            queryInfo : " SELECT DISTINCT ?graph ?uri ?identifier ?label ?title ?uriType ?type ?uriOwner ?current_owner ?current_location ?subject (group_concat(distinct ?value ; separator='x') as ?dimensions) SAMPLE(?unit) AS ?unit (GROUP_CONCAT(DISTINCT CONCAT(?uriMaterial, '; ', ?material) ; SEPARATOR = '<br />') AS ?Materials) ?uriSubjectPer SAMPLE(?subject_person) AS ?subject_person ?iscrizione ?condition ?note \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             GRAPH ?graph {?uri rdfs:label ?label} \
@@ -902,8 +902,14 @@ var queryManager = {
             OPTIONAL {?uri crm:P62_depicts ?uriSubject . \
             ?uriSubject rdfs:label ?subject; \
             crm:P2_has_type 'Identificazione Iconografica' .} \
+            OPTIONAL {?uri crm:P62_depicts ?uriSubjectPer . \
+            ?uriSubjectPer rdfs:label ?subject_person ; \
+            rdf:type foaf:person . } \
             OPTIONAL {?uri crm:P52_has_current_owner ?uriOwner . \
             ?uriOwner rdfs:label ?current_owner } \
+            OPTIONAL {?uri crm:P56_bears_feature ?uri_inscription . \
+            ?uri_inscription crm:P128_carries ?uri_objInscr . \
+            ?uri_objInscr crm:P3_has_note ?iscrizione . } \
             }",
 
             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) \

ricerca.html

@@ -167,7 +167,7 @@
 					<div class="row section_title">
 						<div class="col">
 							<span class="section_type">Testi</span><br />
-							<span class="section_desc">Free text search</span>
+							<span class="section_desc">Ricerca libera sui testi</span>
 						</div>
 						<div class="col num_res">
 							<p><span id="n_io"></span> Risultati</p>