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

[Redizajn 1KA] - Testiranje --> Trajanje --> Ocenjevanje trajanja - v0

Browse Source
This commit is contained in:
tejagerjovic 2022-03-03 16:01:25 +01:00
parent e6624b57a7
commit 82ac45e82e
7 changed files with 1541 additions and 1436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
admin/survey/SurveyAdminSettings.php
View File

@ -6004,37 +6004,52 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
echo '<p>'.$lang['srv_dejansko_trajanje'].': <b>'.$skupni_cas.'</b></p>';
echo '<p class="bold">'.$lang['srv_dejansko_trajanje'].':</p>';
echo '<p>'.$skupni_cas.'</p>';
echo '</fieldset>';
echo '<br />';
echo '<fieldset><legend>'.$lang['srv_casi_po_straneh'].'</legend>';
echo '<table style="width:100%">';
echo '<table>';
echo '<tr>';
echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
echo '<th>'.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'</th>';
echo '</tr>';
foreach ($expected_time AS $vrstni_red => $time) {
$sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$vrstni_red' AND ank_id = '$this->anketa'");
$row = mysqli_fetch_array($sql);
echo '<tr>';
echo '<th style="text-align:left; padding: 0 20px 0 0" nowrap>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</th>';
echo '<td style="width:100%">';
echo ' <div class="graph_db" style="text-align: right; float: left; width: '.($time[0]/$max*85).'%">&nbsp;</div>';
echo '<td class="nowrap">'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
echo '<td>';
echo '<div class="graph_cell">';
echo '<div class="time">';
echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
echo '</div>';
echo '<div class="graph_full" style="text-align: right; float: left; width: '.($time[0]/$max*85).'%">&nbsp;</div>';
if ((($time[1]-$time[0])/$max*85) > 0)
echo ' <div class="graph_lb" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span style="color:gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span></span>';
echo ' <div class="graph_empty" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>';
echo '</div>';
echo '</td>';
/*echo '<td style="width:100%">';
echo '</td>';*/
echo '</tr>';
}
echo '<tr><td colspan="3" style="border-bottom:1px solid #E4E4F9"></td></tr>';
echo '<tr><td></td><th style="text-align:left; padding-right: 20px" nowrap>'.$lang['srv_anl_suma1'].': '.(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s</th></tr>';
echo '</table>';
echo '<p><div class="graph_db" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_neto_t_cas'].'</span>';
echo '<div class="graph_lb" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_bruto_t_cas'].'</span></p>';
echo '<div class="tabela_trajanje_legenda">';
echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_t_cas'].'</span>';
echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_t_cas'].'</span>';
echo '</div>';
echo '</fieldset>';

11
lang/1.php
View File

@ -3961,7 +3961,7 @@ $lang = array (
"srv_neto_cas" => "Neto &#269;as",
"srv_bruto_v_cas" => "Brez pogojev",
"srv_neto_v_cas" => "Dejansko trajanje",
"srv_bruto_t_cas" => "Trajanje z upo&#353;tevanjem vseh vpra&#353;anj (brez pogojev)",
"srv_bruto_t_cas" => "Trajanje z upoštevanjem vseh vprašanj (brez pogojev)",
"srv_neto_t_cas" => "Dejansko trajanje",
"srv_verjetnost_pojavitve" => "Verjetnost pojavitve",
"srv_vnosi_no_entry" => "Anketa trenutno &#353;e nima vnosov!<br/>",
@ -3998,10 +3998,11 @@ $lang = array (
"srv_vkljuci_preskocene" => "Prika&#382;i tudi &#269;ase za presko&#269;ene strani",
"srv_total_trajanje" => "Celoten čas trajanja ankete",
"srv_dejansko_trajanje" => "Predvideno dejansko trajanje ankete",
"srv_casi_po_straneh" => "&#268;asi po straneh",
"srv_casi_po_blokih" => "&#268;asi po blokih",
"srv_casi_po_vprasanjih_strani" => "&#268;asi po vpra&#353;anjih (Strani)",
"srv_casi_po_vprasanjih_bloki" => "&#268;asi po vpra&#353;anjih (Bloki)",
"srv_casi_po_straneh" => "Časi po straneh",
"srv_casi_po_straneh_stran" => "Stran",
"srv_casi_po_blokih" => "Časi po blokih",
"srv_casi_po_vprasanjih_strani" => "Časi po vprašanjih (Strani)",
"srv_casi_po_vprasanjih_bloki" => "Časi po vprašanjih (Bloki)",
"srv_frekvencna_porazdelitev" => "Frekven&#269;na porazdelitev trajanja",
"srv_dejanski_casi" => "Dejanski &#269;asi trajanja (brez morebitnih testnih enot)",
"srv_testni_nagovor" => "Predvideno &#353;tevilo odgovorov po vpra&#353;anjih. V primeru ve&#269; kategorij se odgovori porazdeljujejo enakomerno. <br /><br />Za &#353;tevilske spremenljivke se generira slu&#269;ajna 4 mestna &#353;tevilka, v primeru besedila pa slu&#269;ajno 10 mestno besedilo.",

1
lang/2.php
View File

@ -3984,6 +3984,7 @@ $lang = array (
"srv_total_trajanje" => "Total survey duration",
"srv_dejansko_trajanje" => "Estimated actual duration of survey",
"srv_casi_po_straneh" => "Times by pages",
"srv_casi_po_straneh_stran" => "Page",
"srv_casi_po_blokih" => "Times by blocks",
"srv_casi_po_vprasanjih_strani" => "Times by questions (Pages)",
"srv_casi_po_vprasanjih_bloki" => "Times by questions (Blocks)",

2842
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

2
resources/sass/admin_new/pages/my_surveys/my_surveys.scss
View File

@ -8,5 +8,5 @@
@import "missing_values";
@import "standardne_besede";
@import "podatki";
@import "testiranje_diagnostika";
@import "testiranje";

64
resources/sass/admin_new/pages/my_surveys/testiranje.scss Normal file
View File

@ -0,0 +1,64 @@
// DIAGNOSTIKA
div.srv_diagnostic {
h2 {
font-size: 24px;
margin-top: 32px;
margin-bottom: 16x;
&:first-of-type {
margin-top: 0;
}
}
}
//OCENJEVANJE TRAJANJA
div.subpage_predvidenicas {
table {
width: 100%;
td {
div.graph_cell {
display:flex;
flex-direction: row;
div.time {
min-width: 120px;
white-space: nowrap;
padding-right: 8px;
}
}
}
}
div.graph_full {
background-color: $blue;
height: 24px;
text-align: right;
}
div.graph_empty {
background-color: $gray;
height: 24px;
}
div.tabela_trajanje_legenda {
display: flex;
flex-direction: row;
justify-content: start;
margin-top: 16px;
div.legend {
width: 16px;
height: 16px;
margin-right: 8px;
}
span.legend {
margin-right: 32px;
}
}
}

12
resources/sass/admin_new/pages/my_surveys/testiranje_diagnostika.scss
View File

@ -1,12 +0,0 @@
div.srv_diagnostic {
h2 {
font-size: 24px;
margin-top: 32px;
margin-bottom: 16x;
&:first-of-type {
margin-top: 0;
}
}
}