fixing some translation

doc/TODO.txt

@@ -1,11 +1,58 @@
 
 
-v2.2.2:
+v2.2.5:
 -------
+CPU usage on server increases ... ???
 
-v2.3.0:
+#150  Uploading data with complex fields names leads to failed WS communication #150 	
+    - need to make server more robust to such anomaly
+    - prevent user to make such mistake
+    - generate a simple field name and add corresponding vocabulary entry?
+
+
+in preference menu, lockers shall not be displayed (not used at all)
+
+
+v3.0.0:
 -------
 
+3D scene exporter:
+	-user stories:		
+		- place elements over a 2D map (earth, europe, america, asia, africa, antartica, france)
+			customize map
+		- chronological rendering
+			customize min/max date on the legend arrow
+		- 3D earth
+			customize map
+		- 3D library: position of books/items into library/museum
+		- 3D archeology: position of items on scene
+	- import WebGL scene as base
+	- export index contents to add items in the scene:
+		. mapping fields combination -> ID of item to clone in the scene
+			- left: choose some combination of fields values
+			- right: scene graph with items rendered when selected
+		. mapping field -> 3D coordinates, based on
+			- x,y,z field / z only + automatic x,y / lat,long / id->coordinates mapping list (cities names for ex) / scene object name
+			- x/y/z adaptation coef 
+		. links
+			- choose links to be rendered
+			- way to render links
+			- build link path without going inside scene objects ("constant altitude" mode) 
+		. animated scene:
+			- mapping field -> scene time
+		. customize scene:
+			- change a texture
+			- change color?
+		. highlight Lucene search result within the scene
+	- save final scene / conf file into index drive
+
+3D mapping conf file:
+	- path to WebGL scene
+	- items 3D mapping
+
+
+
+
 mxtmp folder shall be under /webapp not under /metaindex
 
 on logout by session expired, unable to login again (blank page):
@@ -16,8 +63,6 @@ on logout by session expired, unable to login again (blank page):
 
 add javadoc to WS entry points
 
-more realistic/consistent "empty catalog contents" picture (Excel file screenshot)
-
 
 
 #118 bug: when renaming a perspective, it actually adds a new one, but keep previous one
@@ -151,6 +196,9 @@ Backlog:
 			java.sql.SQLException: No suitable driver found for jdbc:mysql://metaindex.fr:3306/metaindex?useUnicode=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 Done:
 -----
+v2.2.5:
+XLS import : "Choose Sheet from your file" : faire la traduction en français
+
 v2.2.3 and 2.2.4: fixing download paths in prod env
 v2.2.2: fixed toolbox download path in prod env
 v2.2.1: fixed access restricted on toolbox in prod env 

doc/maintenance/tests/demo-3d/3dchrono.xml

@@ -0,0 +1,9 @@
+<mx3d baseScene="myscene.webgl">
+    <items>
+        <mappedItem>
+            <Item fieldName="type" fieldValue="person"></Item>
+            <coordinates>
+            </coordinates>
+        </mappedItem>
+    </items>
+</mx3d>

src/main/java/metaindex/app/control/websockets/catalogs/WsControllerCatalog.java

@@ -86,7 +86,7 @@ public void handleCatalogsRequest(SimpMessageHeaderAccessor headerAccessor,
     		Iterator<ICatalog> it = catalogs.iterator();
     		while (it.hasNext()) {
 	    		ICatalog curCatalog = it.next();
-	    		// request catalogId=0 == retrieve all catalogs not accessible to the user
+	    		// request catalogId=0 == retrieve all catalogs already accessible to the user
 	    		if (requestMsg.getCatalogId().equals(0) 
 	    				|| requestMsg.getCatalogId().equals(curCatalog.getId())) {
 	    			if (user.getUserCatalogAccessRights(curCatalog.getId())!=USER_CATALOG_ACCESSRIGHTS.NONE)
@@ -101,6 +101,7 @@ public void handleCatalogsRequest(SimpMessageHeaderAccessor headerAccessor,
 	    			}
 	    		}
 	    		// request catalogId=-1 == retrieve all catalogs not accessible to the user
+	    		// this is used to build list of catalogs to require access to
 	    		else if (requestMsg.getCatalogId().equals(-1)) {
 	    			if (user.getUserCatalogAccessRights(curCatalog.getId())==USER_CATALOG_ACCESSRIGHTS.NONE)
 	    			{ 

src/main/resources/global_en.properties

@@ -50,6 +50,7 @@ If not, hum well, it might work ... or not!
 globals.nextElement=Next element in your navigation history
 globals.prevElement=Previous element in your navigation history
 global.refreshPageIfPageIsStillBlankWithinFewSeconds=Please refresh this page if page stays blank within few seconds (press F5 of CTRL-R)
+global.areYouSure=Humm really ?
 
 # error pages
 global.errorpage.MetaindexError=MetaindeX Error
@@ -374,6 +375,7 @@ Catalogs.fields=Fields
 Catalogs.field=Field
 Catalogs.field.type=Type
 Catalogs.field.enumeration=Enumeration
+Catalogs.fields.enumeration.comment=For "Enumeration" column, use a search query (Lucene, ex: "type:person")
 Catalogs.field.multi=Multi
 Catalogs.field.comments=Comments
 Catalogs.field.unableToCreateTerm=Sorry, unable to create new field
@@ -529,6 +531,7 @@ Items.uploadItems.warningNotOverridingContents=* ID * is not assigned : this wil
 Items.uploadItems.warningDatesWithExcel=Please ensure this column is of <b>type &acute;text&acute;</b> rather than &acute;date&acute; \
 in your file (right-click / &acute;cell formatting&acute;). Otherwise, <b>dates before 1900 will be exported as blank</b> and \
 thus will be skipped while loading contents in database.
+items.uploadItems.chooseSheet=Choose Sheet from your file
 Items.downloadItems.asGexf=Download GEXF
 Items.downloadItems.asCsv=Download CSV
 Items.downloadItems.csvFileReady=Click to download your CSV file, it will be removed within 10 minutes

src/main/resources/global_fr.properties

@@ -50,6 +50,7 @@ Si vous continuez tel quel, hum il se peut que cela fonctionne ... ou pas!
 globals.nextElement=Elément suivant dans l´historique
 globals.prevElement=Elément précédent dans l´historique
 global.refreshPageIfPageIsStillBlankWithinFewSeconds=Merci de rafraîchir cette page si cette page reste vide d´ici quelques secondes (presser F5 ou CTRL-R)
+global.areYouSure=Hmmm Vraiment ?
 
 # error pages
 global.errorpage.MetaindexError=Erreur MetaindeX
@@ -343,8 +344,8 @@ des nombres ou le caractère "_" et être long d´au m
 Catalogs.notFoundInDb=Non trouvé en base de donnée
 Catalogs.server.unableToUpdateTerm=Impossible de mettre à jour le type du champ {0} à {1} : {2}
 Catalogs.delete=Supprimer
-Catalogs.deleteConfirmation.title=Supprimer <b>d&eacute;finitevement</b> ce catalogue et tous ses fichiers du drive
-Catalogs.deleteConfirmation.body=<b>Attention</b> cette op&eacute;ration va supprimer tous les documents ainsi que tous les fichiers stock&eacute;s\
+Catalogs.deleteConfirmation.title=Supprimer <b>d&eacute;finitivement</b> ce catalogue et tous ses fichiers du drive
+Catalogs.deleteConfirmation.body=<b>Attention</b> cette op&eacute;ration va supprimer tous les documents ainsi que tous les fichiers stock&eacute;s \
 sur le drive asscoi&eacute;.<br/><br/>\
 <b style='color:#e77'>Il ne sera pas possible de revenir en arri&egrave;re!</b> \
 Un petit export CSV comme backup peut &ecirc;tre une bonne id&eacute;e ... !<br/><br/>\
@@ -390,6 +391,7 @@ Catalogs.fields=Champs
 Catalogs.field=Champ
 Catalogs.field.type=Type
 Catalogs.field.enumeration=Enumeration
+Catalogs.fields.enumeration.comment=Pour la colonne &quot;Enumeration&quot;, utiliser une requ&ecirc;te de recherche (Lucene, ex: &quot;type:personne&quot;)
 Catalogs.field.multi=Multi
 Catalogs.field.comments=Commentaires
 Catalogs.field.unableToCreateTerm=D&eacute;sol&eacute;, impossible de cr&eacute;er le nouveau champ
@@ -548,6 +550,7 @@ cela va cr&eacute;er un nouveau document pour chaque ligne du fichier.
 Items.uploadItems.warningDatesWithExcel=Assurez-vous que cette colonne soit de <b>type &acute;text&acute;</b> plut&ocirc;t que &acute;date&acute; \
 dans votre fichier (click-droit / &acute;format de cellules&acute;. Autrement, <b>les dates ant&eacute;rieures &agrave; 1900 seront export&eacute;es \
 comme vides</b> et ignor&eacute;es lors de l&acute;ajout en base de donn&eacute;es.
+items.uploadItems.chooseSheet=Choisissez la feuille &agrave; importer
 Items.downloadItems.asGexf=Extraire GEXF 
 Items.downloadItems.asCsv=Extraire CSV
 Items.downloadItems.csvFileReady=Cliquez pour t&eacute;l&eacute;charger votre fichier CSV, il sera supprim&eacute; dans 10 minutes
@@ -829,7 +832,7 @@ sont interdits dans les IDs des documents</b> (utiliser des caract&egrave;res sp
 Si une colonne est vide dans votre fichier, le champ correspondant restera inchang&eacute; dans la base de donn&eacute;es. Si vous souhaitez vider le contenu d&acute;un champ existant, \
 vous devez placer le texte sp&eacute;cial &quot;<b>__empty__</b>&quot; (avec 2 underscores de chaque c&ocirc;t&eacute;) dans votre fichier.<br/><br/> \
 Le mot clef &quot;<b>__CR__</b>&quot; (Carriage Return) peut &ecirc;tre utilis&eacute; pour marquer un retour &agrave; la ligne dans le contenu du fichier CSV.<br/> \
-Le mot clef &quot;<b>__MX_ESCAPED_SEPARATOR__</b>&quot; sera remplac&eacute; par le caract&egrave;re &quot;;&quot; lors du processus d&quote;importation.<br/><br/> \
+Le mot clef &quot;<b>__MX_ESCAPED_SEPARATOR__</b>&quot; sera remplac&eacute; par le caract&egrave;re &quot;;&quot; lors du processus d&quot;importation.<br/><br/> \
 <b>Attention</b>: seul l&acute; encodage <b>UTF-8</b> est pour l&acute; instant accept&eacute; pour les CSV. Soyez particuli&egrave;rement vigilant notamment \
 si vous exportez vos donn&eacute;es depuis un fichier Excel. \
 Vous pouvez utiliser l&acute; &eacute;diteur <b><a target='_blank' href='https://code.visualstudio.com/' >VSCode</a></b> par exemple \

src/main/resources/struts.xml

@@ -24,6 +24,12 @@
 
 </global-exception-mappings>
 
+
+		<action name="3dview" class="metaindex.app.beans.BeanProfile">
+			<result name="BeanProcess_SUCCESS" >/public/3dview.jsp</result>			
+		</action>
+
+
 		<!-- Welcome page -->
 		<action name="welcome" class="metaindex.app.beans.BeanWelcome">
 			<result name="BeanProcess_SUCCESS" >/public/welcome.jsp</result>			

src/main/webapp/public/3dview.jsp

@@ -0,0 +1,48 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib uri="/struts-tags" prefix="s" %>  
+
+<!DOCTYPE html>
+<html lang="en">
+<header>
+<script type="module">
+import * as THREE from 'https://metaindex.fr:20000/webapp/public/commons/deps/threejs/three.module.js';
+
+let camera, scene, renderer;
+let geometry, material, mesh;
+
+init();
+
+function init() {
+
+        camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 10 );
+        camera.position.z = 1;
+
+        scene = new THREE.Scene();
+
+        geometry = new THREE.BoxGeometry( 0.2, 0.2, 0.2 );
+        material = new THREE.MeshNormalMaterial();
+
+        mesh = new THREE.Mesh( geometry, material );
+        scene.add( mesh );
+
+        renderer = new THREE.WebGLRenderer( { antialias: true } );
+        renderer.setSize( window.innerWidth, window.innerHeight );
+        renderer.setAnimationLoop( animation );
+        document.body.appendChild( renderer.domElement );
+
+}
+
+function animation( time ) {
+
+        mesh.rotation.x = time / 2000;
+        mesh.rotation.y = time / 1000;
+
+        renderer.render( scene, camera );
+
+}
+</script>
+</header>
+<body>
+
+</body>
+</html>

src/main/webapp/secure/catalogs/details.jsp

@@ -268,6 +268,9 @@ function details_reconfirm_delete_catalog(catId) {
 		 		<button type="button" class="_button_delete_ btn btn-default btn-sm alert alert-danger" 	  		
 		 	  		data-toggle="confirmation"
 		 	  		delete_dbid=""
+		 	  		title="<s:text name="global.areYouSure" />"
+		 	  		btnOkLabel="<s:text name="global.yes" />"
+		 	  		btnCancelLabel="<s:text name="global.no" />"
 		 			onConfirm="details_reconfirm_delete_catalog(this.delete_dbid);" onCancel=""
 		 			style="margin-left:1em;">
 		 			<i class="fa fa-times" aria-hidden="true"></i> <s:text name="Catalogs.delete" />

src/main/webapp/secure/catalogs/details_tab_mapping.jsp

@@ -152,7 +152,7 @@
 		// comments
 		let comments = newTermNode.querySelector("._term_comments_");
 		if (termDesc.datatype=="LINK") {
-			comments.innerHTML="enums. list shall be a search request (ex: 'type:person')";
+			comments.innerHTML="<s:text name="Catalogs.fields.enumeration.comment" />";
 		}
 					
 		termsInsertspot.appendChild(newTermNode);

src/main/webapp/secure/catalogs/details_tab_perspectives.jsp

@@ -51,6 +51,8 @@
 			<div class="p-2 mx-btn-transparent-danger mx-square-button-xs d-sm-inline-block btn btn-sm shadow-sm _remove_button_"
 						title="<s:text name='Catalogs.perspectives.remove_question' />"	 	
 						data-toggle="confirmation"
+						btnOkLabel="<s:text name="global.yes" />"
+		 	  			btnCancelLabel="<s:text name="global.no" />"
 				  		onConfirm="MxGuiPerspective.deletePerspective(findAncestorNode(this,'_customizable_perspective_root_').id)" 
 				  		onCancel=""	  				
 			 			 >

src/main/webapp/secure/commons/html/details.jsp

@@ -16,7 +16,7 @@
         	  style="margin-top:20vh;margin-left:40vw;max-width:30%;" >
      </div>
 	<table><tr>
-		<td><h1 id="MxGui.details.title.text" class="h3 mb-0 text-gray-800"></h1></td>  
+		<td><h1 id="MxGui.details.title.text" class="h3 mb-0" style="color:#bbb"></h1></td>  
 		<td id="MxGui.details.count" class="text-center" style="padding-left:1rem;display:none">
 			<span id="MxGui.details.count.matchNumber" >0</span> 
 			/ 

src/main/webapp/secure/commons/html/perspective/perspective_field_gen_customizable.jsp

@@ -147,6 +147,8 @@
 		  	<div style="display:none" class="_remove_button_ p-2 mx-btn-transparent-danger mx-square-button-xs d-sm-inline-block btn btn-sm shadow-sm"	 
 		  				title="<s:text name='Catalogs.perspectives.field.remove_question' />"
 		  				data-toggle="confirmation"
+		  				btnOkLabel="<s:text name="global.yes" />"
+		 	  			btnCancelLabel="<s:text name="global.no" />"
 				  		onConfirm="_deleteFieldFuncsById[findAncestorNode(this,'_customizable_field_root_').id]();" 
 				  		onCancel=""								  				
 			 			onclick="" >

src/main/webapp/secure/commons/html/perspective/perspective_section.jsp

@@ -303,6 +303,8 @@ function _commons_perspective_build_section(catalogDesc,perspectiveData,tabIdx,s
 				<div class="p-2 mx-btn-transparent-danger mx-square-button-xs d-sm-inline-block btn btn-sm shadow-sm"
 							title="<s:text name='Catalogs.perspectives.section.remove_question' />"	 
 							data-toggle="confirmation"
+							btnOkLabel="<s:text name="global.yes" />"
+		 	  				btnCancelLabel="<s:text name="global.no" />"
 					  		onConfirm="_deleteSectionFuncsById[findAncestorNode(this,'_customizable_section_root_').id]();" 
 					  		onCancel=""		  				
 				 			onclick="" >

src/main/webapp/secure/commons/html/perspective/perspective_tab.jsp

@@ -246,6 +246,8 @@ var _curTabIndex=0;
 			<span class="p-2 mx-btn-transparent-danger mx-square-button-xs d-sm-inline-block btn btn-sm shadow-sm"	 
 		  				title="<s:text name='Catalogs.perspectives.tab.remove_question' />"		
 		  				data-toggle="confirmation"
+		  				btnOkLabel="<s:text name="global.yes" />"
+		 	  			btnCancelLabel="<s:text name="global.no" />"
 				  		onConfirm="_deleteTabFuncsById[findAncestorNode(this,'_customizable_tab_root_').id]();" 
 				  		onCancel="" >
 			 			<i class="fas fa-times fa-sm text-grey-50"></i>

src/main/webapp/secure/items/details.jsp

@@ -405,6 +405,9 @@
 	                <button type="button" class="_button_delete_ btn btn-default btn-sm alert alert-danger" 	  		
 			 	  		data-toggle="confirmation"
 			 	  		delete_dbid=""
+			 	  		title="<s:text name="global.areYouSure" />"
+			 	  		btnOkLabel="<s:text name="global.yes" />"
+		 	  			btnCancelLabel="<s:text name="global.no" />"
 			 			onConfirm="ws_handlers_deleteItem(this.delete_dbid);" onCancel=""
 			 			style="margin-left:1em;font-size:0.7rem;"> 
 			 			<i class="fa fa-times" aria-hidden="true"></i> <s:text name="Items.delete" />
@@ -446,6 +449,9 @@
  <button id="details.deleteAll.button" type="button" class="btn btn-default btn-sm alert alert-danger" 	  
  		style="display:none;margin-left:1rem;margin-right:1rem;"		
   		data-toggle="confirmation"
+  		title="<s:text name="global.areYouSure" />"
+  		btnOkLabel="<s:text name="global.yes" />"
+		btnCancelLabel="<s:text name="global.no" />"
   		onConfirm="details_reconfirm_deleteAllItems();" 
   		onCancel="" ><i class="fa fa-times" aria-hidden="true"></i> 
 		<s:text name="Items.deleteAll" />

src/main/webapp/secure/items/io/csv_xls_ods.jsp

@@ -310,7 +310,7 @@ function _showChooseCalcSheet(sheetNames,fileName,choiceCallback) {
 		choiceCallback(chosenSheetName,fileName);
 		
 	}
-	let popupChoice = MxGuiPopups.newDropdownInputPopup(choices,"Choose Sheet from your file",handleChoosenSheetName);	
+	let popupChoice = MxGuiPopups.newDropdownInputPopup(choices,"<s:text name="items.uploadItems.chooseSheet" />",handleChoosenSheetName);	
 	popupChoice.id="chooseCalcPopup";
 	MxGuiHeader.addPopup(popupChoice);
 	popupChoice.show();