customisable labelstower : refactor arrays' keys name

test/demo/templates/browse.html

@@ -24,6 +24,7 @@
 			<br><br>
 			<div id="header" v-cloak>
 				<div class="row">
+	{{   mandatory_labels == None }}
 					<div class="col-md-12" id="project_title">
 						<a href="/" style="text-decoration:none; color: 124f66;">
 						<h1 style="display: inline;"><b> [[ txt['project_name'] ]] </b></h1>
@@ -45,7 +46,7 @@
 							<!-- HIERARCHY.MANDATORY_LABELS -->
 							<span v-for='(label, index) in mandatory_labels'>
 								<img title="Deselect the elements bearing this label" class="hierarchy-icone_left" @click="rm_mandatory_label(index)" src="static/img/plus-encadre.png" onmouseover="this.src='static/img/plus-encadre-vert.png'" onmouseout="this.src='static/img/plus-encadre.png'">
-								<span :title="label['name']"><b>{{ redim_labels(label['name']) }}</b></span>
+								<span :title="label['label_name']"><b>{{ redim_labels(label['label_name']) }}</b></span>
 								<img class="hierarchy-icone_right" src="static/img/moins.png" style="visibility: hidden;"><br> <!-- MARQUEUR (elliot)-->
 							</span>
 							<!-- HIERARCHY.MANDATORY_LABELS -->
@@ -53,21 +54,21 @@
 							<!-- HIERARCHY.FORBIDEN_LABELS -->
 							<span v-if="forbiden_labels.length != 0" v-for='(label, index) in forbiden_labels'>
 								<img class="hierarchy-icone_left" src="static/img/plus.png" style="visibility: hidden;">
-								<span :title="label['name']"><b>{{ redim_labels(label['name']) }}</b></span>
+								<span :title="label['label_name']"><b>{{ redim_labels(label['label_name']) }}</b></span>
 								<img title="Authorizes elements bearing this label" class="hierarchy-icone_right" @click="rm_forbiden_label(index)" src="static/img/moins-encadre.png" onmouseover="this.src='static/img/moins-encadre-rouge.png'" onmouseout="this.src='static/img/moins-encadre.png'">
 								<br>
 							</span>
 							<!-- HIERARCHY.FORBIDEN_LABELS -->
-							
+
 							<!-- HIERARCHY.HIGH_DISCRIMATING_LABELS -->
 							<div v-if="loading == 1">
 								<div id="hierarchy-separator" v-if="(mandatory_labels.length > 0 || forbiden_labels.length > 0) && high_discriminating_labels.length > 0">
 									<img src="static/img/monSeparateur.png"/>
 								</div>
 								<transition-group name="new_labels">
-									<span v-for='(label, index) in high_discriminating_labels' v-bind:key="label['name']">
+									<span v-for='(label, index) in high_discriminating_labels' v-bind:key="label['label_name']">
 										<img title="Selects elements with this label" class="hierarchy-icone_left" @click="add_mandatory_label(index, 'new')" src="static/img/plus.png" onmouseover="this.src='static/img/plus-vert.png'" onmouseout="this.src='static/img/plus.png'">
-										<span :title="label['name']"><b>{{ redim_labels(label['name']) }}</b></span>
+										<span :title="label['label_name']"><b>{{ redim_labels(label['label_name']) }}</b></span>
 										<img title="Prohibits elements with this label" class="hierarchy-icone_right" @click="add_forbiden_label(index, 'new')" src="static/img/moins.png" onmouseover="this.src='static/img/moins-rouge.png'" onmouseout="this.src='static/img/moins.png'">
 										<br>
 									</span>
@@ -77,14 +78,14 @@
 
 						</div>
 					</div>
-					
+
 				</div>
 
 				<div class="col-md-9" id="result" v-cloak>
 					<div class="panel panel-primary">
 						<div class="panel-heading title">
 							<span id="result-title">
-								<span >{{ selected_elements.length }} [[ txt['Element_name'] ]]</span>
+								<span >{{ selected_elements.length }} [[ txt['x'] ]]</span>
 							</span>
 						</div>
 
@@ -92,7 +93,7 @@
 						<ul v-if="loading == 1" class="list-group" v-bind:style="'max-height: '+((width_window > 991) ? (height_window - 151 - 70) : (450))+'px;'">
 							<li class="list-group-item" v-for='element in selected_elements' v-bind:key="element['id']">
 								<span>
-									<b class="single_result" v-bind:title="(redim_element(element['name']).indexOf('...') == -1) ? '' : element['name']">{{ redim_element(element['name']) }}</b>
+									<b class="single_result" v-bind:title="(redim_element(element['element_name']).indexOf('...') == -1) ? '' : element['element_name']">{{ redim_element(element['element_name']) }}</b>
 								</span>
 							</li>
 						</ul>
@@ -101,9 +102,8 @@
 				</div>
 
 			</div>
-			
-		</div>
 
+		</div>
 	</body>
 
 	<script src="static/js/search_new_elements.js"></script>
@@ -176,6 +176,7 @@
 					hierarchy.mandatory_labels.push(hierarchy.high_discriminating_labels[index]);
 					hierarchy.high_discriminating_labels.splice(index, 1);
 					console.log("av")
+					console.log(hierarchy.high_discriminating_labels)
 					update_elements_and_labels();
 					console.log("ap")
 					save_session();