jef-sachsen/EUromat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add lists hints to result page #4

Browse Source
This commit is contained in:
Karl-Martin Zimmermann
2017-08-15 15:13:34 +02:00
parent 53b6bc7f93
commit c8a685e7a5
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/data.json
View File

File diff suppressed because one or more lines are too long

15
includes/elements.php
View File

@@ -43,7 +43,8 @@ function print_result_detail_table($answers, $data){
}
function print_list_result_bar($data, $listindex, $answers, $class){
$list_name = $data['lists'][$listindex]['name_x'];
$list_name = $data['lists'][$listindex]['name'];
$hint = $data['lists'][$listindex]['hint'];
$list_points = calculate_points($data['answers'][$listindex], $answers);
$ach_points = count_achievable_points($answers);
if($ach_points != 0){
@@ -52,10 +53,18 @@ function print_list_result_bar($data, $listindex, $answers, $class){
$list_percentage = 0;
}
$hintElement = '';
if($hint != ''){
$hintElement = "
<br><div>".$hint."</div>
";
}
echo "
<tr class='$class'>
<td><b>$list_name</b></td>
<td>$list_points von $ach_points</td>
<td>
<b>$list_name</b>$hintElement
</td>
<td>$list_points von $ach_points</td>
<td>
<div class='progress'>
<div class='progress-bar' role='progressbar' aria-valuenow='$list_points' aria-valuemin='0' aria-valuemax='$ach_points' style='width: $list_percentage%;'>

11
js/generator.js
View File

@@ -58,6 +58,9 @@ function readData(){
$('.input_list_short').each(function(index,value){
Singleton.instance.lists[index].name_x = $(value).val();
});
$('.input_list_hint').each(function(index,value){
Singleton.instance.lists[index].hint = $(value).val();
});
if(Singleton.instance.answers == null){
Singleton.instance.answers = {};
@@ -99,7 +102,7 @@ function generateTheses(){
function generateLists(){
for(key in Object.keys(Singleton.instance.lists)){
generateList(Singleton.instance.lists[key].name, Singleton.instance.lists[key].name_x);
generateList(Singleton.instance.lists[key].name, Singleton.instance.lists[key].name_x, Singleton.instance.lists[key].hint);
}
}
@@ -135,7 +138,7 @@ function generateEmptyList(){
generateList("","");
}
function generateList(name, shortname){
function generateList(name, shortname, hint){
var listdiv = '<div class="singlelist">' +
' <div class="form-group">' +
' <label>Listenname</label>' +
@@ -146,6 +149,10 @@ function generateList(name, shortname){
' <input type="text" class="form-control input_list_short" placeholder="Listenname (kurz)" value="'+shortname+'">' +
' </div>' +
' <div class="form-group">' +
' <label>Hinweis zur Liste</label>' +
' <input type="text" class="form-control input_list_hint" placeholder="Hinweis zur Liste" value="'+hint+'">' +
' </div>' +
' <div class="form-group">' +
' <button type="button" class="btn btn-danger" onclick="deleteme(this)">Diese Liste löschen</button>' +
' <button type="button" class="btn btn-default" onclick="moveup(this)"><span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span> Diese Liste nach <strong>oben</strong> verschieben</button>' +
' <button type="button" class="btn btn-default" onclick="movedown(this)"><span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span> Diese Liste nach <strong>unten</strong> verschieben</button>' +