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

[Redizajn 1KA] - Aktivnost --> Parapodatki - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-03-24 14:36:07 +01:00
parent 904782614a
commit 7a7297bafb
3 changed files with 99 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
admin/survey/classes/class.SurveyAktivnost.php
View File

@ -601,23 +601,59 @@ class SurveyAktivnost{
echo '<input type="hidden" name="a" value="diagnostics">'; echo '<input type="hidden" name="a" value="diagnostics">';
echo '<input type="hidden" name="t" value="paradata">'; echo '<input type="hidden" name="t" value="paradata">';
// Vseh random enot
echo '<span>'.$lang['srv_inv_dashboard_tbl_all'].'</span> <input type="text" name="limit" value="'.$limit.'" style="padding:1px 3px; font-size:12px; width:70px; margin-right:20px;" />';
// Datum
echo $lang['s_from'].' <input type="text" id="from" name="from" value="' . $date_from . '" />';
echo ' <span class="faicon calendar_icon icon-as_link" onclick="diagnosticsParadataChooseDate();" id="from_img"></span> ';
echo $lang['s_to'].' <input type="text" id="to" name="to" value="' . $date_to . '" />'; // Nastavitve nad tabelo
echo ' <span class="faicon calendar_icon icon-as_link" onclick="diagnosticsParadataChooseDate();" id="to_img"></span>'; echo '<div class="data_table_top_holder">';
//Vseh random enot
echo '<div class="osnova">';
echo $lang['srv_inv_dashboard_tbl_all'];
echo '<input class="text" type="text" name="limit" value="'.$limit.'" />';
echo '</div>';
// Datum
echo '<div id="end">';
echo '<div class="dataSettingsBasic">';
echo ' <button id="toggleDataCheckboxes_Date" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'date\'); return false;"><span class="faicon calendar_icon"></span>'.$lang['srv_diagnostics_date'].'</button>';
echo '</div>';
echo '</div>';
// Dodatne nastavitve, ki se razprejo
echo '<div id="dataSettingsCheckboxes_Date" class="displayNone">';
echo ' <div class="dataSettingsCheckboxes_holder">';
// Datum - od
echo '<div class="setting_holder">';
echo $lang['srv_diagnostics_orfrom'];
echo '<div class="date_holder">';
echo '<input class="text" type="text" id="from" name="from" value="' . $date_from . '" />';
echo '<span class="faicon calendar_icon blue" onclick="diagnosticsParadataChooseDate();" id="from_img"></span>';
echo '</div>';
echo '</div>';
// Datum - do
echo '<div class="setting_holder">';
echo $lang['srv_diagnostics_to'];
echo '<div class="date_holder">';
echo '<input class="text" type="text" id="to" name="to" value="' . $date_to . '" />';
echo '<span class="faicon calendar_icon blue" onclick="diagnosticsParadataChooseDate();" id="from_img"></span>';
echo '</div>';
echo '</div>';
echo '<script>diagnosticsParadataChooseDate();</script>'; echo '<script>diagnosticsParadataChooseDate();</script>';
// Gumb filtriraj
echo '<div class="button_holder">';
echo ' <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>'; //div#dataSettingsCheckboxes_Date
echo '</div>'; // div.data_table_top_holder
// Gumb prikazi echo '</form>';
echo '<input type="button" class="pointer" value="'.$lang['hour_show'].'" onClick="this.form.submit();" style="margin-left:20px;">';
echo '</form><br />';
// Gledamo vse veljavne respondente iz leta 2016 // Gledamo vse veljavne respondente iz leta 2016
@ -668,13 +704,17 @@ class SurveyAktivnost{
foreach($statistics as $key => $vals){ foreach($statistics as $key => $vals){
echo '<fieldset style="width:60%;"><legend>'.$vals['title'].'</legend>'; echo '<fieldset><legend>'.$vals['title'].'</legend>';
// Sortiramo vrednosti po velikosti (od najvecje do najmanjse) // Sortiramo vrednosti po velikosti (od najvecje do najmanjse)
//ksort($vals); //ksort($vals);
arsort($vals); arsort($vals);
echo '<table style="width:100%;">'; echo '<table class="aktivnost_paradata_table">';
echo '<tr>';
echo '<th>'.$vals['title'].'</th>';
echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
echo '</tr>';
$max = -1; $max = -1;
foreach($vals as $key2 => $val){ foreach($vals as $key2 => $val){
@ -690,7 +730,11 @@ class SurveyAktivnost{
echo '<td>'.$key2.'</td>'; echo '<td>'.$key2.'</td>';
$max = max($val, $max) * 1.2; $max = max($val, $max) * 1.2;
echo '<td style="width:80%"><div class="graph_lb" style="float: left; width:' . (round($val / $max * 100, 0)) . '%">&nbsp;</div><div style="float:left">&nbsp;'.$val.'</div></td>';
echo '<td class="graph_cell">';
echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width:' . (round($val / $max * 100, 0)) . '%">&nbsp;</div><div>&nbsp;'.$val.'</div>';
echo '</div></td>';
echo '</tr>'; echo '</tr>';
} }
@ -698,7 +742,7 @@ class SurveyAktivnost{
echo '</table>'; echo '</table>';
echo '</fieldset><br />'; echo '</fieldset>';
} }
} }

15
public/css/admin_new.css
View File

@ -21984,7 +21984,8 @@ div.page_diagnostics .data_table_top_holder .osnova {
display: flex; display: flex;
align-items: center; align-items: center;
} }
div.page_diagnostics .data_table_top_holder .osnova select { div.page_diagnostics .data_table_top_holder .osnova select,
div.page_diagnostics .data_table_top_holder .osnova input {
padding: 3px 5px; padding: 3px 5px;
margin: 0 0 0 8px; margin: 0 0 0 8px;
width: 123px; width: 123px;
@ -22274,6 +22275,18 @@ div.page_diagnostics .time_span.month_11 {
div.page_diagnostics .time_span.month_12 { div.page_diagnostics .time_span.month_12 {
background-color: #4bacc6; background-color: #4bacc6;
} }
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell {
width: 100%;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell {
display: flex;
flex-direction: row;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell .graph_full {
background-color: #1E88E5;
height: 16px;
margin-right: 8px;
}
@media (max-width: 1100px) { @media (max-width: 1100px) {
#quick_comments_link.newCss { #quick_comments_link.newCss {

24
resources/sass/admin_new/pages/aktivnost/aktivnost.scss
View File

@ -32,7 +32,8 @@ div.page_diagnostics {
display: flex; display: flex;
align-items: center; align-items: center;
select { select,
input {
padding: 3px 5px; padding: 3px 5px;
margin: 0 0 0 8px; margin: 0 0 0 8px;
width: 123px; width: 123px;
@ -329,4 +330,25 @@ div.page_diagnostics {
.time_span.month_12 { .time_span.month_12 {
background-color: $background_color_129; background-color: $background_color_129;
} }
//Parapodatki
table.aktivnost_paradata_table {
td.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
.graph_full {
background-color: $blue;
height: 16px;
margin-right: 8px;
}
}
}
}
} }