Skip to content
Snippets Groups Projects
Commit 6f5e4618 authored by erichard's avatar erichard
Browse files

Modification du terme tutorial par element 

Rendre LabelsTower indépendant du projet CodingPool
parent 5eba4b12
No related branches found
No related tags found
2 merge requests!61Packager labelstower,!60WIP: Implement sqlalchemy
Hide whitespace changes
Inline Side-by-side
app/static/js/tmp.js
+ 4
− 4
View file @ 6f5e4618
......@@ -37,7 +37,7 @@ Function update_selected_tutorials()
var id_forbiden_labels = format_json_to_string(hierarchy.forbiden_labels, 'id');
url = '/selected_tutorials_wtout_mandatory_label/';
url+=id_forbiden_labels;
result.selected_tutorials = JSON.parse(send_simple_request(url));
result.selected_elements = JSON.parse(send_simple_request(url));
}else{
......@@ -47,10 +47,10 @@ Function update_selected_tutorials()
url+=id_mandatory_labels;
url+='/'+number_of_mandatory_labels;
url+='/'+id_forbiden_labels;
result.selected_tutorials = JSON.parse(send_simple_request(url));
result.selected_elements = JSON.parse(send_simple_request(url));
}
var id_tutorials_selected = format_json_to_string(result.selected_tutorials,'id_element');
var id_tutorials_selected = format_json_to_string(result.selected_elements,'id_element');
return id_tutorials_selected;
}
......@@ -62,7 +62,7 @@ Prameter : (D) id_tutorials_selected : string
{ Update the vue #hierarchy (hierarchy.high_discriminating_labels, hierarchy.language_label)
depending on which labels are forbiden and mandatory }
*/
var number_of_selected_tutorials = result.selected_tutorials.length;
var number_of_selected_tutorials = result.selected_elements.length;
url='/discriminating_labels/';
url+=number_of_selected_tutorials+'/';
url+=id_tutorials_selected;
......
app/templates/browse.html
+ 42
− 42
View file @ 6f5e4618
......@@ -97,15 +97,15 @@
<div class="panel panel-primary">
<div class="panel-heading title">
<span id="result-title">
<span >{{ selected_tutorials.length }} {{ (selected_tutorials.length > 1) ? "Tutorials" : "Tutorial" }}</span>
<span >{{ selected_elements.length }} {{ (selected_elements.length > 1) ? "Tutorials" : "Tutorial" }}</span>
</span>
</div>
<!-- PRINT ELEMENTS -->
<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_tutorials' v-bind:key="element['id']">
<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_tutos_title(element['element_name']).indexOf('...') == -1) ? '' : element['element_name']">{{ redim_tutos_title(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>
......@@ -140,7 +140,7 @@
/**
* The 'loading' value is common to both hierarchy and
* result views. When it is equal to 0, the content of
* hierarchy.high_discriminating_labels (new labels) and result.selected_tutorials
* hierarchy.high_discriminating_labels (new labels) and result.selected_elements
* (tutoriels) must not be display. After modifications, loading
* changes to one and they are displayed.
*/
......@@ -175,7 +175,7 @@
hierarchy.mandatory_labels = [];
hierarchy.high_discriminating_labels = [];
hierarchy.forbiden_labels = [];
result.selected_tutorials = [];
result.selected_elements = [];
update_loading(0);
update_tutorials_and_labels();
save_session();
......@@ -241,27 +241,27 @@
save_session();
update_loading(1);
},
redim_labels(title) {
redim_labels(label_name) {
/**
* In function of the len of hierarchy div and title length,
* In function of the len of hierarchy div and label_name length,
* the label name is truncated.
**/
var size_div = hierarchy.size_div;
if (size_div <= 213 && title.length > 12)
return (title.slice(0, 8)+"...");
else if (size_div <= 270 && title.length > 18)
return (title.slice(0, 15)+"...");
else if (size_div <= 368 && title.length > 23)
return (title.slice(0, 16)+"...");
else if (size_div <= 462 && title.length > 43)
return (title.slice(0, 29)+"...");
else if (size_div <= 581 && title.length > 43)
return (title.slice(0, 40)+"...");
else if (size_div <= 690 && title.length > 59)
return (title.slice(0, 56)+"...");
else if (size_div <= 720 && title.length > 73)
return (title.slice(0, 70)+"...");
return (title);
if (size_div <= 213 && label_name.length > 12)
return (label_name.slice(0, 8)+"...");
else if (size_div <= 270 && label_name.length > 18)
return (label_name.slice(0, 15)+"...");
else if (size_div <= 368 && label_name.length > 23)
return (label_name.slice(0, 16)+"...");
else if (size_div <= 462 && label_name.length > 43)
return (label_name.slice(0, 29)+"...");
else if (size_div <= 581 && label_name.length > 43)
return (label_name.slice(0, 40)+"...");
else if (size_div <= 690 && label_name.length > 59)
return (label_name.slice(0, 56)+"...");
else if (size_div <= 720 && label_name.length > 73)
return (label_name.slice(0, 70)+"...");
return (label_name);
}
}
});
......@@ -270,38 +270,38 @@
el: '#result',
data: {
/**
* - 'selected_tutorials'
* contain all tutos to display on this form : [title, link, date].
* - 'selected_elements'
* contain all tutos to display on this form : [id, element_name].
* - 'loading'* - size_div
* contain the size (width of the result block) for be able to truncate
* the title of tutorials.
* the name of elements.
*/
selected_tutorials: [],
selected_elements: [],
loading: 1,
size_div: 0,
height_window: 0,
width_window: 0
},
methods: {
redim_tutos_title(title) {
redim_element(element_name) {
/**
* In function of the len of result div and title length,
* the title of the tuto is truncated.
* In function of the len of result div and element_name length,
* the name of the element is truncated.
**/
size_div = result.size_div;
if (size_div <= 643 && title.length >= 27)
return (title.slice(0, 22)+"...");
else if (size_div <= 649 && title.length >= 29)
return (title.slice(0, 26)+"...");
else if (size_div <= 695 && title.length >= 36)
return (title.slice(0, 29)+"...");
else if (size_div <= 716 && title.length >= 36)
return (title.slice(0, 33)+"...");
else if (size_div <= 750 && title.length > 40)
return (title.slice(0, 35)+"...");
else if (size_div <= 878 && title.length >= 50)
return (title.slice(0, 45)+"...");
return (title);
if (size_div <= 643 && element_name.length >= 27)
return (element_name.slice(0, 22)+"...");
else if (size_div <= 649 && element_name.length >= 29)
return (element_name.slice(0, 26)+"...");
else if (size_div <= 695 && element_name.length >= 36)
return (element_name.slice(0, 29)+"...");
else if (size_div <= 716 && element_name.length >= 36)
return (element_name.slice(0, 33)+"...");
else if (size_div <= 750 && element_name.length > 40)
return (element_name.slice(0, 35)+"...");
else if (size_div <= 878 && element_name.length >= 50)
return (element_name.slice(0, 45)+"...");
return (element_name);
}
}
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment