[Redizajn 1KA] - Aktivnost --> Tedenska - v1
This commit is contained in:
tejagerjovic
parent
d1dfa33c0d
commit
fdd240f8b9
@ -799,9 +799,9 @@ class SurveyAktivnost{
|
||||
if ($color == 'month') $label = date('M Y', strtotime($row['date']));
|
||||
if ($color == 'day') $label = date('j.n.Y', strtotime($row['date']));
|
||||
|
||||
echo '<span style="position: absolute; bottom: -15px; width: 90px;">'.$label;
|
||||
/*echo '<span style="position: absolute; bottom: -15px; width: 90px;">'.$label;
|
||||
if ( !$sumarium ) echo ' <span style="color:darkgray; font-size:70%" title="x̄ = '.$avg[$row['color']].'">('.$avg[$row['color']].')</span>';
|
||||
echo '</span>';
|
||||
echo '</span>';*/
|
||||
$prev_color = $row['color'];
|
||||
}
|
||||
|
||||
@ -822,11 +822,11 @@ class SurveyAktivnost{
|
||||
|
||||
private function diagnostics_show_interval ($t) {
|
||||
global $lang;
|
||||
|
||||
|
||||
echo '<form name="intr" action="index.php" method="get">';
|
||||
echo '<input type="hidden" name="a" value="diagnostics">';
|
||||
echo '<input type="hidden" name="t" value="'.$t.'">';
|
||||
|
||||
|
||||
$testdata = (isset($_GET['testdata']) && $_GET['testdata']=='1') ? 1 : 0;
|
||||
$testdataauto = (isset($_GET['testdataauto']) && $_GET['testdataauto']=='1') ? 1 : 0;
|
||||
$uvoz = (isset($_GET['uvoz']) && $_GET['uvoz']=='1') ? 1 : 0;
|
||||
@ -837,48 +837,15 @@ class SurveyAktivnost{
|
||||
$mailsent = (isset($_GET['mailsent']) && $_GET['mailsent']=='1') ? 1 : 0;
|
||||
|
||||
$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
|
||||
|
||||
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
|
||||
|
||||
$package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
|
||||
$package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
|
||||
$package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
|
||||
|
||||
echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
|
||||
// Nastavitve nad tabelo
|
||||
echo '<div class="data_table_top_holder graphs">';
|
||||
|
||||
echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
|
||||
echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
|
||||
echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
|
||||
echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
|
||||
|
||||
echo '<span class="spaceLeft spaceRight bold">|</span>';
|
||||
}
|
||||
//Interval
|
||||
echo '<div class="osnova">';
|
||||
echo 'Interval:';
|
||||
|
||||
echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
|
||||
echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label></span>';
|
||||
|
||||
echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
|
||||
echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
|
||||
echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label></span>';
|
||||
echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label></span>';
|
||||
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label></span>';
|
||||
|
||||
echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span>'.$lang['lang'].': <select id="language" name="language">';
|
||||
echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
|
||||
echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
|
||||
echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
|
||||
|
||||
echo '<input type="button" class="spaceLeft" value="'.$lang['srv_coding_filter'].'" onClick="this.form.submit();">';
|
||||
|
||||
echo '<br /><br />';
|
||||
|
||||
echo 'Interval: <select name="interval" onchange="document.intr.submit();">';
|
||||
echo '<select class="dropdown" name="interval" onchange="document.intr.submit();">';
|
||||
if ( ! in_array($t, array('time_span_yearly', 'time_span')) ) {
|
||||
echo '<option value="hour" '.($_GET['interval']=='hour'?'selected':'').'>'.$lang['srv_diagnostics_interval_hour'].'</option>';
|
||||
}
|
||||
@ -886,9 +853,105 @@ class SurveyAktivnost{
|
||||
echo '<option value="week" '.($_GET['interval']=='week'?'selected':'').'>'.$lang['srv_diagnostics_interval_week'].'</option>';
|
||||
echo '<option value="month" '.($_GET['interval']=='month'?'selected':'').'>'.$lang['srv_diagnostics_interval_month'].'</option>';
|
||||
echo '<option value="year" '.($_GET['interval']=='year'?'selected':'').'>'.$lang['srv_diagnostics_interval_year'].'</option>';
|
||||
echo '</select>';
|
||||
echo '</select>';
|
||||
echo '</div>';
|
||||
|
||||
//Upoštevane enote
|
||||
echo '<div class="dataSettingsBasic">';
|
||||
echo ' <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'units\'); return false;"><span class="faicon plus"></span>'.$lang['srv_diagnostics_upostevane'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
// Dodatne nastavitve, ki se razprejo
|
||||
echo '<div id="dataSettingsCheckboxes" class="displayNone">';
|
||||
echo ' <div class="dataSettingsCheckboxes_holder">';
|
||||
|
||||
// Upoštevaj enote
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<span class="setting_title">'.$lang['srv_diagnostics_upostevaj'].'</span>';
|
||||
|
||||
echo '</form><br />';
|
||||
echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
|
||||
echo '</div>';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label>';
|
||||
echo '</div>';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '</span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
|
||||
echo '</div>';
|
||||
echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label>';
|
||||
echo '</div>';
|
||||
echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label>';
|
||||
echo '</div>';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '<div id="jezikpaket">';
|
||||
|
||||
//Jezik
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<span class="setting_title">'.$lang['srv_diagnostics_jezik'].'</span>';
|
||||
|
||||
echo '<select class="dropdown w130" id="language" name="language">';
|
||||
echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
|
||||
echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
|
||||
echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
|
||||
echo '</select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
//Paketi
|
||||
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
|
||||
|
||||
$package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
|
||||
$package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
|
||||
$package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
|
||||
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<span class="setting_title">'.$lang['srv_narocilo_paket'].'</span>';
|
||||
|
||||
echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
|
||||
echo '</div>';
|
||||
echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label>';
|
||||
echo '</div>';
|
||||
echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>'; //div#jezikpaket
|
||||
|
||||
|
||||
// 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
|
||||
|
||||
echo '</div>'; // div.data_table_top_holder
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
|
||||
private function diagnostics_get_interval ($def = '') {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -13,6 +13,9 @@ div.page_diagnostics {
|
||||
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 16px;
|
||||
&.graphs {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
padding: 6px 16px;
|
||||
|
||||
background: $light-gray;
|
||||
@ -198,9 +201,13 @@ div.page_diagnostics {
|
||||
// Grafi (Tedenska, mesečna, etc)
|
||||
.time_span_container {
|
||||
position: relative;
|
||||
height: 200px;
|
||||
width: 95%;
|
||||
margin-bottom: 50px;
|
||||
height: 160px;
|
||||
width: 100%;
|
||||
margin-bottom: 32px;
|
||||
&:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
margin-top: 4px;
|
||||
border: 1px solid $gray;
|
||||
}
|
||||
.time_span_header {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user