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:
tejagerjovic 2022-07-11 13:35:31 +02:00
commit f7d8d10ac2
10 changed files with 77 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -94,7 +94,8 @@ class SurveyStaticHtml
echo '</div>';
echo '<div class="content">';
echo ' <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
if($i != 7)
echo ' <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
echo '</div>';
echo '</div>';

35
admin/survey/classes/class.Vprasanje.php
View File

@ -1758,7 +1758,7 @@ class Vprasanje {
echo '<label>'.$lang['srv_question_type'].':</label>';
echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val());">';
echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val(), \'0\');">';
echo '<option value="1"' . ($row['tip'] == 1 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_radio'] . '</option>';
echo '<option value="2"' . ($row['tip'] == 2 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_checkbox'] . '</option>';
@ -7362,10 +7362,43 @@ class Vprasanje {
}
function ajax_change_tip () {
global $lang;
Common::getInstance()->Init($this->anketa);
Common::getInstance()->updateEditStamp();
$tip = $_POST['tip'];
$confirmed = (int)$_POST['confirmed'];
// preverimo, ce obstajajo ze podatki za spremenljivko - v tem primeru damo dodaten error
if($confirmed != '1'){
$return = array();
$sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
$row = mysqli_fetch_array($sql);
if ($row['count'] > 0) {
$return['error'] = 1;
$return['output'] = '<h2>'.$lang['srv_warning'].'</h2>';
$return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<p>'.$lang['spremenljivka_change_type_data'].'</p>';
$return['output'] .= '<p class="top16">'.$lang['srv_change_question_confirm_data'].'</p>';
//ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
$return['output'] .= '<div class="button_holder">';
$return['output'] .= '<button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
$return['output'] .= '<button class="medium blue" onClick="change_tip(\''.$this->spremenljivka.'\', \''.$tip.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_spremeni_tip_vprasanja'].'</button>';
$return['output'] .= '</div>';
echo json_encode($return);
return;
}
}
self::change_tip($this->spremenljivka, $tip);

4
admin/survey/script/dataSettingProfiles.js
View File

@ -139,7 +139,7 @@ function dataSettingProfileAction(action) {
var chartPieZeros = $("#chartPieZeros").is(':checked') ? '1' : '0';
var hideEmpty = $("#hideEmpty").is(':checked') ? '1' : '0';
var hideAllSystem = $("#hideAllSystem").is(':checked') ? '1' : '0';
var numOpenAnswers = $("#numOpenAnswers").val();
var numOpenAnswers = $("#dsp_content #numOpenAnswers").val();
// var enableInspect = $('input[name="enableInspect"]:checked').val();
var dataPdfType = $('#dataPdfType').val();
var exportDataNumbering = $("#exportDataNumbering").is(':checked') ? '1' : '0';
@ -157,7 +157,7 @@ function dataSettingProfileAction(action) {
var dataShowIcons = $('input[name="dataShowIcons"]:checked').val();
var analysisGoTo = $('#analysisGoTo').val();
var analiza_legenda = $("#analiza_legenda").is(':checked') ? '1' : '0';
$.post("ajax.php?t=dataSettingProfile&a=saveProfile", {anketa:srv_meta_anketa_id, pid:pid, dsp_ndp:dsp_ndp, dsp_nda:dsp_nda, dsp_ndd:dsp_ndd, dsp_res:dsp_res, dsp_sep:dsp_sep,
crossChk0:crossChk0, crossChk1:crossChk1, crossChk2:crossChk2, crossChk3:crossChk3,
crossChkEC:crossChkEC, crossChkRE:crossChkRE, crossChkSR:crossChkSR, crossChkAR:crossChkAR, doColor:doColor, doValues:doValues,

24
admin/survey/script/vprasanje.js
View File

@ -596,12 +596,26 @@ function change_subtype_number (spremenljivka) {
vprasanje_fullscreen(spremenljivka);
});
}
function change_tip(spremenljivka, tip) {
function change_tip(spremenljivka, tip, confirmed) {
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, anketa: srv_meta_anketa_id}, function (data) {
vprasanje_fullscreen(spremenljivka, data, false, true);
vprasanje_save(true);
});
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, confirmed: confirmed, anketa: srv_meta_anketa_id},
function (data) {
try {
var data_json = JSON.parse(data);
if (data_json.error == 1) {
$('#fade').fadeIn("fast");
$('#dropped_alert').html(data_json.output).fadeIn("fast").css('width', '600px');
return;
}
}
catch(e){}
vprasanje_fullscreen(spremenljivka, data, false, true);
vprasanje_save(true);
});
}
function change_demografija(spremenljivka, podtip) {

7
frontend/simple/css/style.css
View File

@ -159,7 +159,7 @@ header nav span.menu_item a:hover {
color: #1e88e5;
}
#main {
background-color: #f7f7f7;
background-color: #F5F5F5;
}
#main .main_content {
max-width: 1400px;
@ -1256,12 +1256,17 @@ iframe {
}
/* GDPR ZAHTEVEK -------------------------------------- */
#main {
background-color: #FFFFFF;
}
body.gdpr {
line-height: 20px;
}
.gdpr #main .main_content {
padding: 0px;
font-family: "Source Sans Pro", "sans-serif" !important;
}
.register_holder {

3
lang/1.php
View File

@ -1869,6 +1869,7 @@ $lang = array (
"srv_novavrednost_grid" => "Novo podvpra&#353;anje",
"srv_brisivrednost" => "Izbri&#353;i kategorijo",
"srv_brisispremenljivko" => "Izbriši vprašanje",
"srv_spremeni_tip_vprasanja" => "Spremeni tip vprašanja",
"srv_anketalist" => "Seznam anket",
"srv_grupe" => "Anketa na ve&#269;ih straneh",
"srv_grupe_recount" => "Pre&#353;tevil&#269;i",
@ -1939,6 +1940,7 @@ $lang = array (
"srv_brisispremenljivkoconfirm_data" => "Ali ste prepričani, da želite izbrisati vprašanje in s tem tudi podatke?",
"srv_brisivrednostconfirm" => "Ali ste prepričani, da želite izbrisati odgovor?",
"srv_brisivrednostconfirm_data" => "Ali ste prepričani, da želite izbrisati odgovor in s tem tudi podatke?",
"srv_change_question_confirm_data" => "Ali ste prepričani, da želite spremeniti tip vprašanja?",
"srv_brisiifconfirm" => "Ali ste prepričani, da želite odstraniti pogoj?",
"srv_brisiifconfirm_all" => "Ali ste prepričani, da želite odstraniti pogoj in vsa vprašanja znotraj pogoja?",
"srv_brisiblockconfirm" => "Ali ste prepričani, da želite odstraniti blok?",
@ -4027,6 +4029,7 @@ $lang = array (
"spremenljivka_delete_in_if" => "Spremenljivke ne morete zbrisati, ker se pojavi v vsaj enem od pogojev",
"spremenljivka_delete_data" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da vprašanja ne izbrišete, temveč vprašanje označite, da ni vidno za respondente. To storite v zavihku \"Napredno\" pri urejanju vprašanja.",
"spremenljivka_delete_data_vre" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem odgovorov vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da odgovora ne izbrišete, temveč ga skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",
"spremenljivka_change_type_data" => "Vaša anketa vsebuje odgovore respondentov. S spremembo tipa vprašanja boste izbrisali morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da ustvarite novo vprašanje, obstoječe vprašanje pa skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",
"if_delete_data" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem pogoja in vseh vprašanj znotraj pogoja boste izbrisali tudi morebitne odgovore na ta vprašanja.<br><br>Če ne želite zgubiti podatkov, predlagamo, da pogoja z vprašanji ne izbrišete, temveč v nastavitvah pogoja označite, da vsebine pogoja ne prikaže.",
"oid_auth_rejected" => "Avtentikacija je bila zavrnjena",
"google_auth_rejected" => "Avtentikacija preko ponudnika google je bila zavrnjena.",

5
lang/2.php
View File

@ -1852,6 +1852,7 @@ $lang = array (
"srv_novavrednost_grid" => "New Sub-question",
"srv_brisivrednost" => "Delete category",
"srv_brisispremenljivko" => "Delete question",
"srv_spremeni_tip_vprasanja" => "Change question type",
"srv_anketalist" => "Survey list",
"srv_grupe" => "Pages",
"srv_grupe_recount" => "Enumerate pages",
@ -1927,6 +1928,7 @@ $lang = array (
"srv_brisispremenljivkoconfirm_data" => "Are you sure you want to delete the question and responses for this question?",
"srv_brisivrednostconfirm" => "Are you sure you want to delete the answer?",
"srv_brisivrednostconfirm_data" => "Are you sure you want to delete the answer and responses for this answer?",
"srv_change_question_confirm_data" => "Are you sure you want to change question type?",
"srv_brisiifconfirm" => "Are you sure you want to delete this condition?",
"srv_brisiifconfirm_all" => "Are you sure you want to delete this condition and all questions inside this condition?",
"srv_brisiblockconfirm" => "Are you sure you want to delete this block?",
@ -4008,7 +4010,8 @@ $lang = array (
"spremenljivka_delete_in_if" => "Question cannot be deleted, because it appears in at least on of the conditions",
"spremenljivka_delete_data" => "This survey already has some data collected. With deleting this question, you will also be deleting question data.",
"spremenljivka_delete_data_vre" => "This survey already has some data collected. With deleting this answer, you will also be deleting question data.",
"if_delete_data" => "This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",
"spremenljivka_change_type_data" => "This survey already has some data collected. With changing of question type, you will also be deleting question data.",
"if_delete_data" => "This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",
"oid_auth_rejected" => "Authentication has been rejected",
"google_auth_rejected" => "Google rejected authentication.",
"oid_maybe_you_rejected" => "Have you accidentally rejected login through Google?",

1
resources/sass/frontend_simple/basic/colors.scss
View File

@ -10,6 +10,7 @@ $border_color: #646464;
$color_background: #ffffff;
$color_background_dark: #f7f7f7;
$color_background_grey: #F5F5F5;
$color_background_very_dark: #e6e6e6;
$color_border: #cccccc;

5
resources/sass/frontend_simple/modules/GDPR.scss
View File

@ -1,11 +1,16 @@
/* GDPR ZAHTEVEK -------------------------------------- */
#main {
background-color: #FFFFFF;
}
body.gdpr {
line-height: 20px;
}
.gdpr #main .main_content {
padding: 0px;
font-family: "Source Sans Pro", "sans-serif" !important;
}
.register_holder{

2
resources/sass/frontend_simple/modules/main.scss
View File

@ -1,5 +1,5 @@
#main{
background-color: $color_background_dark;
background-color: $color_background_grey;
.main_content{
max-width: 1400px;