Redesign - status dashboard - V DELU
This commit is contained in:
parent
d390545ee5
commit
a4805a1cb0
File diff suppressed because it is too large
Load Diff
@ -7556,7 +7556,7 @@ class SurveyAnalysis {
|
|||||||
if($page == 'sums'){
|
if($page == 'sums'){
|
||||||
|
|
||||||
echo '<div class="comment_holder">';
|
echo '<div class="comment_holder">';
|
||||||
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(1);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
|
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(1);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
//echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
|
//echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
|
||||||
|
@ -776,19 +776,21 @@ class SurveyBreak
|
|||||||
|
|
||||||
|
|
||||||
# če ni multicheck in multi grid
|
# če ni multicheck in multi grid
|
||||||
echo '<table>';
|
echo '<table class="table_break">';
|
||||||
|
|
||||||
echo '<tr>';
|
|
||||||
echo '<th'.$rowspan.'>';
|
echo '<tr class="row1">';
|
||||||
|
|
||||||
|
echo '<td class="cell_question" '.$rowspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
||||||
echo $forSpremenljivka['naslov'];
|
echo $forSpremenljivka['naslov'];
|
||||||
echo '('.$forSpremenljivka['variable'].')';
|
echo '('.$forSpremenljivka['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
|
echo '</td>';
|
||||||
echo '</th>';
|
|
||||||
echo '<th'.$colspan.'>';
|
echo '<td class="cell_question" '.$colspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
||||||
echo $spremenljivka['naslov'];
|
echo $spremenljivka['naslov'];
|
||||||
@ -798,60 +800,71 @@ class SurveyBreak
|
|||||||
echo ' - '.$doubleGridTitle['subtitle'];
|
echo ' - '.$doubleGridTitle['subtitle'];
|
||||||
}
|
}
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
echo '<tr>';
|
|
||||||
|
echo '<tr class="row2">';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
|
|
||||||
echo '<th class="sub" colspan="2">';
|
echo '<td class="cell_grid" colspan="2">';
|
||||||
echo $variable['naslov'];
|
echo $variable['naslov'];
|
||||||
echo '('.$variable['variable'].')';
|
echo '('.$variable['variable'].')';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
echo '<tr>';
|
|
||||||
|
|
||||||
|
echo '<tr class="row3">';
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub">Povprečje'.$lang[''];
|
echo '<td class="cell_value">Povprečje</td>';
|
||||||
echo '</th>';
|
echo '<td class="cell_value">Št. enot</td>';
|
||||||
echo '<th class="sub red">Št. enot'.$lang[''];
|
|
||||||
echo '</th>';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
$cnt=0;
|
$cnt=0;
|
||||||
foreach ($frequencys AS $fkey => $fkeyFrequency) {
|
foreach ($frequencys AS $fkey => $fkeyFrequency) {
|
||||||
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov'];
|
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov'];
|
||||||
$cnt++;
|
$cnt++;
|
||||||
foreach ($options AS $oKey => $option) {
|
foreach ($options AS $oKey => $option) {
|
||||||
if ($means[$fkey][$oKey] != null || $displayAll) {
|
if ($means[$fkey][$oKey] != null || $displayAll) {
|
||||||
echo '<tr>';
|
|
||||||
echo '<td'.$break_percentRowSpan.' class="rsdl_bck_variable1">';
|
echo '<tr>';
|
||||||
|
|
||||||
|
echo '<td class="cell_value">';
|
||||||
if ($forSpremenljivka['tip'] == 2) {
|
if ($forSpremenljivka['tip'] == 2) {
|
||||||
echo $cbxLabel;
|
echo $cbxLabel;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
echo $forSpremenljivka['options'][$oKey];
|
echo $forSpremenljivka['options'][$oKey];
|
||||||
}
|
}
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
$css = '';
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
#povprečja
|
#povprečja
|
||||||
echo '<td'.$css.$break_percentRowSpan.'>';
|
echo '<td class="cell_value">';
|
||||||
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
||||||
@ -861,39 +874,45 @@ class SurveyBreak
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#dodamo še skupno sumo in povprečje
|
#dodamo še skupno sumo in povprečje
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
echo '<td class="rsdl_bck_variable1 red">';
|
|
||||||
|
echo '<td class="cell_value">';
|
||||||
echo 'Skupaj';
|
echo 'Skupaj';
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
|
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
#povprečja
|
#povprečja
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
||||||
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$totalFreq[$sequence];
|
echo (int)$totalFreq[$sequence];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
echo '</table>';//$forSpremenljivka['grids'][0]['variables']
|
echo '</table>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
@ -993,51 +1012,55 @@ class SurveyBreak
|
|||||||
|
|
||||||
|
|
||||||
# če ni multicheck in multi grid
|
# če ni multicheck in multi grid
|
||||||
echo '<table>';
|
echo '<table class="table_break">';
|
||||||
|
|
||||||
echo '<tr>';
|
|
||||||
echo '<th'.$rowspan.'>';
|
echo '<tr class="row1">';
|
||||||
|
|
||||||
|
echo '<td class="cell_question" '.$rowspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
||||||
echo $forSpremenljivka['naslov'];
|
echo $forSpremenljivka['naslov'];
|
||||||
echo '('.$forSpremenljivka['variable'].')';
|
echo '('.$forSpremenljivka['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
|
echo '</td>';
|
||||||
echo '</th>';
|
|
||||||
echo '<th'.$colspan.'>';
|
echo '<td class="cell_question" '.$colspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
||||||
echo $spremenljivka['naslov'];
|
echo $spremenljivka['naslov'];
|
||||||
echo '('.$spremenljivka['variable'].')';
|
echo '('.$spremenljivka['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr class="row2">';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub" colspan="2">';
|
echo '<td class="cell_grid" colspan="2">';
|
||||||
echo $variable['naslov'];
|
echo $variable['naslov'];
|
||||||
echo '('.$variable['variable'].')';
|
echo '('.$variable['variable'].')';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr class="row3">';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub">Povprečje'.$lang[''];
|
echo '<td class="cell_value">Povprečje</td>';
|
||||||
echo '</th>';
|
echo '<td class="cell_value">Št. enot</td>';
|
||||||
echo '<th class="sub red">Št. enot'.$lang[''];
|
|
||||||
echo '</th>';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
@ -1048,28 +1071,26 @@ class SurveyBreak
|
|||||||
|
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
|
||||||
echo '<td'.$break_percentRowSpan.' class="rsdl_bck_variable1">';
|
echo '<td class="cell_var">';
|
||||||
echo $forSpremenljivka['options'][$oKey];
|
echo $forSpremenljivka['options'][$oKey];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
$css = '';
|
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
#povprečja
|
#povprečja
|
||||||
echo '<td'.$css.$break_percentRowSpan.'>';
|
echo '<td class="cell_value">';
|
||||||
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
||||||
#echo $this->formatNumber($means[$fkey][$sequence],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
|
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
||||||
#echo (int)$frequencys[$fkey][$sequence]['validCnt'];
|
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
#$totalMeans[$sequence] += ($this->getMeansFromKey($fkeyFrequency[$sequence])*(int)$frequencys[$fkey][$sequence]['validCnt']);
|
|
||||||
#$totalFreq[$sequence]+= (int)$frequencys[$fkey][$sequence]['validCnt'];
|
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
||||||
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
|
||||||
$totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
$totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1083,12 +1104,14 @@ class SurveyBreak
|
|||||||
if ((int)$this->break_percent) {
|
if ((int)$this->break_percent) {
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
echo '<td class="">';
|
|
||||||
#echo (int)$frequencys[$fkey][$sequence]['validCnt'];
|
echo '<td class="cell_value">';
|
||||||
$percent = 0;
|
$percent = 0;
|
||||||
if ($frequencys[$fkey][$sequence]['validCnt'] > 0 ) {
|
if ($frequencys[$fkey][$sequence]['validCnt'] > 0 ) {
|
||||||
$percent = 100;
|
$percent = 100;
|
||||||
@ -1110,21 +1133,24 @@ class SurveyBreak
|
|||||||
#dodamo še skupno sumo in povprečje
|
#dodamo še skupno sumo in povprečje
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
|
||||||
echo '<td class="rsdl_bck_variable1">';
|
echo '<td class="cell_value">';
|
||||||
echo $lang[''].'Skupaj';
|
echo 'Skupaj';
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
|
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
#povprečja
|
#povprečja
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
||||||
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$totalFreq[$sequence];
|
echo (int)$totalFreq[$sequence];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
@ -1144,7 +1170,6 @@ class SurveyBreak
|
|||||||
$rowspan = ' rowspan="3"';
|
$rowspan = ' rowspan="3"';
|
||||||
$colspan = ' colspan="'.(2*count($spremenljivka['grids'][0]['variables'])).'"';
|
$colspan = ' colspan="'.(2*count($spremenljivka['grids'][0]['variables'])).'"';
|
||||||
|
|
||||||
|
|
||||||
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
foreach ($spremenljivka['grids'] AS $gkey => $grid) {
|
||||||
|
|
||||||
// Ce smo v porocilu po meri in ni prava tabela jo preskocimo
|
// Ce smo v porocilu po meri in ni prava tabela jo preskocimo
|
||||||
@ -1178,21 +1203,22 @@ class SurveyBreak
|
|||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
echo '<table>';
|
echo '<table class="table_break">';
|
||||||
|
|
||||||
|
|
||||||
#labele
|
#labele
|
||||||
echo '<tr>';
|
echo '<tr class="row1">';
|
||||||
|
|
||||||
echo '<th'.$rowspan.'>';
|
echo '<td class="cell_question" '.$rowspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
||||||
echo $forSpremenljivka['naslov'];
|
echo $forSpremenljivka['naslov'];
|
||||||
echo '('.$forSpremenljivka['variable'].')';
|
echo '('.$forSpremenljivka['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo '<th'.$colspan.'>';
|
echo '<td class="cell_question" '.$colspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
||||||
echo $spremenljivka['naslov']. ' - ';
|
echo $spremenljivka['naslov']. ' - ';
|
||||||
@ -1200,30 +1226,28 @@ class SurveyBreak
|
|||||||
echo '('.$grid['variable'].')';
|
echo '('.$grid['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo'</tr>';
|
echo'</tr>';
|
||||||
|
|
||||||
|
|
||||||
#labele
|
#labele
|
||||||
echo '<tr>';
|
echo '<tr class="row2">';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub" colspan="2">';
|
echo '<td class="cell_grid" colspan="2">';
|
||||||
echo $variable['naslov'];
|
echo $variable['naslov'];
|
||||||
echo '('.$variable['variable'].')';
|
echo '('.$variable['variable'].')';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr class="row3">';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub">Povprečje'.$lang[''];
|
echo '<td class="cell_value">Povprečje</td>';
|
||||||
echo '</th>';
|
echo '<td class="cell_value">Št. enot</td>';
|
||||||
echo '<th class="sub red">Št. enot'.$lang[''];
|
|
||||||
echo '</th>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
@ -1233,30 +1257,38 @@ class SurveyBreak
|
|||||||
foreach ($frequencys AS $fkey => $fkeyFrequency) {
|
foreach ($frequencys AS $fkey => $fkeyFrequency) {
|
||||||
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov'];
|
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov'];
|
||||||
$cnt++;
|
$cnt++;
|
||||||
|
|
||||||
foreach ($forSpremenljivka['options'] AS $oKey => $option) {
|
foreach ($forSpremenljivka['options'] AS $oKey => $option) {
|
||||||
if ($displayAll || $means[$fkey][$oKey] != null) {
|
if ($displayAll || $means[$fkey][$oKey] != null) {
|
||||||
|
|
||||||
# če je osnova checkbox vzamemo samo tam ko je 1
|
# če je osnova checkbox vzamemo samo tam ko je 1
|
||||||
if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) {
|
if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) {
|
||||||
echo '<tr>';
|
|
||||||
echo '<td'.$break_percentRowSpan.' class="rsdl_bck_variable1">';
|
echo '<tr>';
|
||||||
|
|
||||||
|
echo '<td class="cell_value">';
|
||||||
if ($forSpremenljivka['tip'] == 2) {
|
if ($forSpremenljivka['tip'] == 2) {
|
||||||
echo $cbxLabel;
|
echo $cbxLabel;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
echo $forSpremenljivka['options'][$oKey];
|
echo $forSpremenljivka['options'][$oKey];
|
||||||
}
|
}
|
||||||
|
|
||||||
#echo ' ('.$oKey.')';
|
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
|
|
||||||
#povprečje
|
#povprečje
|
||||||
echo '<td>';
|
echo '<td class="cell_value">';
|
||||||
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,'');
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
$totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']);
|
||||||
$totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
$totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt'];
|
||||||
|
|
||||||
@ -1271,19 +1303,22 @@ class SurveyBreak
|
|||||||
#dodamo še skupno sumo in povprečje
|
#dodamo še skupno sumo in povprečje
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
|
||||||
echo '<td class="rsdl_bck_variable1">';
|
echo '<td class="cell_value">';
|
||||||
echo 'Skupaj';
|
echo 'Skupaj';
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
if ($variable['other'] != 1) {
|
if ($variable['other'] != 1) {
|
||||||
|
|
||||||
#povprečja
|
#povprečja
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
$totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0;
|
||||||
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
echo $this->formatNumber($totalMean ,$this->num_digit_average,'');
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
# enote
|
# enote
|
||||||
echo '<td class="red strong">';
|
echo '<td class="cell_value">';
|
||||||
echo (int)$totalFreq[$sequence];
|
echo (int)$totalFreq[$sequence];
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
@ -1372,20 +1407,22 @@ class SurveyBreak
|
|||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
echo '<table>';
|
echo '<table class="table_break">';
|
||||||
|
|
||||||
|
|
||||||
#labele
|
#labele
|
||||||
echo '<tr>';
|
echo '<tr class="row1">';
|
||||||
echo '<th'.$rowspan.'>';
|
|
||||||
|
echo '<td class="cell_question" '.$rowspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $forSpr . '\'); return false;">';
|
||||||
echo $forSpremenljivka['naslov'];
|
echo $forSpremenljivka['naslov'];
|
||||||
echo '('.$forSpremenljivka['variable'].')';
|
echo '('.$forSpremenljivka['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo '<th'.$colspan.'>';
|
echo '<td class="cell_question" '.$colspan.'>';
|
||||||
echo '<span class="anl_variabla">';
|
echo '<span class="anl_variabla">';
|
||||||
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $spremenljivka['id'] . '\'); return false;">';
|
||||||
echo $spremenljivka['naslov']. ' - ';
|
echo $spremenljivka['naslov']. ' - ';
|
||||||
@ -1393,37 +1430,49 @@ class SurveyBreak
|
|||||||
echo '('.$grid['variable'].')';
|
echo '('.$grid['variable'].')';
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '</span>';
|
echo '</span>';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
|
|
||||||
echo'</tr>';
|
echo'</tr>';
|
||||||
|
|
||||||
|
|
||||||
#labele
|
#labele
|
||||||
echo '<tr>';
|
echo '<tr class="row2">';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
echo '<th class="sub" >';
|
echo '<td class="cell_grid">';
|
||||||
echo $variable['naslov'];
|
echo $variable['naslov'];
|
||||||
echo '('.$variable['variable'].')';
|
echo '('.$variable['variable'].')';
|
||||||
echo '('.$variable['sequence'].')';
|
echo '('.$variable['sequence'].')';
|
||||||
echo '</th>';
|
echo '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
|
|
||||||
$cntCbx= 0;
|
$cntCbx= 0;
|
||||||
foreach ($forSequences AS $fKey => $forSequence) {
|
foreach ($forSequences AS $fKey => $forSequence) {
|
||||||
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov'];
|
$cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov'];
|
||||||
$cntCbx++;
|
$cntCbx++;
|
||||||
|
|
||||||
foreach ($forSpremenljivka['options'] AS $oKey => $option) {
|
foreach ($forSpremenljivka['options'] AS $oKey => $option) {
|
||||||
if ($displayAll || $texts[$forSequence][$oKey] != null) {
|
if ($displayAll || $texts[$forSequence][$oKey] != null) {
|
||||||
if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) {
|
if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) {
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
echo '<td'.$break_percentRowSpan.' class="rsdl_bck_variable1">';
|
|
||||||
|
echo '<td class="cell_value">';
|
||||||
if ($forSpremenljivka['tip'] == 2) {
|
if ($forSpremenljivka['tip'] == 2) {
|
||||||
echo $cbxLabel;
|
echo $cbxLabel;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
echo $forSpremenljivka['options'][$oKey];
|
echo $forSpremenljivka['options'][$oKey];
|
||||||
}
|
}
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
foreach ($grid['variables'] AS $vkey => $variable) {
|
foreach ($grid['variables'] AS $vkey => $variable) {
|
||||||
$sequence = $variable['sequence'];
|
$sequence = $variable['sequence'];
|
||||||
#povprečje
|
#povprečje
|
||||||
echo '<td class="anl_at cell_space" style="vertical-align:top;">';
|
echo '<td class="cell_value">';
|
||||||
if (count($texts[$forSequence][$oKey][$sequence]) > 0) {
|
if (count($texts[$forSequence][$oKey][$sequence]) > 0) {
|
||||||
$cnt=1;
|
$cnt=1;
|
||||||
$count = count($texts[$forSequence][$oKey][$sequence]);
|
$count = count($texts[$forSequence][$oKey][$sequence]);
|
||||||
@ -1435,11 +1484,9 @@ class SurveyBreak
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '</td>';
|
||||||
#echo $this->formatNumber($texts[$oKey][$sequence],$this->num_digit_average,'');
|
|
||||||
echo '</td>';
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1606,16 +1653,16 @@ class SurveyBreak
|
|||||||
echo '<div class="analysis_bottom_settings printHide">';
|
echo '<div class="analysis_bottom_settings printHide">';
|
||||||
|
|
||||||
echo '<div class="comment_holder">';
|
echo '<div class="comment_holder">';
|
||||||
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(9);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
|
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(9);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
//echo '<a href="#" onClick="printAnaliza(\'Break\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
|
//echo '<a href="#" onClick="printAnaliza(\'Break\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
|
||||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_xls&anketa=' . $this->sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls black very_large"></span></a>';
|
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_xls&anketa=' . $this->sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';
|
||||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_rtf&anketa=' . $this->sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf black very_large"></span></a>';
|
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_rtf&anketa=' . $this->sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
|
||||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis&anketa=' . $this->sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf black very_large"></span></a>';
|
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis&anketa=' . $this->sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf"></span></a>';
|
||||||
|
|
||||||
echo '<a href="#" onclick="doArchiveBreak();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv black very_large"></span></a>';
|
echo '<a href="#" onclick="doArchiveBreak();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv black very_large"></span></a>';
|
||||||
echo '<a href="#" onclick="createArchiveBreakBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail black very_large"></span></a>';
|
echo '<a href="#" onclick="createArchiveBreakBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail"></span></a>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
// Nastavimo url api-ja
|
// Nastavimo url api-ja
|
||||||
$api_url = 'http://localhost/FDV/frontend/api/api.php';
|
$api_url = 'http://localhost/FDV/frontend/api/api.php';
|
||||||
|
$api_url = 'https://www.1ka.si/frontend/api/api.php';
|
||||||
|
|
||||||
// Nastavimo identifier in key userja
|
// Nastavimo identifier in key userja
|
||||||
$identifier = '';
|
$identifier = '';
|
||||||
@ -19,7 +20,7 @@ $action = 'logout';
|
|||||||
|
|
||||||
|
|
||||||
// Izvedemo klic (GET ali POST)
|
// Izvedemo klic (GET ali POST)
|
||||||
//$result = executeGET();
|
$result = executeGET();
|
||||||
//$result = executePOST();
|
//$result = executePOST();
|
||||||
|
|
||||||
|
|
||||||
|
@ -3685,7 +3685,7 @@ $lang = array (
|
|||||||
"srv_statistic_period_day_month" => "Dnevi v mesecu",
|
"srv_statistic_period_day_month" => "Dnevi v mesecu",
|
||||||
"srv_statistic_period_day_week" => "Dnevi v tednu",
|
"srv_statistic_period_day_week" => "Dnevi v tednu",
|
||||||
"srv_statistic_period_hour_day" => "Ure v dnevu",
|
"srv_statistic_period_hour_day" => "Ure v dnevu",
|
||||||
"srv_statistic_hide_null" => "Skrij 0: ",
|
"srv_statistic_hide_null" => "Skrij vrednosti 0",
|
||||||
"srv_statistic_show_referals" => "Referali:",
|
"srv_statistic_show_referals" => "Referali:",
|
||||||
"srv_statistic_show_no_referals"=> "V bazi ni zapisov o referalih.",
|
"srv_statistic_show_no_referals"=> "V bazi ni zapisov o referalih.",
|
||||||
"srv_statistic_detail" => "(podrobnost)",
|
"srv_statistic_detail" => "(podrobnost)",
|
||||||
@ -3711,6 +3711,7 @@ $lang = array (
|
|||||||
"srv_statistic_redirection_sum_view" => "Skupaj ogledov povezave",
|
"srv_statistic_redirection_sum_view" => "Skupaj ogledov povezave",
|
||||||
"srv_statistic_redirection_sum_invitation" => "Skupaj emaili-neodgovori",
|
"srv_statistic_redirection_sum_invitation" => "Skupaj emaili-neodgovori",
|
||||||
"srv_statistic_redirection_test" => "od tega testnih",
|
"srv_statistic_redirection_test" => "od tega testnih",
|
||||||
|
"srv_statistic_metric" => "Metrika",
|
||||||
"srv_statistic_lang_title" => "Jezikovna različica vprašalnika",
|
"srv_statistic_lang_title" => "Jezikovna različica vprašalnika",
|
||||||
"srv_statistic_lang" => "Jezik",
|
"srv_statistic_lang" => "Jezik",
|
||||||
"srv_statistic_sum" => "Skupaj enot",
|
"srv_statistic_sum" => "Skupaj enot",
|
||||||
|
@ -3657,7 +3657,7 @@ $lang = array (
|
|||||||
"srv_statistic_period_day_month" => "by days of month",
|
"srv_statistic_period_day_month" => "by days of month",
|
||||||
"srv_statistic_period_day_week" => "by days of the week",
|
"srv_statistic_period_day_week" => "by days of the week",
|
||||||
"srv_statistic_period_hour_day" => "by hours of the day",
|
"srv_statistic_period_hour_day" => "by hours of the day",
|
||||||
"srv_statistic_hide_null" => "Hide 0:",
|
"srv_statistic_hide_null" => "Hide values 0",
|
||||||
"srv_statistic_show_referals" => "Referrers:",
|
"srv_statistic_show_referals" => "Referrers:",
|
||||||
"srv_statistic_show_no_referals"=> "The database has no records for referrers.",
|
"srv_statistic_show_no_referals"=> "The database has no records for referrers.",
|
||||||
"srv_statistic_detail" => "(detail)",
|
"srv_statistic_detail" => "(detail)",
|
||||||
@ -3683,6 +3683,7 @@ $lang = array (
|
|||||||
"srv_statistic_redirection_sum_view" => "Sum views of link",
|
"srv_statistic_redirection_sum_view" => "Sum views of link",
|
||||||
"srv_statistic_redirection_sum_invitation" => "Sum email-invalid",
|
"srv_statistic_redirection_sum_invitation" => "Sum email-invalid",
|
||||||
"srv_statistic_redirection_test" => "from this test",
|
"srv_statistic_redirection_test" => "from this test",
|
||||||
|
"srv_statistic_metric" => "Metric",
|
||||||
"srv_statistic_lang_title" => "Questionnaire language",
|
"srv_statistic_lang_title" => "Questionnaire language",
|
||||||
"srv_statistic_lang" => "Language",
|
"srv_statistic_lang" => "Language",
|
||||||
"srv_statistic_sum" => "All units",
|
"srv_statistic_sum" => "All units",
|
||||||
|
@ -12038,6 +12038,154 @@ table#standard_words_table th div.standardna-beseda-th {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dashboard_top_info {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
.dashboard_top_info span {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dashboard_boxes {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin-top: 32px;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box {
|
||||||
|
position: relative;
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 430px;
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 32px 16px;
|
||||||
|
margin: 0 32px 32px 0;
|
||||||
|
font-size: 14px;
|
||||||
|
border: 1px #E5E5E5 solid;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box:nth-child(3), .dashboard_boxes .dashboard_box:nth-child(6) {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box .box_title {
|
||||||
|
position: absolute;
|
||||||
|
top: -10px;
|
||||||
|
left: 16px;
|
||||||
|
padding: 0 16px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #1E88E5;
|
||||||
|
text-transform: uppercase;
|
||||||
|
line-height: 18px;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box .box_top_settings {
|
||||||
|
display: flex;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box .box_top_settings span,
|
||||||
|
.dashboard_boxes .dashboard_box .box_top_settings label {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0 0 16px 0;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table:last-of-type {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr.row1 td {
|
||||||
|
padding: 8px 16px 8px 8px;
|
||||||
|
font-weight: 600;
|
||||||
|
background-color: #F8F8F8;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr td {
|
||||||
|
padding: 4px 16px 4px 8px;
|
||||||
|
font-size: 14px;
|
||||||
|
border-top: 1px #E5E5E5 solid;
|
||||||
|
border-bottom: 1px #E5E5E5 solid;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr td strong {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr td span {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr td .graph_db {
|
||||||
|
float: left;
|
||||||
|
height: 16px;
|
||||||
|
margin-top: 2px;
|
||||||
|
background-color: #1E88E5;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box table tr td .graph_text {
|
||||||
|
margin-left: 8px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box#div_statistic_info table tr td {
|
||||||
|
padding: 0 0 8px 0;
|
||||||
|
border: 0;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box#div_statistic_info table tr td:first-child {
|
||||||
|
width: 100px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box#div_statistic_info table tr td:nth-child(3) {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box#div_statistic_status table tr td:nth-child(2), .dashboard_boxes .dashboard_box#div_statistic_status table tr td:nth-child(3) {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.dashboard_boxes .dashboard_box#div_statistic_answer_state table tr td:nth-child(2), .dashboard_boxes .dashboard_box#div_statistic_answer_state table tr td:nth-child(3) {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.survey_referals_tbl {
|
||||||
|
width: 100%;
|
||||||
|
border-spacing: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
margin: 0px;
|
||||||
|
border-collapse: collapse;
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
.survey_referals_tbl td {
|
||||||
|
padding: 3px 0px;
|
||||||
|
}
|
||||||
|
.survey_referals_tbl th {
|
||||||
|
text-align: left;
|
||||||
|
white-space: nowrap;
|
||||||
|
font-weight: normal;
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#div_statistic_float_div {
|
||||||
|
position: fixed;
|
||||||
|
width: 620px;
|
||||||
|
max-height: 600px;
|
||||||
|
z-index: 90;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #FF0000;
|
||||||
|
background-color: white;
|
||||||
|
margin: auto auto;
|
||||||
|
}
|
||||||
|
#div_statistic_float_div .list {
|
||||||
|
margin-left: 20px;
|
||||||
|
padding-top: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dashboard_status_span {
|
||||||
|
display: inline-block;
|
||||||
|
width: 200px;
|
||||||
|
padding: 2px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#div_statistic_status span {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 2px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.opt_bold {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Branching ikone, radio, checkboxi...
|
Branching ikone, radio, checkboxi...
|
||||||
*/
|
*/
|
||||||
@ -17166,6 +17314,20 @@ iframe#ifmcontentstoprint {
|
|||||||
#breakResults .table_holder {
|
#breakResults .table_holder {
|
||||||
margin-bottom: 64px;
|
margin-bottom: 64px;
|
||||||
}
|
}
|
||||||
|
#breakResults .table_holder table tr.row2 td.cell_grid {
|
||||||
|
background-color: #F2F2F2;
|
||||||
|
}
|
||||||
|
#breakResults .table_holder table td.cell_var {
|
||||||
|
width: 260px;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
#breakResults .table_holder table td.cell_question a {
|
||||||
|
text-decoration: none;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
#breakResults .table_holder table td.cell_value {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
#breakResults .tableChart {
|
#breakResults .tableChart {
|
||||||
margin: 0 auto 16px auto;
|
margin: 0 auto 16px auto;
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
@import "my_surveys/my_surveys";
|
@import "my_surveys/my_surveys";
|
||||||
|
|
||||||
// Survey pages
|
// Survey pages
|
||||||
|
@import "survey_status/survey_status";
|
||||||
@import "survey_edit/survey_edit";
|
@import "survey_edit/survey_edit";
|
||||||
@import "survey_data/survey_data";
|
@import "survey_data/survey_data";
|
||||||
@import "survey_analysis/survey_analysis";
|
@import "survey_analysis/survey_analysis";
|
||||||
|
@ -39,6 +39,31 @@
|
|||||||
|
|
||||||
.table_holder{
|
.table_holder{
|
||||||
margin-bottom: 64px;
|
margin-bottom: 64px;
|
||||||
|
|
||||||
|
table{
|
||||||
|
|
||||||
|
tr.row2 td.cell_grid{
|
||||||
|
background-color: $light-gray2;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.cell_var{
|
||||||
|
width: 260px;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.cell_question{
|
||||||
|
a{
|
||||||
|
text-decoration: none;
|
||||||
|
color: $black;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
td.cell_value{
|
||||||
|
text-align: center;
|
||||||
|
//padding: 4px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.tableChart{
|
.tableChart{
|
||||||
|
224
resources/sass/admin_new/pages/survey_status/summary.scss
Normal file
224
resources/sass/admin_new/pages/survey_status/summary.scss
Normal file
@ -0,0 +1,224 @@
|
|||||||
|
|
||||||
|
.dashboard_top_info{
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
span{
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.dashboard_boxes{
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
margin-top: 32px;
|
||||||
|
|
||||||
|
.dashboard_box{
|
||||||
|
position: relative;
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 430px;
|
||||||
|
max-width: 100%;
|
||||||
|
|
||||||
|
padding: 32px 16px;
|
||||||
|
margin: 0 32px 32px 0;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
border: 1px $gray solid;
|
||||||
|
|
||||||
|
&:nth-child(3),
|
||||||
|
&:nth-child(6){
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box_title{
|
||||||
|
position: absolute;
|
||||||
|
top: -10px;
|
||||||
|
left: 16px;
|
||||||
|
|
||||||
|
padding: 0 16px;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: $blue;
|
||||||
|
text-transform: uppercase;
|
||||||
|
line-height: 18px;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box_top_settings{
|
||||||
|
display: flex;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
|
||||||
|
span,
|
||||||
|
label{
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
table{
|
||||||
|
width: 100%;
|
||||||
|
margin: 0 0 16px 0;
|
||||||
|
|
||||||
|
&:last-of-type{
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
tr{
|
||||||
|
height: auto;
|
||||||
|
|
||||||
|
&.row1{
|
||||||
|
|
||||||
|
td{
|
||||||
|
padding: 8px 16px 8px 8px;
|
||||||
|
|
||||||
|
font-weight: 600;
|
||||||
|
|
||||||
|
background-color: $light-gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
td{
|
||||||
|
padding: 4px 16px 4px 8px;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
border-top: 1px $gray solid;
|
||||||
|
border-bottom: 1px $gray solid;
|
||||||
|
|
||||||
|
strong{
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
span{
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.graph_db {
|
||||||
|
float: left;
|
||||||
|
height: 16px;
|
||||||
|
margin-top: 2px;
|
||||||
|
|
||||||
|
background-color: $blue;
|
||||||
|
}
|
||||||
|
.graph_text {
|
||||||
|
margin-left: 8px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 1
|
||||||
|
&#div_statistic_info{
|
||||||
|
|
||||||
|
table tr td{
|
||||||
|
padding: 0 0 8px 0;
|
||||||
|
border: 0;
|
||||||
|
|
||||||
|
&:first-child{
|
||||||
|
width: 100px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:nth-child(3){
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 2
|
||||||
|
&#div_statistic_status{
|
||||||
|
|
||||||
|
table tr td{
|
||||||
|
|
||||||
|
&:nth-child(2),
|
||||||
|
&:nth-child(3){
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 3
|
||||||
|
&#div_statistic_answer_state{
|
||||||
|
|
||||||
|
table tr td{
|
||||||
|
|
||||||
|
&:nth-child(2),
|
||||||
|
&:nth-child(3){
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 4
|
||||||
|
&#div_statistic_referals{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 5
|
||||||
|
&#div_statistic_visit{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Box 6
|
||||||
|
&#div_statistic_pages_state{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.survey_referals_tbl {
|
||||||
|
width: 100%;
|
||||||
|
border-spacing: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
margin: 0px;
|
||||||
|
border-collapse: collapse;
|
||||||
|
margin-top: 8px;
|
||||||
|
td {
|
||||||
|
padding: 3px 0px;
|
||||||
|
}
|
||||||
|
th {
|
||||||
|
text-align: left;
|
||||||
|
white-space: nowrap;
|
||||||
|
font-weight: normal;
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#div_statistic_float_div {
|
||||||
|
position: fixed;
|
||||||
|
width: 620px;
|
||||||
|
max-height: 600px;
|
||||||
|
z-index: 90;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid $red;
|
||||||
|
background-color: white;
|
||||||
|
margin: auto auto;
|
||||||
|
.list {
|
||||||
|
margin-left: 20px;
|
||||||
|
padding-top: 3px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.dashboard_status_span {
|
||||||
|
display: inline-block;
|
||||||
|
width: 200px;
|
||||||
|
padding: 2px 0px;
|
||||||
|
}
|
||||||
|
#div_statistic_status {
|
||||||
|
span {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 2px 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.opt_bold {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
@ -0,0 +1 @@
|
|||||||
|
@import "summary";
|
Loading…
x
Reference in New Issue
Block a user