may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Testiranje --> Trajanje --> Dejanski časi - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-03-09 22:45:47 +01:00
parent 16a5e903b6
commit 4092174a63
4 changed files with 75 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
admin/survey/SurveyAdminSettings.php
View File

@ -6823,7 +6823,7 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_frekvencna_porazdelitev'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_frekvencna_porazdelitev'].'</legend>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder bottom16">';
echo '<div class="setting_item">'; echo '<div class="setting_item">';
echo '<input type="checkbox" name="pages" id="pages" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&prikazi01='.$_GET['prikazi01'].'&pages='.($_GET['pages']==1?'0':'1').'\');" '.($_GET['pages']==1?'checked':'').' /><label for="pages">'.$lang['srv_show_pages'].'</label>'; echo '<input type="checkbox" name="pages" id="pages" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&prikazi01='.$_GET['prikazi01'].'&pages='.($_GET['pages']==1?'0':'1').'\');" '.($_GET['pages']==1?'checked':'').' /><label for="pages">'.$lang['srv_show_pages'].'</label>';
@ -6870,10 +6870,10 @@ class SurveyAdminSettings {
if ($_GET['pages'] == '1') { if ($_GET['pages'] == '1') {
$sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'"); $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
echo '<p class="bold blue top16">'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</p>'; echo '<p class="bold blue bottom16">'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</p>';
} }
echo '<table style="width:100%; padding:0; margin: 0"><tr>'; echo '<table id="casi_histogram"><tr>';
$histogram = array(); $histogram = array();
for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0; for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0;
@ -6892,10 +6892,9 @@ class SurveyAdminSettings {
for ($t=$t_min; $t<=$max_time; $t++) { for ($t=$t_min; $t<=$max_time; $t++) {
echo '<td style="vertical-align:bottom; margin:0; padding:0; border:0">'; echo '<td class="histogram">';
echo ' <div style="background-color:#D8DFEA; border:1px solid transparent; text-align: right; height: '.($histogram[$t]/$max_stran*150).'px; width: 100%; margin:0; padding:0; min-height:1px" title="'.$t.($minute?'min':'s').': '.$histogram[$t].'"></div>'; echo '<div class="histogram" style="height: '.($histogram[$t]/$max_stran*150).'px;" title="'.$t.($minute?'min':'s').': '.$histogram[$t].'"></div>';
//echo '<span style="display:block; width: 100%; text-align:center">'.$t.'</span>';
echo '</td>'; echo '</td>';
} }
} }
@ -6905,16 +6904,16 @@ class SurveyAdminSettings {
if ($max_time <= 20) { if ($max_time <= 20) {
for ($t=$t_min; $t<=$max_time; $t++) { for ($t=$t_min; $t<=$max_time; $t++) {
echo '<td>'.$t.($minute?'min':'s').'</td>'; echo '<td class="histogram_time">'.$t.($minute?'min':'s').'</td>';
} }
} else { } else {
if ($t_min == 0) if ($t_min == 0)
echo '<td colspan="10">0'.($minute?'min':'s').'</td>'; echo '<td class="histogram_time" colspan="10">0'.($minute?'min':'s').'</td>';
else else
echo '<td colspan="8">2'.($minute?'min':'s').'</td>'; echo '<td class="histogram_time" colspan="8">2'.($minute?'min':'s').'</td>';
for ($t=10; $t<=$max_time; $t+=10) { for ($t=10; $t<=$max_time; $t+=10) {
echo '<td colspan="10">'.$t.'</td>'; echo '<td class="histogram_time" colspan="10">'.$t.'</td>';
} }
} }

5
admin/survey/classes/tracking/CrossRoad.php
View File

@ -108,6 +108,11 @@ class CrossRoad {
$layout_width = 'narrow'; $layout_width = 'narrow';
if ($_GET['m'] == 'cas' || $_GET['m'] == 'predvidenicas') {
$layout_width = 'wide';
}
$status = 4; $status = 4;
break; break;

30
public/css/admin_new.css
View File

@ -10131,6 +10131,36 @@ div.subpage_predvidenicas table td.predvideni,
div.subpage_cas table td.predvideni { div.subpage_cas table td.predvideni {
color: #C4C4C4; color: #C4C4C4;
} }
div.subpage_predvidenicas table#casi_histogram,
div.subpage_cas table#casi_histogram {
padding: 0;
margin: 0;
}
div.subpage_predvidenicas table#casi_histogram td.histogram,
div.subpage_cas table#casi_histogram td.histogram {
vertical-align: bottom;
margin: 0;
padding: 0;
border: none;
}
div.subpage_predvidenicas table#casi_histogram td.histogram div.histogram,
div.subpage_cas table#casi_histogram td.histogram div.histogram {
background-color: #E5E5E5;
border: 1px solid transparent;
text-align: right;
width: 100%;
margin: 0;
padding: 0;
min-height: 1px;
}
div.subpage_predvidenicas table#casi_histogram td.histogram_time,
div.subpage_cas table#casi_histogram td.histogram_time {
padding: 0;
text-align: left;
vertical-align: top;
color: #777777;
border: none;
}
div.subpage_predvidenicas div.graph_full, div.subpage_predvidenicas div.graph_full,
div.subpage_cas div.graph_full { div.subpage_cas div.graph_full {
background-color: #1E88E5; background-color: #1E88E5;

31
resources/sass/admin_new/pages/my_surveys/testiranje.scss
View File

@ -132,6 +132,37 @@ div.subpage_cas {
td.predvideni { td.predvideni {
color: $dark-gray; color: $dark-gray;
} }
&#casi_histogram {
padding: 0;
margin: 0;
td.histogram {
vertical-align: bottom;
margin: 0;
padding: 0;
border: none;
div.histogram {
background-color: $gray;
border: 1px solid transparent;
text-align: right;
width: 100%;
margin: 0;
padding: 0;
min-height: 1px;
}
}
td.histogram_time {
padding: 0;
text-align: left;
vertical-align: top;
color: $very-dark-gray;
border: none;
}
}
} }
div.graph_full { div.graph_full {