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

Popravki prevajanja gdpr vprasanja

Browse Source
This commit is contained in:
pero1203 2021-02-26 09:36:26 +01:00
parent 85dd437453
commit b3f2e4d377
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
admin/survey/Branching.php
View File

@ -1641,13 +1641,30 @@ class Branching {
echo '</div>';
}
// Kvota
else if($row['tip'] == 25){
elseif($row['tip'] == 25){
echo '<div class="naslov '.($row['orientation']==0?'floatLeft':'').' quota">';
echo $row['naslov'];
echo '</div>';
}
// GDPR vprasanje in prevajanje - prevedemo v anglescino
elseif($prevajanje && $row['variable'] == 'gdpr'){
// nastavimo na jezik za respondentov vmesnik
$language_id_bck = $lang['id'];
$file = ($this->lang_id == '1') ? '../../lang/1.php' : '../../lang/2.php';
@include($file);
$gdpr_naslov = GDPR::getSurveyIntro($this->anketa);
echo '<div class="naslov '.($row['orientation']==0?'':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
echo $gdpr_naslov;
echo '</div>';
// nastavimo nazaj na admin jezik
$file = '../../lang/'.$language_id_bck.'.php';
@include($file);
}
else{
//echo '<div class="naslov '.($row['orientation']==0?'floatLeft':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
echo '<div class="naslov '.($row['orientation']==0?'':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
echo $row['naslov'];
echo '</div>';
@ -1929,6 +1946,23 @@ class Branching {
save('lang_id', $this->lang_id);
$naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') $row1['naslov'] = $naslov;
// Prevajanje in gdpr
if($prevajanje && $row['variable'] == 'gdpr'){
$gdpr_answer = '';
if($row1['variable'] == '2')
$gdpr_answer = 'yes';
if($row1['variable'] == '1')
$gdpr_answer = 'no';
// Prevedemo gdpr odgovore
if($gdpr_answer != ''){
$row1['naslov'] = $lang['srv_gdpr_intro_'.$gdpr_answer];
}
}
}
// Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec
@ -6921,8 +6955,6 @@ class Branching {
echo '<span class="faicon delete_circle icon-grey_normal"></span>';
} else {
echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
// echo '<span class="sprites add_blue_light"></span>';
// echo '<span class="sprites delete_blue_light"></span>';
}
echo '</td>';
@ -7228,12 +7260,6 @@ class Branching {
echo '</table>';
echo '</form>'."\n\r";
/* kaj je to??
echo ' <script type="text/javascript"> '."\n\r";
echo ' //document.form.condition_'.$condition.'.submit(); '."\n\r";
echo ' </script> '."\n\r";
*/
}
/**

13
admin/survey/classes/class.Prevajanje.php
View File

@ -563,12 +563,8 @@ class Prevajanje {
$this->Branching->introduction_conclusion(-1);
elseif ($spremenljivka == -2)
$this->Branching->introduction_conclusion(-2);
else{
else
$this->Branching->vprasanje($spremenljivka);
if ($row['tip'] == 7 && $row['ranking_k'] == 1){ //ce je tip vprasanja stevilo in je postavitev slider
//echo '</div>'; //pokomentiral, ker se sedaj pojavi težava pri izpisu v prevodu
}
}
echo '</div>';
@ -585,13 +581,8 @@ class Prevajanje {
$this->Branching->introduction_conclusion(-1);
elseif ($spremenljivka == -2)
$this->Branching->introduction_conclusion(-2);
else{
else
$this->Branching->vprasanje($spremenljivka, true); //poklici izris vprasanja za prevajanje (za enkrat je drugi argument pomemben le za slider)
if ($row['tip'] == 7 && $row['ranking_k'] == 1){ //ce je tip vprasanja stevilo in je postavitev slider
//echo '</div>'; //pokomentiral, ker se sedaj pojavi težava pri izpisu v prevodu
}
}
echo '</div>';