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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-08-10 10:18:07 +02:00
commit 15437635c7
8 changed files with 1575 additions and 1547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/survey/classes/class.GDPR.php
View File

@ -59,8 +59,8 @@ class GDPR{
$survey_list = $this->getUserSurveys(); $survey_list = $this->getUserSurveys();
echo '<fieldset>'; // echo '<fieldset>';
echo '<legend>'.$lang['srv_anketalist'].'</legend>'; // echo '<legend>'.$lang['srv_anketalist'].'</legend>';
echo '<div class="box-container">'; echo '<div class="box-container">';
@ -184,7 +184,7 @@ class GDPR{
echo '</table>'; echo '</table>';
echo '</fieldset>'; // echo '</fieldset>';
echo '<script src="/admin/survey/script/GDPR_seznam_anket.js"></script>'; echo '<script src="/admin/survey/script/GDPR_seznam_anket.js"></script>';

14
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -1696,7 +1696,11 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons">'; echo '<td class="cell_icons">';
self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick=""> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
# odgovori # odgovori
@ -5804,6 +5808,7 @@ class SurveyAnalysis {
} }
echo '<span class="faicon an_sigma" title="' . $lang['srv_analysis_icon_sumary'] . '"></span> '; echo '<span class="faicon an_sigma" title="' . $lang['srv_analysis_icon_sumary'] . '"></span> ';
echo '<div class="icon_text sum_frekv" > Sumarne frekvence</div> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';
@ -5816,6 +5821,7 @@ class SurveyAnalysis {
echo '<span class="faicon an_sigmax" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> '; echo '<span class="faicon an_sigmax" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';
} }
@ -5830,8 +5836,11 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">'; echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
} }
echo '<span class="faicon an_freqx" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> '; echo '<span class="faicon an_freqx" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '<div class="icon_text icon_text_margin" > Opisne statistike</div> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';
} }
@ -5840,6 +5849,7 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">'; echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> '; echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '<div class="icon_text" > Osnovne frekvence</div> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';
@ -5850,6 +5860,7 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_FREQUENCY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">'; echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_FREQUENCY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> '; echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '<div class="icon_text dop_frekv" > Dopolnjene frekvence</div> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';
@ -5861,6 +5872,7 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">'; echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';
echo '<span class="faicon an_chart_bar icon-blue_soft_link" title="' . $lang['6'] . '"></span> '; echo '<span class="faicon an_chart_bar icon-blue_soft_link" title="' . $lang['6'] . '"></span> ';
echo '<div class="icon_text icon_text_margin" > Tortni grafikon</div> ';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';

10
admin/survey/export/latexclasses/Analize/AnalizaSums.php
View File

@ -859,7 +859,8 @@ class AnalizaSums extends LatexAnalysisElement{
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov'])); $dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
//echo $dolzinaVprasanja."</br>"; //echo $dolzinaVprasanja."</br>";
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; //$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
}else{ }else{
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; $tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
} }
@ -1033,7 +1034,8 @@ class AnalizaSums extends LatexAnalysisElement{
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov'])); $dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
//echo $dolzinaVprasanja."</br>"; //echo $dolzinaVprasanja."</br>";
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; //$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
}else{ }else{
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; $tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
} }
@ -1689,7 +1691,8 @@ class AnalizaSums extends LatexAnalysisElement{
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov'])); $dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
//echo $dolzinaVprasanja."</br>"; //echo $dolzinaVprasanja."</br>";
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; //$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
}else{ }else{
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; $tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
} }
@ -1964,6 +1967,7 @@ class AnalizaSums extends LatexAnalysisElement{
//echo $dolzinaVprasanja."</br>"; //echo $dolzinaVprasanja."</br>";
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; $tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
}else{ }else{
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine; $tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
} }

2
admin/survey/script/GDPR_seznam_anket.js
View File

@ -74,7 +74,7 @@ function test_function() {
}; };
} }
else{ else{
box2_Color.style.backgroundColor="rgba(20, 255, 0, 0.05)"; box2_Color.style.backgroundColor="rgba(255, 0, 0, 0.05)";
box2.classList.add("checked"); box2.classList.add("checked");
for(var i=0; i < red_row.length; i++){ for(var i=0; i < red_row.length; i++){

11
admin/survey/script/urejanje_oblika.js
View File

@ -27,13 +27,16 @@ function teme_options2(){
function show_settings(id_of_element){ function show_settings(id_of_element){
// var options = document.getElementsByClassName("options"+id_of_element)[0]; var options_id = ("options"+id_of_element)
var options = document.getElementById("options"+id_of_element);
var additional_settings = document.getElementById("additional_settings_"+id_of_element); var additional_settings = document.getElementById("additional_settings_"+id_of_element);
var additional_settings_id = ("additional_settings_"+id_of_element);
// console.log(options_id);
// console.log(additional_settings_id);
// document.onclick = function(e){ // document.onclick = function(e){
// if(e.target.id !== additional_settings && e.target.id !== options ){ // if(e.target.id !== additional_settings_id && e.target.id !==options_id ){
// additional_settings.classList.remove('active'); // additional_settings.classList.remove('active');
// } // }
// } // }

3008
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

2
resources/sass/admin_new/components/form/seznam_anket.scss
View File

@ -5,7 +5,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 16px; margin: 16px 0px;

69
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -1,20 +1,71 @@
// Ikone (frekvenca, suma...) // Ikone (frekvenca, suma...)
#div_analiza_data{
.cell_icons {
position: relative;
}
.options{
border: 1px solid red;
width: 200px;
position: absolute;
left: -20px;
}
}
// .cell_icons {
// position: relative;
// }
// .options{
// border: 1px solid red;
// width: 200px;
// position: absolute;
// }
.analysis_icons_holder{ .analysis_icons_holder{
display: flex; // display: flex;
align-items: center;
justify-content: center; // align-items: center;
flex-wrap: wrap; // justify-content: center;
background-color: white;
.icon_box{ .icon_box{
display: flex; // display: flex;
align-items: center; // align-items: center;
justify-content: center; // justify-content: center;
margin-left: 16px;
width: 24px;
height: 24px;
>a{ >a{
display: flex;
text-decoration: none;
.icon_text{
color: #333333;
font-weight: 400;
margin-left: 11px;
}
.icon_text_margin{
margin-left: 5px;
}
.dop_frekv{
margin-left: 13px;
}
.sum_frekv{
margin-left: 8px;
}
&:last-of-type{ &:last-of-type{
margin-right: 0; margin-right: 0;
} }