Merge branch 'master' of https://git.1ka.si/git/1ka
This commit is contained in:
pero1203
commit
94b0929c36
@ -52,39 +52,10 @@ class SurveyAktivnost{
|
||||
|
||||
$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
|
||||
|
||||
echo '<select id="diagnostics_date_selected" name="time" onchange="diagnosticsChooseDate()">';
|
||||
echo '<option value="1 minute"' . ($time == '1 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 minute'].'</option>';
|
||||
echo '<option value="5 minute"' . ($time == '5 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 minute'].'</option>';
|
||||
echo '<option value="10 minute"' . ($time == '10 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_10 minute'].'</option>';
|
||||
echo '<option value="30 minute"' . ($time == '30 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_30 minute'].'</option>';
|
||||
echo '<option value="1 hour"' . ($time == '1 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 hour'].'</option>';
|
||||
echo '<option value="6 hour"' . ($time == '6 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_6 hour'].'</option>';
|
||||
echo '<option value="12 hour"' . ($time == '12 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_12 hour'].'</option>';
|
||||
echo '<option value="1 day"' . ($time == '1 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 day'].'</option>';
|
||||
echo '<option value="2 day"' . ($time == '2 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_2 day'].'</option>';
|
||||
echo '<option value="5 day"' . ($time == '5 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 day'].'</option>';
|
||||
echo '<option value="7 day"' . ($time == '7 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_7 day'].'</option>';
|
||||
echo '<option value="14 day"' . ($time == '14 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_14 day'].'</option>';
|
||||
echo '<option value="1 month"' . ($time == '1 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 month'].'</option>';
|
||||
echo '<option value="3 month"' . ($time == '3 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_3 month'].'</option>';
|
||||
echo '<option value="6 month"' . ($time == '6 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_6 month'].'</option>';
|
||||
echo '<option id="option_99date" value="99date"' . ($time == '99date' ? ' selected' : '') . '>'.$lang['srv_diagnostics_choose_date'].'</option>';
|
||||
echo '</select> ';
|
||||
|
||||
// Datum - od
|
||||
echo ''.$lang['srv_diagnostics_orfrom'].' <input type="text" id="from" name="from" value="' . $from . '" '. ($time != '99date' ? ' disabled' : '') .' />';
|
||||
echo ' <span class="faicon calendar_icon icon-as_link" onclick="changeSelectOption()" id="from_img"></span>';
|
||||
|
||||
// Datum - do
|
||||
echo ' '.$lang['srv_diagnostics_to'].' <input type="text" id="to" name="to" value="' . $to . '" '. ($time != '99date' ? ' disabled' : '') .'/>';
|
||||
echo ' <span class="faicon calendar_icon icon-as_link" onclick="changeSelectOption()" id="to_img"></span>';
|
||||
|
||||
// n, število anket
|
||||
//echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total'].'</label><label class="srv_diagnostic_total_sub_label">'.$sum.'</label>';
|
||||
//echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total_survey'].'</label><label class="srv_diagnostic_total_survey_label">'.$sum_survey.'</label>';
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Nastavitve nad tabelo
|
||||
echo '<div class="data_table_top_holder">';
|
||||
|
||||
@ -104,7 +75,7 @@ class SurveyAktivnost{
|
||||
|
||||
//Upoštevane enote
|
||||
echo '<div class="dataSettingsBasic">';
|
||||
echo ' <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleAktivnostCheckboxes(); return false;"><span class="faicon plus"></span>'.$lang['srv_diagnostics_upostevane'].'</button>';
|
||||
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
|
||||
@ -189,13 +160,78 @@ class SurveyAktivnost{
|
||||
|
||||
// Gumb filtriraj
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="small blue" onClick="this.form.submit(); toggleAktivnostCheckboxes(); return false;">'.$lang['srv_diagnostics_filter'].'</button>';
|
||||
echo ' <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo ' </div>';
|
||||
echo '</div>'; //div#dataSettingsCheckboxes
|
||||
|
||||
|
||||
// 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">';
|
||||
|
||||
echo '<div class="setting_holder">';
|
||||
echo $lang['srv_diagnostics_date2'];
|
||||
echo '<select class="dropdown w130" id="diagnostics_date_selected" name="time" onChange="this.form.submit();">';
|
||||
echo '<option value="1 minute"' . ($time == '1 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 minute'].'</option>';
|
||||
echo '<option value="5 minute"' . ($time == '5 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 minute'].'</option>';
|
||||
echo '<option value="10 minute"' . ($time == '10 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_10 minute'].'</option>';
|
||||
echo '<option value="30 minute"' . ($time == '30 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_30 minute'].'</option>';
|
||||
echo '<option value="1 hour"' . ($time == '1 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 hour'].'</option>';
|
||||
echo '<option value="6 hour"' . ($time == '6 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_6 hour'].'</option>';
|
||||
echo '<option value="12 hour"' . ($time == '12 hour' ? ' selected' : '') . '>'.$lang['srv_diagnostics_12 hour'].'</option>';
|
||||
echo '<option value="1 day"' . ($time == '1 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 day'].'</option>';
|
||||
echo '<option value="2 day"' . ($time == '2 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_2 day'].'</option>';
|
||||
echo '<option value="5 day"' . ($time == '5 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 day'].'</option>';
|
||||
echo '<option value="7 day"' . ($time == '7 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_7 day'].'</option>';
|
||||
echo '<option value="14 day"' . ($time == '14 day' ? ' selected' : '') . '>'.$lang['srv_diagnostics_14 day'].'</option>';
|
||||
echo '<option value="1 month"' . ($time == '1 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 month'].'</option>';
|
||||
echo '<option value="3 month"' . ($time == '3 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_3 month'].'</option>';
|
||||
echo '<option value="6 month"' . ($time == '6 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_6 month'].'</option>';
|
||||
echo '<option id="option_99date" value="99date"' . ($time == '99date' ? ' selected' : '') . '>'.$lang['srv_diagnostics_choose_date'].'</option>';
|
||||
echo '</select>';
|
||||
echo '</div>';
|
||||
|
||||
$disabled = '';
|
||||
/*if ($time != '99date') {
|
||||
$disabled = 'disabled';
|
||||
}*/
|
||||
|
||||
// Datum - od
|
||||
echo '<div class="setting_holder">';
|
||||
echo $lang['srv_diagnostics_orfrom'];
|
||||
echo '<div class="date_holder">';
|
||||
echo '<input type="text" class="text '. $disabled.'" id="from" name="from" value="' . $from . '"/>';
|
||||
echo '<span class="faicon calendar_icon blue" onclick="changeSelectOption()" 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 type="text" class="text '. $disabled .'" id="to" name="to" value="' . $to . '"/>';
|
||||
echo '<span class="faicon calendar_icon blue" onclick="changeSelectOption()" id="from_img"></span>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
// 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
|
||||
|
||||
|
||||
@ -763,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'];
|
||||
}
|
||||
|
||||
@ -786,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;
|
||||
@ -801,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>';
|
||||
}
|
||||
@ -850,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 = '') {
|
||||
|
||||
@ -5579,7 +5579,22 @@ function toggleNiceURL(type) {
|
||||
}
|
||||
|
||||
//Aktivnost - toggle dropdown checkboxes
|
||||
function toggleAktivnostCheckboxes() {
|
||||
$("#dataSettingsCheckboxes").fadeIn("medium");
|
||||
$("#dataSettingsCheckboxes").toggleClass("displayNone");
|
||||
function toggleAktivnostCheckboxes(type) {
|
||||
if (type == 'units') {
|
||||
$("#dataSettingsCheckboxes").fadeIn("medium");
|
||||
$("#dataSettingsCheckboxes").toggleClass("displayNone");
|
||||
$("#toggleDataCheckboxes").toggleClass("border_blue");
|
||||
}
|
||||
else if (type == 'date') {
|
||||
$("#dataSettingsCheckboxes_Date").fadeIn("medium");
|
||||
$("#dataSettingsCheckboxes_Date").toggleClass("displayNone");
|
||||
$("#toggleDataCheckboxes_Date").toggleClass("border_blue");
|
||||
|
||||
}
|
||||
else if (type == 'time') {
|
||||
if ($("#diagnostics_date_selected").value == '99date') {
|
||||
$("#from").toggleClass("disabled");
|
||||
$("#to").toggleClass("disabled");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
38
lang/1.php
38
lang/1.php
@ -3600,8 +3600,8 @@ $lang = array (
|
||||
"srv_diagnostics_user_surveys" => "Število anket v",
|
||||
"srv_diagnostics_total" => "Skupno število",
|
||||
"srv_diagnostics_in" => "v",
|
||||
"srv_diagnostics_orfrom" => ", ali od",
|
||||
"srv_diagnostics_to" => "do",
|
||||
"srv_diagnostics_orfrom" => "Od:",
|
||||
"srv_diagnostics_to" => "Do:",
|
||||
"srv_diagnostics_respondentov" => "Ustrezne enote", // respondentov
|
||||
"srv_diagnostics_strani" => "Strani",
|
||||
"srv_diagnostics_analiza" => "Analize",
|
||||
@ -3612,22 +3612,24 @@ $lang = array (
|
||||
"srv_diagnostics_upostevaj" => "Upoštevaj enote:",
|
||||
"srv_diagnostics_jezik" => "Jezik:",
|
||||
"srv_diagnostics_filter" => "Filtriraj",
|
||||
"srv_diagnostics_1 minute" => "1 minuti",
|
||||
"srv_diagnostics_5 minute" => "5 minutah",
|
||||
"srv_diagnostics_10 minute" => "10 minutah",
|
||||
"srv_diagnostics_30 minute" => "30 minutah",
|
||||
"srv_diagnostics_1 hour" => "1 uri",
|
||||
"srv_diagnostics_6 hour" => "6 urah",
|
||||
"srv_diagnostics_12 hour" => "12 urah",
|
||||
"srv_diagnostics_1 day" => "1 dnevu",
|
||||
"srv_diagnostics_2 day" => "2 dneh",
|
||||
"srv_diagnostics_5 day" => "5 dneh",
|
||||
"srv_diagnostics_7 day" => "zadnji teden",
|
||||
"srv_diagnostics_14 day" => "14 dneh",
|
||||
"srv_diagnostics_1 month" => "zadnji mesec",
|
||||
"srv_diagnostics_3 month" => "3 mesecih",
|
||||
"srv_diagnostics_6 month" => "6 mesecih",
|
||||
"srv_diagnostics_choose_date" => "Izberi datum",
|
||||
"srv_diagnostics_date" => "Določi obdobje",
|
||||
"srv_diagnostics_date2" => "Izberi obdobje:",
|
||||
"srv_diagnostics_1 minute" => "1 minuta",
|
||||
"srv_diagnostics_5 minute" => "5 minut",
|
||||
"srv_diagnostics_10 minute" => "10 minut",
|
||||
"srv_diagnostics_30 minute" => "30 minut",
|
||||
"srv_diagnostics_1 hour" => "1 ura",
|
||||
"srv_diagnostics_6 hour" => "6 ur",
|
||||
"srv_diagnostics_12 hour" => "12 ur",
|
||||
"srv_diagnostics_1 day" => "1 dan",
|
||||
"srv_diagnostics_2 day" => "2 dneva",
|
||||
"srv_diagnostics_5 day" => "5 dni",
|
||||
"srv_diagnostics_7 day" => "Zadnji teden",
|
||||
"srv_diagnostics_14 day" => "14 dni",
|
||||
"srv_diagnostics_1 month" => "Zadnji mesec",
|
||||
"srv_diagnostics_3 month" => "3 mesecev",
|
||||
"srv_diagnostics_6 month" => "6 mesecev",
|
||||
"srv_diagnostics_choose_date" => "Po meri",
|
||||
"srv_diagnostics_sum_total" => "n = ",
|
||||
"srv_diagnostics_sum_total_survey" => "Število anket: ",
|
||||
"srv_diagnostics_filter_test" => "Testne",
|
||||
|
||||
@ -3569,8 +3569,8 @@ $lang = array (
|
||||
"srv_diagnostics_user_surveys" => "Numbers of surveys",
|
||||
"srv_diagnostics_total" => "Total number of",
|
||||
"srv_diagnostics_in" => "in",
|
||||
"srv_diagnostics_orfrom" => ", or from",
|
||||
"srv_diagnostics_to" => "to",
|
||||
"srv_diagnostics_orfrom" => "Od:",
|
||||
"srv_diagnostics_to" => "Do:",
|
||||
"srv_diagnostics_respondentov" => "Valid units",
|
||||
"srv_diagnostics_strani" => "Pages",
|
||||
"srv_diagnostics_analiza" => "Analysis",
|
||||
@ -3581,6 +3581,8 @@ $lang = array (
|
||||
"srv_diagnostics_upostevaj" => "Count units:",
|
||||
"srv_diagnostics_jezik" => "Language:",
|
||||
"srv_diagnostics_filter" => "Filter",
|
||||
"srv_diagnostics_date" => "Select range",
|
||||
"srv_diagnostics_date2" => "Choose range:",
|
||||
"srv_diagnostics_1 minute" => "1 minute",
|
||||
"srv_diagnostics_5 minute" => "5 minutes",
|
||||
"srv_diagnostics_10 minute" => "10 minutes",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,9 +8,14 @@ div.page_diagnostics {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
white-space: nowrap;
|
||||
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 16px;
|
||||
&.graphs {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
padding: 6px 16px;
|
||||
|
||||
background: $light-gray;
|
||||
@ -24,6 +29,8 @@ div.page_diagnostics {
|
||||
padding-right: 8px;
|
||||
margin-right: 8px;
|
||||
border-right: 1px solid $dark-gray;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
select {
|
||||
padding: 3px 5px;
|
||||
@ -39,7 +46,7 @@ div.page_diagnostics {
|
||||
margin-right: 8px;
|
||||
padding-right: 8px;
|
||||
border: none;
|
||||
|
||||
|
||||
button.white-blue{
|
||||
height: 28px;
|
||||
width: 140px;
|
||||
@ -51,6 +58,10 @@ div.page_diagnostics {
|
||||
color: $black;
|
||||
|
||||
border-radius: 2px;
|
||||
|
||||
&.border_blue {
|
||||
border-color: $blue;
|
||||
}
|
||||
|
||||
.faicon:before{
|
||||
margin-right: 8px;
|
||||
@ -60,31 +71,54 @@ div.page_diagnostics {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Gumb za datum na desni
|
||||
#end {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
.dataSettingsBasic{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//Extra nastavitve za enote in datum
|
||||
#dataSettingsCheckboxes {
|
||||
left: 211px;
|
||||
}
|
||||
|
||||
#dataSettingsCheckboxes_Date {
|
||||
left: 902px;
|
||||
}
|
||||
|
||||
|
||||
#dataSettingsCheckboxes{
|
||||
#dataSettingsCheckboxes,
|
||||
#dataSettingsCheckboxes_Date{
|
||||
@include hover_basic();
|
||||
|
||||
z-index: 99999;
|
||||
z-index: 998;
|
||||
position: absolute;
|
||||
top: 41px;
|
||||
left: 211px;
|
||||
|
||||
|
||||
border-radius: 2px;
|
||||
|
||||
.dataSettingsCheckboxes_holder{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
font-size: 14px;
|
||||
|
||||
#jezikpaket {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 64px;
|
||||
}
|
||||
|
||||
select,
|
||||
option {
|
||||
padding: 3px 5px;
|
||||
font-size: 16px !important;
|
||||
}
|
||||
select,
|
||||
option {
|
||||
padding: 3px 5px;
|
||||
}
|
||||
|
||||
.setting_holder {
|
||||
@ -95,10 +129,31 @@ div.page_diagnostics {
|
||||
.setting_title {
|
||||
font-weight: $semi-bold;
|
||||
text-transform: uppercase;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.setting_item {
|
||||
margin-top: 12px;
|
||||
label {
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
.date_holder {
|
||||
input.text {
|
||||
width: 130px;
|
||||
margin-right: 8px;
|
||||
height: 28px;
|
||||
padding: 5px 8px;
|
||||
|
||||
&.disabled {
|
||||
border-color: $dark-gray;
|
||||
background-color: $gray;
|
||||
color: $very-dark-gray;
|
||||
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -148,4 +203,130 @@ div.page_diagnostics {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Grafi (Tedenska, mesečna, etc)
|
||||
.time_span_container {
|
||||
position: relative;
|
||||
height: 160px;
|
||||
width: 100%;
|
||||
margin-bottom: 32px;
|
||||
&:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
margin-top: 4px;
|
||||
border: 1px solid $gray;
|
||||
}
|
||||
.time_span_header {
|
||||
clear: both;
|
||||
}
|
||||
.time_span {
|
||||
background-color: $gray;
|
||||
width: 1px;
|
||||
display: inline-block;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
$background_color_125: #9bbb59;
|
||||
$background_color_126: #c0504d;
|
||||
$background_color_127: #92a9cf;
|
||||
$background_color_128: #f79646;
|
||||
$background_color_129: #4bacc6;
|
||||
$background_color_130: #8064a2;
|
||||
$background_color_131: #4f81bd;
|
||||
|
||||
.time_span.year_2022 {
|
||||
background-color: $background_color_128;
|
||||
}.time_span.year_2021 {
|
||||
background-color: $background_color_129;
|
||||
}
|
||||
.time_span.year_2020 {
|
||||
background-color: $background_color_130;
|
||||
}
|
||||
.time_span.year_2019 {
|
||||
background-color: $background_color_131;
|
||||
}
|
||||
.time_span.year_2018 {
|
||||
background-color: $background_color_125;
|
||||
}
|
||||
.time_span.year_2017 {
|
||||
background-color: $background_color_126;
|
||||
}
|
||||
.time_span.year_2016 {
|
||||
background-color: $background_color_127;
|
||||
}
|
||||
.time_span.year_2015 {
|
||||
background-color: $background_color_128;
|
||||
}
|
||||
.time_span.year_2014 {
|
||||
background-color: $background_color_129;
|
||||
}
|
||||
.time_span.year_2013 {
|
||||
background-color: $background_color_130;
|
||||
}
|
||||
.time_span.year_2012 {
|
||||
background-color: $background_color_125;
|
||||
}
|
||||
.time_span.year_2011 {
|
||||
background-color: $background_color_126;
|
||||
}
|
||||
.time_span.year_2010 {
|
||||
background-color: $background_color_131;
|
||||
}
|
||||
.time_span.day_1 {
|
||||
background-color: $background_color_131;
|
||||
}
|
||||
.time_span.day_2 {
|
||||
background-color: $background_color_126;
|
||||
}
|
||||
.time_span.day_3 {
|
||||
background-color: $background_color_125;
|
||||
}
|
||||
.time_span.day_4 {
|
||||
background-color: $background_color_130;
|
||||
}
|
||||
.time_span.day_5 {
|
||||
background-color: $background_color_129;
|
||||
}
|
||||
.time_span.day_6 {
|
||||
background-color: $background_color_128;
|
||||
}
|
||||
.time_span.day_7 {
|
||||
background-color: $background_color_127;
|
||||
}
|
||||
.time_span.month_1 {
|
||||
background-color: $background_color_131;
|
||||
}
|
||||
.time_span.month_2 {
|
||||
background-color: $background_color_126;
|
||||
}
|
||||
.time_span.month_3 {
|
||||
background-color: $background_color_125;
|
||||
}
|
||||
.time_span.month_4 {
|
||||
background-color: $background_color_130;
|
||||
}
|
||||
.time_span.month_5 {
|
||||
background-color: $background_color_129;
|
||||
}
|
||||
.time_span.month_6 {
|
||||
background-color: $background_color_128;
|
||||
}
|
||||
.time_span.month_7 {
|
||||
background-color: $background_color_127;
|
||||
}
|
||||
.time_span.month_8 {
|
||||
background-color: $background_color_131;
|
||||
}
|
||||
.time_span.month_9 {
|
||||
background-color: $background_color_126;
|
||||
}
|
||||
.time_span.month_10 {
|
||||
background-color: $background_color_125;
|
||||
}
|
||||
.time_span.month_11 {
|
||||
background-color: $background_color_130;
|
||||
}
|
||||
.time_span.month_12 {
|
||||
background-color: $background_color_129;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user