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-04-01 11:02:14 +02:00
commit d8bf24ae38
23 changed files with 2896 additions and 1978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/BranchingAjax.php
View File

@ -2324,8 +2324,8 @@ class BranchingAjax {
$rowanketa = SurveyInfo::getInstance()->getSurveyRow(); $rowanketa = SurveyInfo::getInstance()->getSurveyRow();
echo '<textarea name="vsebina" id="vsebina_'.$spremenljivka.'_'.$view.'" style="width:100%; height:50px; margin-bottom:10px; border:1px red solid;"></textarea><br />'; echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
echo '<input type="submit" value="'.$lang['send'].'" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;" />'; echo '<button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) { if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {

417
admin/survey/SurveyAdminSettings.php
View File

@ -1273,35 +1273,32 @@ class SurveyAdminSettings {
echo '<fieldset class="comments"><legend>'.$lang['srv_preview_defaults'].'</legend>'; echo '<fieldset class="comments"><legend>'.$lang['srv_preview_defaults'].'</legend>';
echo '<div class="setting_holder">';
echo '<div class="setting_item top0">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_disableif" value=""><input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="preview_disableif" id="disableif">'; echo '<input type="hidden" name="preview_disableif" value=""><input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="preview_disableif" id="disableif">';
echo '<label for="disableif">'.$lang['srv_disableif'].'</label>'; echo '<label for="disableif">'.$lang['srv_disableif'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_disablealert" value=""><input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="preview_disablealert" id="disablealert">'; echo '<input type="hidden" name="preview_disablealert" value=""><input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="preview_disablealert" id="disablealert">';
echo '<label for="disablealert">'.$lang['srv_disablealert'].'</label>'; echo '<label for="disablealert">'.$lang['srv_disablealert'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_displayifs" value=""><input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="preview_displayifs" id="displayifs">'; echo '<input type="hidden" name="preview_displayifs" value=""><input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="preview_displayifs" id="displayifs">';
echo '<label for="displayifs">'.$lang['srv_displayifs'].'</label>'; echo '<label for="displayifs">'.$lang['srv_displayifs'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_displayvariables" value=""><input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="preview_displayvariables" id="displayvariables">'; echo '<input type="hidden" name="preview_displayvariables" value=""><input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="preview_displayvariables" id="displayvariables">';
echo '<label for="displayvariables">'.$lang['srv_displayvariables'].'</label>'; echo '<label for="displayvariables">'.$lang['srv_displayvariables'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_hidecomment" value=""><input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="preview_hidecomment" id="hidecomment">'; echo '<input type="hidden" name="preview_hidecomment" value=""><input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="preview_hidecomment" id="hidecomment">';
echo '<label for="hidecomment">'.$lang['srv_preview_comments2'].'</label>'; echo '<label for="hidecomment">'.$lang['srv_preview_comments2'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; echo '<div class="setting_holder">';
echo '<input type="hidden" name="preview_hide_survey_comment" value=""><input type="checkbox" value="1" '.($preview_hide_survey_comment==1?' checked':'').' name="preview_hide_survey_comment" id="hidesurveycomment">'; echo '<input type="hidden" name="preview_hide_survey_comment" value=""><input type="checkbox" value="1" '.($preview_hide_survey_comment==1?' checked':'').' name="preview_hide_survey_comment" id="hidesurveycomment">';
echo '<label for="hidesurveycomment">'.$lang['srv_preview_hide_survey_comment'].'</label>'; echo '<label for="hidesurveycomment">'.$lang['srv_preview_hide_survey_comment'].'</label>';
echo '</div>'; echo '</div>';
echo '</div>';
echo '<div class="setting_holder horizontal">'; echo '<div class="setting_holder horizontal">';
echo '<span class="setting_title">' . $lang['srv_preview_survey_comment_showalways'] .':</span>'; echo '<span class="setting_title">' . $lang['srv_preview_survey_comment_showalways'] .':</span>';
@ -7052,13 +7049,7 @@ class SurveyAdminSettings {
$rowa = SurveyInfo::getInstance()->getSurveyRow(); $rowa = SurveyInfo::getInstance()->getSurveyRow();
echo '<div id="placeholder" class="komentarji">'; echo '<div id="comment_question_note">';
echo '<div id="branching" class="branching_new expanded komentarji">';
echo '<span id="comment_question_note">';
echo $lang['srv_komentarji_imate'].' '; echo $lang['srv_komentarji_imate'].' ';
if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '<span class="red">'; if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '<span class="red">';
@ -7067,18 +7058,22 @@ class SurveyAdminSettings {
echo ' '.$lang['srv_komentarji_odskupno'].' '; echo ' '.$lang['srv_komentarji_odskupno'].' ';
echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od'); echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od');
echo '</span>'; echo '</div>';
/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
echo '&nbsp;<span class="tooltip clr spaceLeft">'; echo '&nbsp;<span class="tooltip clr spaceLeft">';
echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') '; echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
echo '<span class="expanded-tooltip bottom light" style="left: -20px;">'; echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].''; echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>'; echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
echo '<span class="arrow"></span>'; echo '<span class="arrow"></span>';
echo '</span>'; // expanded-tooltip bottom echo '</span>'; // expanded-tooltip bottom
echo '</span>'; // tooltip echo '</span>'; // tooltip */
echo '<div class="testni_vnos">';
echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon monitor link-right"></span> '.$lang['srv_survey_testdata'].'</a>';
echo '</div>';
# VV: privzeto naj bodo samo nerešeni komentarji # VV: privzeto naj bodo samo nerešeni komentarji
@ -7086,14 +7081,13 @@ class SurveyAdminSettings {
$_GET['only_unresolved'] = 1; $_GET['only_unresolved'] = 1;
} }
echo '<span style="float:left; width:auto; margin-top:20px; display:inline-block;">';
# samo nerešeni komentarji # samo nerešeni komentarji
if ($commentmarks == 0) { if ($commentmarks == 0) {
echo '<label for="only_unresolved"><input type="checkbox" id="only_unresolved" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji_anketa&only_unresolved=\'+$(\'#only_unresolved:checked\').val()" value="1" '.($_GET['only_unresolved']==1?'checked':'').' />'; echo '<div class="setting_holder">';
echo $lang['srv_comments_unresolved']; echo '<input type="checkbox" id="only_unresolved" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji_anketa&only_unresolved=\'+$(\'#only_unresolved:checked\').val()" value="1" '.($_GET['only_unresolved']==1?'checked':'').' />';
echo '</label>'; echo '<label for="only_unresolved">'.$lang['srv_comments_unresolved'].'</label>';
echo '</div>';
} else { } else {
echo $lang['move_show'].': <select id="only_unresolved" name="" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji_anketa&only_unresolved=\'+$(\'#only_unresolved\').val(); " > echo $lang['move_show'].': <select id="only_unresolved" name="" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji_anketa&only_unresolved=\'+$(\'#only_unresolved\').val(); " >
<option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option> <option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option>
@ -7104,7 +7098,7 @@ class SurveyAdminSettings {
<option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} }
echo ' '.Help::display('srv_comments_only_unresolved').'</span>'; //echo ' '.Help::display('srv_comments_only_unresolved');
$only_unresolved = " "; $only_unresolved = " ";
switch($_GET['only_unresolved']){ switch($_GET['only_unresolved']){
@ -7127,31 +7121,46 @@ class SurveyAdminSettings {
break; break;
} }
echo '<div class="komentarji_anketa_holder">';
// Splosni komentarji urednikov - levo // Splosni komentarji urednikov - levo
echo '<div class="komentarji_anketa komentarji_ured">'; echo '<div class="komentarji_anketa komentarji_ured">';
echo '<span class="komentarji_title">'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')</span>'; echo '<fieldset><legend>'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')</legend>';
echo '<div style="padding: 20px 20px">';
$sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." "); $sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." ");
$rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1; $rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1;
if ($rows > 0){ if ($rows > 0){
echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
echo '<br />';
$i=0; $i=0;
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) { if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) {
if ($row['ocena'] == 0) echo '<span style="color:black">'; /*if ($row['ocena'] == 0) echo '<span style="color:black">';
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">'; elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">'; elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">'; elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
else echo '<span>'; else echo '<span>';*/
echo '<b>'.$f->user($row['uid']).'</b> ('.$f->datetime1($row['time']).'):'; echo '<div class="comment_box">';
echo '<div style="float:right">'; echo '<div class="by">';
echo $lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span>'.$lang['srv_comments_user2'];
echo '</div>';
$datetime = strtotime($row['time']);
$datetime = date("d.m.Y G:i", $datetime);
echo '<div class="date">';
echo $datetime;
echo '</div>';
echo '<div class="content">';
echo $row['vsebina'];
echo '</div>';
echo '<div>';
if ($commentmarks == 1) { if ($commentmarks == 1) {
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option> <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
@ -7160,15 +7169,21 @@ class SurveyAdminSettings {
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} else { } else {
// Checkbox za "Koncano" /*// Checkbox za "Koncano"
echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />'; echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />';
echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
if ($row['ocena']==0) {
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
echo $lang['srv_comments_archive'].'</p>';
}
else {
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
}
} }
echo '</div>'; echo '</div>';
echo '<br/>'.$row['vsebina'].'<hr>'; echo '</div>';
echo '</span>';
} }
$i++; $i++;
} }
@ -7184,41 +7199,35 @@ class SurveyAdminSettings {
} }
} }
echo '</div>';
// Dodajanje novega komentarja // Dodajanje novega komentarja
echo '<div id="survey_comment_0_4" style="display:none"></div>'; echo '<div class="new_comment" id="survey_comment_0_4">';
echo '<p><a href="#" onclick="$(\'#comment_field_admin\').toggle(); return false;">'.$lang['srv_comments_add_comment'].'</a></p>';
echo '<p id="comment_field_admin" style="display:none">';
$ba = new BranchingAjax($this->anketa); $ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '1', '4', false); $ba->add_comment_field(0, '1', '4', false);
echo '</p>'; echo '</div>';
echo '</fieldset>';
echo '</div>'; echo '</div>';
// Splosni komentarji respondentov - desno // Splosni komentarji respondentov - desno
echo '<div class="komentarji_anketa komentarji_resp">'; echo '<div class="komentarji_anketa komentarji_resp">';
echo '<span class="komentarji_title">'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')</span>'; echo '<fieldset><legend>'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')</legend>';
echo '<div style="padding: 20px 20px">';
$sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby"); $sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby");
if (mysqli_num_rows($sql) > 0) { if (mysqli_num_rows($sql) > 0) {
echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
echo '<br />';
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
if ($row['ocena'] == 0) echo '<span style="color:black">'; echo '<div class="comment_box">';
/*if ($row['ocena'] == 0) echo '<span style="color:black">';
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">'; elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">'; elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">'; elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
else echo '<span>'; else echo '<span>';*/
$datetime = strtotime($row['comment_time']); $datetime = strtotime($row['comment_time']);
$datetime = date("d.m G:i", $datetime); $datetime = date("d.m.Y G:i", $datetime);
if($row['usr_id'] == 0){ if($row['usr_id'] == 0){
$user = $lang['guest']; $user = $lang['guest'];
@ -7230,9 +7239,20 @@ class SurveyAdminSettings {
$user = $rowU['name']; $user = $rowU['name'];
} }
echo '<b>'.$user.'</b> ('.$datetime.'):'; echo '<div class="by">';
echo $lang['srv_comments_user'].'<span class="user">'.$user.'</span>'.$lang['srv_comments_user2'];
echo '</div>';
echo '<div style="float:right">'; echo '<div class="date">';
echo $datetime;
echo '</div>';
echo '<div class="content">';
echo $row['comment'];
echo '</div>';
echo '<div>';
if ($commentmarks == 1) { if ($commentmarks == 1) {
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option> <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
@ -7241,15 +7261,22 @@ class SurveyAdminSettings {
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} else { } else {
// Checkbox za "Koncano" /*// Checkbox za "Koncano"
echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />'; echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />';
echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
if ($row['ocena']==0) {
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
echo $lang['srv_comments_archive'].'</p>';
}
else {
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
}
} }
echo '</div>'; echo '</div>';
echo '<br/>'.$row['comment'].'<hr>'; echo '</div>';
echo '</span>';
} }
} }
// Nimamo komentarja // Nimamo komentarja
@ -7262,22 +7289,19 @@ class SurveyAdminSettings {
echo $lang['srv_no_comments']; echo $lang['srv_no_comments'];
} }
} }
echo '</div>';
// Dodajanje novega komentarja // Dodajanje novega komentarja
echo '<div id="survey_comment_0_5" style="display:none"></div>'; echo '<div class="new_comment" id="survey_comment_0_5">';
echo '<p><a href="#" onclick="$(\'#comment_field_resp\').toggle(); return false;">'.$lang['srv_comments_add_comment'].'</a></p>';
echo '<p id="comment_field_resp" style="display:none">';
$ba = new BranchingAjax($this->anketa); $ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '4', '5', false); $ba->add_comment_field(0, '1', '5', false);
echo '</p>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</fieldset>';
echo '</div>';
echo '</div>'; // div.komentarji_anketa_holder
echo '</div>';
echo '</div>';
} }
function testiranje_komentarji_komentarji_na_anketo ($return = true) { function testiranje_komentarji_komentarji_na_anketo ($return = true) {
@ -7523,11 +7547,6 @@ class SurveyAdminSettings {
$rowi = SurveyInfo::getInstance()->getSurveyRow(); $rowi = SurveyInfo::getInstance()->getSurveyRow();
echo '<div id="placeholder" class="komentarji">';
echo '<div id="branching" class="branching_new expanded komentarji">';
SurveySetting::getInstance()->Init($this->anketa); SurveySetting::getInstance()->Init($this->anketa);
$question_resp_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_viewadminonly'); $question_resp_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_viewadminonly');
$question_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment_viewadminonly'); $question_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment_viewadminonly');
@ -7544,7 +7563,7 @@ class SurveyAdminSettings {
$comment_count = $this->testiranje_komentarji_count(); $comment_count = $this->testiranje_komentarji_count();
echo '<span id="comment_question_note">'; echo '<div id="comment_question_note">';
echo $lang['srv_komentarji_imate'].' '; echo $lang['srv_komentarji_imate'].' ';
if($comment_count['question']['unresolved'] > 0) echo '<span class="red">'; if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
@ -7554,18 +7573,20 @@ class SurveyAdminSettings {
echo ' '.$lang['srv_komentarji_odskupno'].' '; echo ' '.$lang['srv_komentarji_odskupno'].' ';
echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od'); echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od');
echo '</span>'; echo '</div>';
echo '&nbsp;<span class="tooltip clr spaceLeft">'; /* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho '&nbsp;<span class="tooltip clr spaceLeft">';
echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
echo '<span class="expanded-tooltip bottom light" style="left: -20px;">'; echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].''; echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>'; echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
echo '<span class="arrow"></span>'; echo '<span class="arrow"></span>';
echo '</span>'; // expanded-tooltip bottom echo '</span>'; // expanded-tooltip bottom
echo '</span>'; // tooltip echo '</span>'; // tooltip */
echo '<div class="testni_vnos">';
echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon link-right monitor"></span>'.$lang['srv_survey_testdata'].'</a>';
echo '</div>';
# VV: privzeto naj bodo samo nerešeni komentarji # VV: privzeto naj bodo samo nerešeni komentarji
@ -7581,19 +7602,18 @@ class SurveyAdminSettings {
$show_survey_comment = 1; $show_survey_comment = 1;
} }
echo '<span style="float:left; width:auto; margin-top:20px; display:inline-block;">'; /*// vsa vprasanja
// vsa vprasanja
echo '<label for="all_questions" style="margin-right:40px"><input type="checkbox" id="all_questions" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji'.(isset($_GET['only_unresolved'])?'&only_unresolved='.$_GET['only_unresolved']:'').'&all_questions=\'+$(\'#all_questions:checked\').val()" value="1" '.($_GET['all_questions']==1?'checked':'').' />'; echo '<label for="all_questions" style="margin-right:40px"><input type="checkbox" id="all_questions" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji'.(isset($_GET['only_unresolved'])?'&only_unresolved='.$_GET['only_unresolved']:'').'&all_questions=\'+$(\'#all_questions:checked\').val()" value="1" '.($_GET['all_questions']==1?'checked':'').' />';
echo $lang['srv_all_questions']; echo $lang['srv_all_questions'];
echo '</label>'; echo '</label>';*/
# samo nerešeni komentarji # samo nerešeni komentarji
if ($commentmarks == 0) { if ($commentmarks == 0) {
echo '<label for="only_unresolved"><input type="checkbox" id="only_unresolved" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji'.(isset($_GET['all_questions'])?'&all_questions='.$_GET['all_questions']:'').'&only_unresolved=\'+$(\'#only_unresolved:checked\').val()" value="1" '.($_GET['only_unresolved']==1?'checked':'').' />'; echo '<div class="setting_holder">';
//echo $lang['srv_comments_unresolved'].' '.$this->testiranje_komentarji_komentarji_na_vprasanje(); echo '<input type="checkbox" id="only_unresolved" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji'.(isset($_GET['all_questions'])?'&all_questions='.$_GET['all_questions']:'').'&only_unresolved=\'+$(\'#only_unresolved:checked\').val()" value="1" '.($_GET['only_unresolved']==1?'checked':'').' />';
echo $lang['srv_comments_unresolved']; echo '<label for="only_unresolved">'.$lang['srv_comments_unresolved'].'</label>';
echo '</label>'; echo '</div>';
} else { } else {
echo $lang['move_show'].': <select id="only_unresolved" name="" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji&only_unresolved=\'+$(\'#only_unresolved\').val(); " > echo $lang['move_show'].': <select id="only_unresolved" name="" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji&only_unresolved=\'+$(\'#only_unresolved\').val(); " >
<option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option> <option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option>
@ -7604,10 +7624,7 @@ class SurveyAdminSettings {
<option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} }
echo ' '.Help::display('srv_comments_only_unresolved').'</span>'; // echo ' '.Help::display('srv_comments_only_unresolved').'</span>';
// Nov nacin kjer se sprehodimo cez branching, ker imamo lahko tudi komentarje na ife in bloke // Nov nacin kjer se sprehodimo cez branching, ker imamo lahko tudi komentarje na ife in bloke
@ -7617,10 +7634,10 @@ class SurveyAdminSettings {
$view = 1; $view = 1;
echo '<span class="floatLeft" style="width:100% !important;">';
$b = new Branching($this->anketa); $b = new Branching($this->anketa);
echo '<ul>';
foreach($branching_array AS $element){ foreach($branching_array AS $element){
// Gre za if ali blok // Gre za if ali blok
@ -7664,8 +7681,6 @@ class SurveyAdminSettings {
if (($_GET['all_questions']=='1') OR (mysqli_num_rows($sqlt) > 0)) { if (($_GET['all_questions']=='1') OR (mysqli_num_rows($sqlt) > 0)) {
$c++; $c++;
echo '<div style="margin: 20px 0">';
echo '<li id="branching_'.$if_id.'" class="spr">'; echo '<li id="branching_'.$if_id.'" class="spr">';
echo '<div class="spremenljivka_content">'; echo '<div class="spremenljivka_content">';
@ -7685,7 +7700,7 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
echo '</li>'; echo '</li>';
echo '<div style="width:40%; margin: 0 5% 2% 1%; float: left">'; echo '<div class="question_comment_holder">';
if ($addfieldposition == 1) { if ($addfieldposition == 1) {
echo '<div id="survey_comment_'.$if_id.'_'.'4'.'" style="display:none"></div>'; echo '<div id="survey_comment_'.$if_id.'_'.'4'.'" style="display:none"></div>';
@ -7804,12 +7819,9 @@ class SurveyAdminSettings {
$sql2 = sisplet_query("SELECT COUNT(*) AS count FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2"); $sql2 = sisplet_query("SELECT COUNT(*) AS count FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2");
$row2 = mysqli_fetch_array($sql2); $row2 = mysqli_fetch_array($sql2);
if ( ($_GET['all_questions']=='1') OR ( mysqli_num_rows($sqlt) > 0 || $row2['count'] > 0 || $row1['note'] != '' ) ) { if ( ($_GET['all_questions']=='1') OR ( mysqli_num_rows($sqlt) > 0 || $row2['count'] > 0 || $row1['note'] != '' ) ) {
$c++; $c++;
echo '<div style="margin: 20px 0">';
echo '<li id="branching_'.$spr_id.'" class="spr spr_tip_'.$row1['tip'].'">'; echo '<li id="branching_'.$spr_id.'" class="spr spr_tip_'.$row1['tip'].'">';
$b->vprasanje($spr_id); $b->vprasanje($spr_id);
echo '</li>'; echo '</li>';
@ -7824,7 +7836,7 @@ class SurveyAdminSettings {
} }
} }
echo '<div style="width:40%; margin: 0 5% 2% 1%; float: left">'; echo '<div class="question_comment_holder">';
if ($addfieldposition == 1) { if ($addfieldposition == 1) {
echo '<div id="survey_comment_'.$spr_id.'_'.'4'.'" style="display:none"></div>'; echo '<div id="survey_comment_'.$spr_id.'_'.'4'.'" style="display:none"></div>';
@ -7835,20 +7847,22 @@ class SurveyAdminSettings {
echo '</p>'; echo '</p>';
} }
// komentarji na vprasanje echo '<div class="question_comment editor">';
// komentarji urednikov
if ($row1['thread'] > 0) { if ($row1['thread'] > 0) {
if (mysqli_num_rows($sqlt) > 0) { if (mysqli_num_rows($sqlt) > 0) {
echo '<p class="red"><b>'.$lang['srv_admin_comment'].'</b>'; echo '<div class="comment_type">';
//$rowss = mysqli_num_rows($sql);
//if ($rowss > 0) echo $lang['srv_admin_comment'].':';
echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
echo '</p>'; echo '</div>';
$i = 0; $i = 0;
while ($rowt = mysqli_fetch_array($sqlt)) { while ($rowt = mysqli_fetch_array($sqlt)) {
if ($_GET['only_unresolved'] == 1) { /* if ($_GET['only_unresolved'] == 1) {
if ($rowt['ocena'] == 0) echo '<span style="color:black">'; if ($rowt['ocena'] == 0) echo '<span style="color:black">';
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">'; elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
elseif ($rowt['ocena'] == 2) echo '<span style="color:#999999">'; elseif ($rowt['ocena'] == 2) echo '<span style="color:#999999">';
@ -7860,14 +7874,28 @@ class SurveyAdminSettings {
elseif ($rowt['ocena'] == 2) echo '<span style="color:black">'; elseif ($rowt['ocena'] == 2) echo '<span style="color:black">';
elseif ($rowt['ocena'] == 3) echo '<span style="color:black">'; elseif ($rowt['ocena'] == 3) echo '<span style="color:black">';
else echo '<span>'; else echo '<span>';
} }*/
echo '<b>'.$f->user($rowt['uid']).'</b> ('.$f->datetime1($rowt['time']).'):'; echo '<div class="comment_box">';
echo '<div class="by">';
echo $lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span>'.$lang['srv_comments_user2'];
echo '</div>';
$datetime = strtotime($rowt['time']);
$datetime = date("d.m.Y G:i", $datetime);
echo '<div class="date">';
echo $datetime;
echo '</div>';
echo '<div class="content">';
echo $rowt['vsebina'];
echo '</div>';
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
echo '<div style="float:right; text-align:right">'; echo '<div class="bottom_options">';
if ($commentmarks == 1) { if ($commentmarks == 1) {
echo ' <select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> echo ' <select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option> <option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
@ -7876,35 +7904,55 @@ class SurveyAdminSettings {
<option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} else { } else {
echo '<input type="checkbox" name="ocena_'.$rowt['id'].'" id="ocena_'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});" value="2" '.($rowt['ocena'] >= 2?' checked':'').' /><label for="ocena_'.$rowt['id'].'">'.$lang['srv_done'].'</label>';
if ($row['ocena']==0) {
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
echo $lang['srv_comments_archive'].'</p>';
} }
echo ' <br /><a href="javascript:comment_on_comment(\''.$rowt['id'].'\');">'.$lang['srv_comment_comment'].'</a>'; else {
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
}
}
echo '<div class="reply_to">';
echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
echo '</div>';
echo '</div>'; echo '</div>';
} }
echo '<br/>'.$rowt['vsebina'].'<span id="comment_on_comment_'.$rowt['id'].'"></span><hr>'; echo '</div>';
echo '</span>';
echo '<div class="reply_to_text" id="comment_on_comment_'.$rowt['id'].'">';
echo '</div>';
} }
} }
} }
if ($addfieldposition == '' || $addfieldposition == 0) { if ($addfieldposition == '' || $addfieldposition == 0) {
echo '<div id="survey_comment_'.$spr_id.'_'.'4'.'" style="display:none"></div>'; echo '<div class="new_comment" id="survey_comment_'.$spr_id.'_'.'4'.'">';
echo '<p><a href="#" onclick="$(\'#comment_field_'.$spr_id.'\').toggle(); return false;">'.$lang['srv_comments_add_comment'].'</a></p>';
echo '<p id="comment_field_'.$spr_id.'" style="display:none">';
$ba = new BranchingAjax($this->anketa); $ba = new BranchingAjax($this->anketa);
$ba->add_comment_field($spr_id, '1', '4', false); $ba->add_comment_field($spr_id, '1', '4', false);
echo '</p>'; echo '</div>';
} }
echo '</div>'; echo '</div>';
echo '<div class="question_comment resp">';
// komentarji respondentov // komentarji respondentov
if ($row2['count'] > 0) { if ($row2['count'] > 0) {
if ($admin_type <= $question_resp_comment_viewadminonly) { if ($admin_type <= $question_resp_comment_viewadminonly) {
echo '<div style="width:40%; margin: 0 5% 0 1%; float: left">';
echo '<p class="red"><b>'.$lang['srv_repondent_comment'].'</b></p>'; echo '<div class="comment_type">';
echo $lang['srv_repondent_comment'].':';
echo '</div>';
if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " "; if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " ";
@ -7912,27 +7960,13 @@ class SurveyAdminSettings {
if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']); if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']);
while ($rowt = mysqli_fetch_array($sqlt)) { while ($rowt = mysqli_fetch_array($sqlt)) {
if ($rowt['text2'] == 0) echo '<span style="color:black">'; echo '<div class="comment_box">';
/*if ($rowt['text2'] == 0) echo '<span style="color:black">';
elseif ($rowt['text2'] == 1) echo '<span style="color:darkgreen">'; elseif ($rowt['text2'] == 1) echo '<span style="color:darkgreen">';
elseif ($rowt['text2'] == 2) echo '<span style="color:#999999">'; elseif ($rowt['text2'] == 2) echo '<span style="color:#999999">';
elseif ($rowt['text2'] == 3) echo '<span style="color:#999999">'; elseif ($rowt['text2'] == 3) echo '<span style="color:#999999">';
else echo '<span>'; else echo '<span>'; */
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
echo '<div style="float:right">';
if ($commentmarks == 1) {
echo ' <select name="ocena'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($rowt['text2']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
<option value="1"'.($rowt['text2']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
<option value="2"'.($rowt['text2']==2?' selected':'').'>'.$lang['srv_done'].'</option>
<option value="3"'.($rowt['text2']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
</select>';
} else {
echo '<input type="checkbox" name="ocena_'.$rowt['id'].'" id="ocena_'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (this.checked?\'2\':\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});" value="2" '.($rowt['text2'] >= 2?' checked':'').' /><label for="ocena_'.$rowt['id'].'">'.$lang['srv_done'].'</label>';
}
echo ' </div>';
}
// Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja // Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja
$sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'"); $sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'");
@ -7942,36 +7976,72 @@ class SurveyAdminSettings {
if ( strpos($rowt['text'], '__DATE__') !== false ) { if ( strpos($rowt['text'], '__DATE__') !== false ) {
$rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']); $rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']);
echo ''.nl2br($rowt['text']).'<hr>'; echo '<div class="content">';
echo nl2br($rowt['text']);
echo '</div>';
} }
else { else {
echo ''.$f->datetime1($rowTime['time_edit']).':<br>';
echo ''.nl2br($rowt['text']).'<hr>'; $datetime = strtotime($rowTime['time_edit']);
$datetime = date("d.m.Y G:i", $datetime);
echo '<div class="date">';
echo $datetime;
echo '</div>';
echo '<div class="content">';
echo nl2br($rowt['text']);
echo '</div>';
} }
} }
else{ else{
if ( strpos($rowt['text'], '__DATE__') !== false ) { if ( strpos($rowt['text'], '__DATE__') !== false ) {
$rowt['text'] = str_replace('__DATE__', '', $rowt['text']); $rowt['text'] = str_replace('__DATE__', '', $rowt['text']);
echo ''.nl2br($rowt['text']).'<hr>'; echo '<div class="content">';
echo nl2br($rowt['text']);
echo '</div>';
} }
else { else {
echo ''.nl2br($rowt['text']).'<hr>'; echo '<div class="content">';
echo nl2br($rowt['text']);
echo '</div>';
} }
} }
echo '</span>'; if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
echo '<div class="bottom_options">';
if ($commentmarks == 1) {
echo ' <select name="ocena'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($rowt['text2']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
<option value="1"'.($rowt['text2']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
<option value="2"'.($rowt['text2']==2?' selected':'').'>'.$lang['srv_done'].'</option>
<option value="3"'.($rowt['text2']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
</select>';
} else {
if ($row['text2']==0) {
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
echo $lang['srv_comments_archive'].'</p>';
}
else {
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
}
}
echo '</div>';
}
echo '</div>';
}
echo '</div>';
}
} }
echo '</div>'; echo '</div>';
} }
} }
echo '</div>';
}
}
} }
echo '</span>'; echo '</ul>';
if ($c == 0) { if ($c == 0) {
echo '<div style="margin-top: 60px;">'; echo '<div style="margin-top: 60px;">';
@ -7988,7 +8058,6 @@ class SurveyAdminSettings {
echo '</div>'; // branching echo '</div>'; // branching
echo '<div id="vprasanje_float_editing"></div>'; echo '<div id="vprasanje_float_editing"></div>';
echo '</div>'; // placeholder
} }
/** /**
@ -8827,17 +8896,33 @@ class SurveyAdminSettings {
$total_rows = $row['count']; $total_rows = $row['count'];
echo '<form name="" action="ajax.php?anketa='.$this->anketa.'&a=testiranje&m=testnipodatki" method="post" onsubmit="init_progressBar(true);">'; echo '<form name="" action="ajax.php?anketa='.$this->anketa.'&a=testiranje&m=testnipodatki" method="post" onsubmit="init_progressBar(true);">';
echo '<p>';
echo '<span class="spaceRight">'.$lang['srv_stevilo_vnosov'].': <input type="text" name="stevilo_vnosov" value="1" onkeyup="max_stevilo_vnosov();"> (max 1000) </span>'; echo '<fieldset><legend>'.$lang['srv_testiranje_vnosi'].'</legend>';
echo '<p class="bottom16">'.$lang['srv_testni_nagovor'].'</p>';
echo '<div class="setting_holder">';
echo $lang['srv_stevilo_vnosov'].':';
echo '<div class="max_wrap">';
echo '<input class="text large" type="text" name="stevilo_vnosov" value="1" onkeyup="max_stevilo_vnosov();">';
echo '<span class="gray">(max 1000)</span>';
echo '</div>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<input type="hidden" name="only_valid" id="only_valid_0" value="0" />'; echo '<input type="hidden" name="only_valid" id="only_valid_0" value="0" />';
echo '<span style="margin: 0 25px;"><label for="only_valid_1">'.$lang['srv_testni_samo_veljavni'].': <input type="checkbox" name="only_valid" id="only_valid_1" value="1"></label></span>'; echo '<input type="checkbox" name="only_valid" id="only_valid_1" value="1">';
echo '<span class="spaceLeft"><input type="submit" name="" value="'.$lang['srv_dodaj_vnose'].'" /></span>'; echo '<label for="only_valid_1">'.$lang['srv_testni_samo_veljavni'].'</label>';
echo '</p>'; echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium blue" type="submit">'.$lang['srv_dodaj_vnose'].'</button>';
echo '</div>';
echo '</form>'; echo '</form>';
echo '<p>'.$lang['srv_testni_nagovor'].'</p>'; echo '<p class="bottom16">'.$lang['srv_testni_nakonec'].'</p>';
echo '<a href="#" onClick="delete_test_data();">'.$lang['srv_delete_testdata'].'</a> ('.$total_rows.')'; echo '<a class="noline" href="#" onClick="delete_test_data();"><span class="faicon trash empty link-right"></span>'.$lang['srv_delete_testdata'].'</a> ('.$total_rows.')';
if ($total_rows > 0) { if ($total_rows > 0) {
@ -8858,12 +8943,12 @@ class SurveyAdminSettings {
} }
echo '<fieldset><legend>'.$row['pagename'].'</legend>'; echo '<fieldset><legend>'.$row['pagename'].'</legend>';
echo '<table style="width:100%">'; echo '<table>';
$prevpage = $row['gru_id']; $prevpage = $row['gru_id'];
} }
echo '<tr><td style="width:20%; text-align:left" title="'.strip_tags($row['naslov']).'">'.skrajsaj(strip_tags($row['naslov']),20).'</td>'; echo '<tr><td title="'.strip_tags($row['naslov']).'">'.skrajsaj(strip_tags($row['naslov']),50).'</td>';
// radio ali select, checkbox, textbox, textbox*, number, datum // radio ali select, checkbox, textbox, textbox*, number, datum
if ( ($row['tip']==1 || $row['tip']==3 || $row['tip']==2 || $row['tip']==4 || $row['tip']==21 || $row['tip']==7 || $row['tip']==8) ) { if ( ($row['tip']==1 || $row['tip']==3 || $row['tip']==2 || $row['tip']==4 || $row['tip']==21 || $row['tip']==7 || $row['tip']==8) ) {
@ -8931,9 +9016,11 @@ class SurveyAdminSettings {
} }
} }
echo '<td>'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($p*0.7).'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$p.'% ('.($total_rows-$rowc['count']).')</span>'; echo ' <div class="graph_full" style="width: '.($p*0.7).'%"></div>';
echo ' <span>'.$p.'% ('.($total_rows-$rowc['count']).')</span>';
echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -8944,7 +9031,7 @@ class SurveyAdminSettings {
echo '</table>'; echo '</table>';
echo '</fieldset>'; echo '</fieldset>';
echo '<p>'.$lang['srv_testni_nakonec'].'</p>'; echo '</fieldset>';
} }
} }
} }

9
admin/survey/classes/class.SurveyParaAnalysis.php
View File

@ -962,20 +962,17 @@ class SurveyParaAnalysis{
echo '<td class="center"></td>'; echo '<td class="center"></td>';
} }
if (count($this->_missings) > 3)
$count_missing = 3;
else
$count_missing = count($this->_missings); $count_missing = count($this->_missings);
if ($showQuestion) { if ($showQuestion) {
echo '<td>'; echo '<td class="left semi-bold">';
echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>'; echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
echo '</td>'; echo '</td>';
echo '<td colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">'; echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">';
echo $spr['naslov']; echo $spr['naslov'];
echo '</td>'; echo '</td>';
} else { } else {
echo '<td colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">'; echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">';
echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>'; echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
echo '</td>'; echo '</td>';
} }

125
admin/survey/classes/class.SurveyParaGraph.php
View File

@ -39,13 +39,13 @@ class SurveyParaGraph{
$paraData = $this->collectParaGraphDataNew(); $paraData = $this->collectParaGraphDataNew();
echo '<p>'.$lang['srv_para_graph_text'].'</p>'; //echo '<p>'.$lang['srv_para_graph_text'].'</p>';
// PC, tablica, mobi // PC, tablica, mobi
echo '<fieldset><legend>'.$lang['srv_para_graph_device'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_para_graph_device'].'</legend>';
// Filter po napravi /* Filter po napravi
echo '<div style="margin:5px 0 15px 5px;">'; echo '<div style="margin:5px 0 15px 5px;">';
echo '<label>'.$lang['srv_analiza_filter'].': </label>'; echo '<label>'.$lang['srv_analiza_filter'].': </label>';
echo '<label for="paraGraph_filter_pc"><input type="checkbox" id="paraGraph_filter_pc" '.($this->paraGraph_filter['pc']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device0'].'</label>'; echo '<label for="paraGraph_filter_pc"><input type="checkbox" id="paraGraph_filter_pc" '.($this->paraGraph_filter['pc']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device0'].'</label>';
@ -53,32 +53,43 @@ class SurveyParaGraph{
echo ' <label for="paraGraph_filter_tablet"><input type="checkbox" id="paraGraph_filter_tablet" '.($this->paraGraph_filter['tablet']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device2'].'</label>'; echo ' <label for="paraGraph_filter_tablet"><input type="checkbox" id="paraGraph_filter_tablet" '.($this->paraGraph_filter['tablet']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device2'].'</label>';
echo ' <label for="paraGraph_filter_robot"><input type="checkbox" id="paraGraph_filter_robot" '.($this->paraGraph_filter['robot']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device3'].'</label>'; echo ' <label for="paraGraph_filter_robot"><input type="checkbox" id="paraGraph_filter_robot" '.($this->paraGraph_filter['robot']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device3'].'</label>';
echo '&nbsp;&nbsp;&nbsp;<label>('.$lang['srv_para_graph_filteredCnt'].' '.$paraData['allCount'].')</label>'; echo '&nbsp;&nbsp;&nbsp;<label>('.$lang['srv_para_graph_filteredCnt'].' '.$paraData['allCount'].')</label>';
echo '</div>';/*/
echo '<table class="parapodatki_table">';
echo '<tr>';
echo '<th>'.$lang['srv_para_graph_device'].'</th>';
echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_para_graph_device0'].'</td>';
echo '<td class="graph_cell">';
echo '<div class="graph_cell">';
echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['pcCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['pcCount'].'</span>';
echo '</div>'; echo '</div>';
echo '<table style="width:100%">';
echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_device0'].'</th>';
echo '<td style="width:100%">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['pcCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['pcCount'].'</span></span>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_device1'].'</th>'; echo '<td>'.$lang['srv_para_graph_device1'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['mobiCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['mobiCount'].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['mobiCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['mobiCount'].'</span>';
echo '</div';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_device2'].'</th>'; echo '<td>'.$lang['srv_para_graph_device2'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['tabletCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['tabletCount'].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['tabletCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['tabletCount'].'</span>';
echo '</div';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -87,7 +98,7 @@ class SurveyParaGraph{
echo '<th nowrap>'.$lang['srv_para_graph_device3'].'</th>'; echo '<th nowrap>'.$lang['srv_para_graph_device3'].'</th>';
echo '<td style="width:100%">'; echo '<td style="width:100%">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['robotCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['robotCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['robotCount'].'</span></span>'; echo ' <span >'.$paraData['robotCount'].'</span>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -102,7 +113,12 @@ class SurveyParaGraph{
// Browser // Browser
echo '<fieldset><legend>'.$lang['srv_para_graph_browser'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_para_graph_browser'].'</legend>';
echo '<table style="width:100%">'; echo '<table class="parapodatki_table">';
echo '<tr>';
echo '<th>'.$lang['srv_para_graph_browser'].'</th>';
echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
echo '</tr>';
if(count($paraData['browser']) > 0){ if(count($paraData['browser']) > 0){
if(count($paraData['browser']) > 1) if(count($paraData['browser']) > 1)
@ -112,10 +128,12 @@ class SurveyParaGraph{
if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){ if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$key.'</th>'; echo '<td>'.$key.'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $browserCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$browserCnt.'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $browserCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$browserCnt.'</span>';
echo '</div';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
@ -123,20 +141,24 @@ class SurveyParaGraph{
if(isset($paraData['browser'][$lang['srv_para_graph_other_slo']]) && $paraData['browser'][$lang['srv_para_graph_other_slo']] > 0){ if(isset($paraData['browser'][$lang['srv_para_graph_other_slo']]) && $paraData['browser'][$lang['srv_para_graph_other_slo']] > 0){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>'; echo '<td>'.$lang['srv_para_graph_other'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['browser'][$lang['srv_para_graph_other_slo']].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['browser'][$lang['srv_para_graph_other_slo']].'</span>';
echo '</div';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
if(isset($paraData['browser'][$lang['srv_para_graph_other_ang']]) && $paraData['browser'][$lang['srv_para_graph_other_ang']] > 0){ if(isset($paraData['browser'][$lang['srv_para_graph_other_ang']]) && $paraData['browser'][$lang['srv_para_graph_other_ang']] > 0){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>'; echo '<td>'.$lang['srv_para_graph_other'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['browser'][$lang['srv_para_graph_other_ang']].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['browser'][$lang['srv_para_graph_other_ang']].'</span>';
echo '</div';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
@ -153,7 +175,12 @@ class SurveyParaGraph{
// Operacijski sistem // Operacijski sistem
echo '<fieldset><legend>'.$lang['srv_para_graph_os'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_para_graph_os'].'</legend>';
echo '<table style="width:100%">'; echo '<table class="parapodatki_table">';
echo '<tr>';
echo '<th>'.$lang['srv_para_graph_os'].'</th>';
echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
echo '</tr>';
if(count($paraData['os']) > 0){ if(count($paraData['os']) > 0){
if(count($paraData['os']) > 1) if(count($paraData['os']) > 1)
@ -163,10 +190,12 @@ class SurveyParaGraph{
if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){ if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$key.'</th>'; echo '<td>'.$key.'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $osCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$osCnt.'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $osCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$osCnt.'</span>';
echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
@ -174,20 +203,24 @@ class SurveyParaGraph{
if(isset($paraData['os'][$lang['srv_para_graph_other_slo']]) && $paraData['os'][$lang['srv_para_graph_other_slo']] > 0){ if(isset($paraData['os'][$lang['srv_para_graph_other_slo']]) && $paraData['os'][$lang['srv_para_graph_other_slo']] > 0){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>'; echo '<td>'.$lang['srv_para_graph_other'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['os'][$lang['srv_para_graph_other_slo']].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['os'][$lang['srv_para_graph_other_slo']].'</span>';
echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
if(isset($paraData['os'][$lang['srv_para_graph_other_ang']]) && $paraData['os'][$lang['srv_para_graph_other_ang']] > 0){ if(isset($paraData['os'][$lang['srv_para_graph_other_ang']]) && $paraData['os'][$lang['srv_para_graph_other_ang']] > 0){
echo '<tr>'; echo '<tr>';
echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>'; echo '<td>'.$lang['srv_para_graph_other'].'</td>';
echo '<td style="width:100%">'; echo '<td class="graph_cell">';
echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>'; echo '<div class="graph_cell">';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['os'][$lang['srv_para_graph_other_ang']].'</span></span>'; echo ' <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
echo ' <span >'.$paraData['os'][$lang['srv_para_graph_other_ang']].'</span>';
echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }

70
admin/survey/classes/class.SurveyRecoding.php
View File

@ -62,8 +62,8 @@ class SurveyRecoding
function DisplaySettings() { function DisplaySettings() {
global $lang; global $lang;
echo '<fieldset><legend>'.$lang['srv_data_subnavigation_recode'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_data_subnavigation_recode'].'</legend>';
echo $lang['srv_recode_note'].'<br/><br/>'; echo '<p class="bottom16">'.$lang['srv_recode_note'].'</p>';
echo $lang['srv_recode_note_text'].'<br/><br/>'; echo '<p class="bottom16">'.$lang['srv_recode_note_text'].'</p>';
#poiščemo spremenljivke ki so morda rekodirane v drugo spremenljivko #poiščemo spremenljivke ki so morda rekodirane v drugo spremenljivko
/* /*
$qry_str = "select distinct spr1, spr2 from srv_recode_vrednost WHERE ank_id = '$this->anketa'"; $qry_str = "select distinct spr1, spr2 from srv_recode_vrednost WHERE ank_id = '$this->anketa'";
@ -109,11 +109,16 @@ class SurveyRecoding
$qry_str = "SELECT s.id, s.variable, s.naslov FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.tip IN (1,2,3,6,16,17,7,18,20,22,25)ORDER BY g.vrstni_red ASC, s.vrstni_red ASC"; $qry_str = "SELECT s.id, s.variable, s.naslov FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.tip IN (1,2,3,6,16,17,7,18,20,22,25)ORDER BY g.vrstni_red ASC, s.vrstni_red ASC";
$sql = sisplet_query($qry_str); $sql = sisplet_query($qry_str);
if (mysqli_num_rows($sql)) { if (mysqli_num_rows($sql)) {
echo '<table id="recode_table">'; echo '<table id="recode_table">';
echo '<thead><tr>'; echo '<tr>';
echo '<th colspan="4">'.$lang['srv_recode_h_variable'].'</th>'; echo '<th></th>';
echo '<th colspan="5">'.$lang['srv_recode_h_actions'].Help::display('srv_recode_h_actions').'</th>'; echo '<th>'.$lang['srv_recode_h_variable'].'</th>';
echo '</tr></thead>'; echo '<th>'.$lang['srv_recode_h_scale'].'</th>';
echo '<th class="center functions_column" colspan="2">'.$lang['srv_recode_h_actions'].Help::display('srv_recode_h_actions').'</th>';
echo '</tr>';
while (list($spr_id, $variable, $naslov) = mysqli_fetch_row($sql)) { while (list($spr_id, $variable, $naslov) = mysqli_fetch_row($sql)) {
$vmv = new RecodeValues($this->anketa,$spr_id); $vmv = new RecodeValues($this->anketa,$spr_id);
$hasRecoded = $vmv->hasRecodedValues() || in_array($spr_id,$recodedFrom); $hasRecoded = $vmv->hasRecodedValues() || in_array($spr_id,$recodedFrom);
@ -149,20 +154,16 @@ class SurveyRecoding
$css_even_odd = ( ($cnt_even_odd & 1) ? ' odd' : ' even' ); $css_even_odd = ( ($cnt_even_odd & 1) ? ' odd' : ' even' );
echo '<tr id="recoding_variable_div_'.$spr_id.'" class="recoding_variable_div'.$css_even_odd.$css_border.'">'; echo '<tr id="recoding_variable_div_'.$spr_id.'" class="recoding_variable_div'.$css_even_odd.$css_border.'">';
echo '<td style="width:auto;">';
echo '<td>';
SurveyAnalysis::showIcons($spr_id.'_0',$row,'desc',array('noReport' => true, 'showChart' => false)); SurveyAnalysis::showIcons($spr_id.'_0',$row,'desc',array('noReport' => true, 'showChart' => false));
echo '</td>'; echo '</td>';
echo '<td style="width:25px; text-align:center;" class="gray">';
echo $icon1;
echo '</td>';
echo '<td>';
echo '<span class="gray">'.$icon2.'</span>';
echo '<span class="green'.$css_strong.'">';
echo '<td>';
echo '<a onclick="showspremenljivkaSingleVarPopup(\''.$spr_id.'_0\'); return false;" href="#">'; echo '<a onclick="showspremenljivkaSingleVarPopup(\''.$spr_id.'_0\'); return false;" href="#">';
echo $variable; echo $variable;
echo '</a>'; echo '</a>';
echo '</span> - <span class="spaceRight'.$css_strong.'">'.skrajsaj(strip_tags($naslov),40).'</span>'; echo ' - '.skrajsaj(strip_tags($naslov),40);
if ($key) { if ($key) {
$row1 = Cache::srv_spremenljivka($key); $row1 = Cache::srv_spremenljivka($key);
@ -171,60 +172,57 @@ class SurveyRecoding
echo '</td>'; echo '</td>';
echo '<td class="gray" style="padding-right:10px; padding-left:10px;">'; echo '<td>';
$legend = Cache::spremenljivkaLegenda($spr_id); $legend = Cache::spremenljivkaLegenda($spr_id);
echo '('.$legend['izrazanje'].' - '.$legend['skala'].')'; echo $legend['skala'];
echo '</td>'; echo '</td>';
echo '<td style="width:50px; text-align:center;" >';
echo '<td class="functions_column">';
echo '<div class="functions">';
#dodaj #dodaj
if ($is_recoded_new == true) { if ($is_recoded_new == true) {
echo '<span class="silver">&nbsp;</span>'; echo '<div class="sep silver">&nbsp;</div>';
} else { } else {
if ((int)$hasRecoded > 0) { if ((int)$hasRecoded > 0) {
echo '<span class="silver">'.$lang['srv_recode_add'].'</span>'; echo '<div class="sep sep silver">'.$lang['srv_recode_add'].'</div>';
} else { } else {
echo '<span class="as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_add'].'</span>'; echo '<div class="sep as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_add'].'</div>';
} }
} }
echo '</td>';
echo '<td style="padding-right:10px; padding-left:10px;text-align:center;">';
# uredi # uredi
if ($is_recoded_new == true) { if ($is_recoded_new == true) {
echo '<span class="silver">&nbsp;</span>'; echo '<div class="sep silver">&nbsp;</div>';
} else { } else {
if ((int)$hasRecoded > 0) { if ((int)$hasRecoded > 0) {
echo '<span class="as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_edit'] .'</span>'; echo '<div class="sep as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_edit'] .'</div>';
} else { } else {
echo '<span class="silver">'.$lang['srv_recode_edit'] .'</span>'; echo '<div class="sep silver">'.$lang['srv_recode_edit'] .'</div>';
} }
} }
echo '</td>';
echo '<td style="padding-right:10px; padding-left:10px; text-align:center;">';
# odstrani # odstrani
if ($is_recoded_new == true) { if ($is_recoded_new == true) {
echo '<span class="silver">&nbsp;</span>'; echo '<div class="sep silver">&nbsp;</div>';
} else { } else {
if ((int)$hasRecoded > 0) { if ((int)$hasRecoded > 0) {
echo '<span class="as_link" onclick="removeQuestionRecode(\''.$spr_id.'\',\''.$lang['srv_recode_confirm_delete'].'\');">'.$lang['srv_recode_remove'].'</span>'; echo '<div class="sep as_link" onclick="removeQuestionRecode(\''.$spr_id.'\',\''.$lang['srv_recode_confirm_delete'].'\');">'.$lang['srv_recode_remove'].'</div>';
} else { } else {
echo '<span class="silver" >'.$lang['srv_recode_remove'].'</span>'; echo '<div class="sep silver" >'.$lang['srv_recode_remove'].'</div>';
} }
} }
echo '</td>';
echo '<td style="padding-right:10px; padding-left:10px;">';
if ($is_recoded_new == true) { if ($is_recoded_new == true) {
echo '<span class="silver">&nbsp;</span>'; echo '<div class="sep silver">&nbsp;</div>';
} else { } else {
if ($hasRecoded) { if ($hasRecoded) {
echo '<label><span class="as_link" onclick="enableRecodeVariable(\''.$spr_id.'\',this);">'.($enabled ? $lang['srv_recode_enabled'] : $lang['srv_recode_disabled']).'</span></label>'; echo '<label><div class="sep as_link" onclick="enableRecodeVariable(\''.$spr_id.'\',this);">'.($enabled ? $lang['srv_recode_enabled'] : $lang['srv_recode_disabled']).'</div></label>';
#echo '<label><input type="checkbox" id="recoding_variable_cb_'.$spr_id.'" onchange="enableRecodeVariable(\''.$spr_id.'\',this);"'.($enabled?' checked="checked"':'').' autocomplete="off">'.$lang['srv_recode_enable'].'</label>'; #echo '<label><input type="checkbox" id="recoding_variable_cb_'.$spr_id.'" onchange="enableRecodeVariable(\''.$spr_id.'\',this);"'.($enabled?' checked="checked"':'').' autocomplete="off">'.$lang['srv_recode_enable'].'</label>';
} else { } else {
echo '<span class="silver">'.$lang['srv_recode_enabled'].'</span>'; echo '<div class="sep silver">'.$lang['srv_recode_enabled'].'</div>';
} }
} }
echo '</div>';
echo '</td>'; echo '</td>';
$visible= ((int)$row['visible'] == 1) ? true : false; $visible= ((int)$row['visible'] == 1) ? true : false;

6
admin/survey/classes/tracking/CrossRoad.php
View File

@ -72,7 +72,7 @@ class CrossRoad {
$first_action = NAVI_STATUS; $first_action = NAVI_STATUS;
$second_action = NAVI_STATUS_OSNOVNI; $second_action = NAVI_STATUS_OSNOVNI;
$layout_width = 'wide'; $layout_width = 'narrow';
if ($_GET['m'] == 'advanced') if ($_GET['m'] == 'advanced')
$layout_width = 'fullwidth'; $layout_width = 'fullwidth';
@ -126,8 +126,8 @@ class CrossRoad {
$first_action = NAVI_TESTIRANJE; $first_action = NAVI_TESTIRANJE;
$second_action = NAVI_TESTIRANJE_KOMENTARJI; $second_action = NAVI_TESTIRANJE_KOMENTARJI;
$layout_width = 'wide'; $layout_width = 'narrow';
$layout_menu = 'menu_left'; $layout_menu = '';
$status = 0; $status = 0;

2
admin/survey/script/js-lang.php
View File

@ -195,6 +195,8 @@ lang('srv_manager_remove_alert');
lang('srv_resevanje_foto_pre_result'); lang('srv_resevanje_foto_pre_result');
lang('srv_vrednost_correct'); lang('srv_vrednost_correct');
lang('srv_editor_title'); lang('srv_editor_title');
lang('srv_comments_new');
lang('srv_comment_comment');
//LOKACIJA //LOKACIJA

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

@ -737,8 +737,8 @@ function get_editor_close(id) {
// prikaze field da manager doda nek komentar obstojecemu komentarju na vprasanje // prikaze field da manager doda nek komentar obstojecemu komentarju na vprasanje
function comment_on_comment (id) { function comment_on_comment (id) {
$('#comment_on_comment_'+id).html( $('#comment_on_comment_'+id).html(
'<br /><textarea name="vsebina" id="vsebina_comment_on_comment_'+id+'" style="width:100%"></textarea><br />' + '<textarea name="vsebina" placeholder="'+lang['srv_comment_comment']+'" id="vsebina_comment_on_comment_'+id+'"></textarea>' +
'<input type="submit" value="'+lang['send']+'" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;" />' '<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'
); );
} }

20
lang/1.php
View File

@ -4016,10 +4016,10 @@ $lang = array (
"srv_verjetnost_pojavitve" => "Verjetnost pojavitve", "srv_verjetnost_pojavitve" => "Verjetnost pojavitve",
"srv_vnosi_no_entry" => "Anketa trenutno &#353;e nima vnosov!<br/>", "srv_vnosi_no_entry" => "Anketa trenutno &#353;e nima vnosov!<br/>",
"srv_vnosi_no_entry_filter" => "Nobena enota ne ustreza izbranim filtrom!<br/>", "srv_vnosi_no_entry_filter" => "Nobena enota ne ustreza izbranim filtrom!<br/>",
"srv_stevilo_vnosov" => "Dodaj testne vnose", "srv_stevilo_vnosov" => "Število testnih vnosov",
"srv_testni_samo_veljavni" => "Samo veljavni odgovori", "srv_testni_samo_veljavni" => "Samo veljavni odgovori",
"srv_dodaj_vnose" => "Generiraj testne vnose", "srv_dodaj_vnose" => "Generiraj testne vnose",
"srv_delete_testdata" => "Pobri&#353;i testne vnose", "srv_delete_testdata" => "Izbriši vse testne vnose",
"srv_delete_autogen_testdata" => "Pobri&#353;i avtomatsko generirane vnose", "srv_delete_autogen_testdata" => "Pobri&#353;i avtomatsko generirane vnose",
"srv_autogen_testni_podatki_alert" => "Med njimi so tudi avtomatsko generirani testni vnosi.", "srv_autogen_testni_podatki_alert" => "Med njimi so tudi avtomatsko generirani testni vnosi.",
"srv_sklop_osnovna" => "Osnovna vpra&#154;anja - kategorije", "srv_sklop_osnovna" => "Osnovna vpra&#154;anja - kategorije",
@ -4059,8 +4059,8 @@ $lang = array (
"srv_casi_po_vprasanjih_bloki" => "Časi po vprašanjih (Bloki)", "srv_casi_po_vprasanjih_bloki" => "Časi po vprašanjih (Bloki)",
"srv_frekvencna_porazdelitev" => "Frekven&#269;na porazdelitev trajanja", "srv_frekvencna_porazdelitev" => "Frekven&#269;na porazdelitev trajanja",
"srv_dejanski_casi" => "Dejanski &#269;asi trajanja (brez morebitnih testnih enot)", "srv_dejanski_casi" => "Dejanski &#269;asi trajanja (brez morebitnih testnih enot)",
"srv_testni_nagovor" => "Predvideno &#353;tevilo odgovorov po vpra&#353;anjih. V primeru ve&#269; kategorij se odgovori porazdeljujejo enakomerno. <br /><br />Za &#353;tevilske spremenljivke se generira slu&#269;ajna 4 mestna &#353;tevilka, v primeru besedila pa slu&#269;ajno 10 mestno besedilo.", "srv_testni_nagovor" => "Vnesite število avtomatskih vnosov, ki jih želite generirati. Za številske spremenljivke se generira slučajna 4-mestna številka, v primeru besedila pa slučajno 10-mestno besedilo. V primeru več kategorij se odgovori porazdeljujejo enakomerno.",
"srv_testni_nakonec" => "Statisti&#269;no analizo testnih podatkov v analizah naredite tako, da v Statusih izberete Vse statuse oziroma status null.", "srv_testni_nakonec" => "Statistično analizo testnih podatkov v zavihku 'ANALIZE' naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
"srv_analiza_arhiv" => "Arhiv", "srv_analiza_arhiv" => "Arhiv",
"srv_analiza_arhiviraj" => "Arhiviraj", "srv_analiza_arhiviraj" => "Arhiviraj",
"srv_analiza_arhiviraj_ttl" => "Ustvari arhiv analize", "srv_analiza_arhiviraj_ttl" => "Ustvari arhiv analize",
@ -4513,6 +4513,11 @@ $lang = array (
"srv_comments_anketa_ured" => "Splošni komentarji urednikov", "srv_comments_anketa_ured" => "Splošni komentarji urednikov",
"srv_comments_anketa_resp" => "Splošni komentarji respondentov", "srv_comments_anketa_resp" => "Splošni komentarji respondentov",
"srv_comments_link" => "Pregled komentarjev", "srv_comments_link" => "Pregled komentarjev",
"srv_comments_user" => "Uporabnik ",
"srv_comments_user2" => " je komentiral:",
"srv_comments_archive" => "Arhiviraj komentar",
"srv_comments_archived" => "Komentar je arhiviran",
"srv_comments_new" => "Komentiraj",
"srv_zanka_profile_all" => "Brez", "srv_zanka_profile_all" => "Brez",
"srv_zanka_profile_session" => "Za&#269;asno", "srv_zanka_profile_session" => "Za&#269;asno",
"srv_zanka_note" => "Skupina za: ", "srv_zanka_note" => "Skupina za: ",
@ -4582,7 +4587,7 @@ $lang = array (
"srv_todo" => "Za narediti", "srv_todo" => "Za narediti",
"srv_done" => "Končano", "srv_done" => "Končano",
"srv_not_relevant" => "Nerelevantno", "srv_not_relevant" => "Nerelevantno",
"srv_comment_comment" => "Replika", "srv_comment_comment" => "Odgovori",
"srv_edit_data_title" => "Uredi podatke vprašanja", "srv_edit_data_title" => "Uredi podatke vprašanja",
"srv_edit_data_row" => "Uredi celotno anketo respondenta", "srv_edit_data_row" => "Uredi celotno anketo respondenta",
"srv_edit_data_row_quick" => "Hitro urejanje celotne ankete respondenta", "srv_edit_data_row_quick" => "Hitro urejanje celotne ankete respondenta",
@ -5978,7 +5983,8 @@ $lang = array (
"srv_no_reminder_all" => "Odstrani opozorila iz vseh vprašanj", "srv_no_reminder_all" => "Odstrani opozorila iz vseh vprašanj",
"srv_reminder_popup_warning" => "Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?", "srv_reminder_popup_warning" => "Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?",
"srv_jump_to" => "Skoči na", "srv_jump_to" => "Skoči na",
"srv_recode_h_variable" => "Variable", "srv_recode_h_variable" => "Spremenljivka",
"srv_recode_h_scale" => "Merska lestvica",
"srv_recode_h_actions" => "Funkcije rekodiranja", "srv_recode_h_actions" => "Funkcije rekodiranja",
"srv_recode_add" => "Dodaj", "srv_recode_add" => "Dodaj",
"srv_recode_remove" => "Odstrani", "srv_recode_remove" => "Odstrani",
@ -6185,7 +6191,7 @@ $lang = array (
'srv_recode_to_label' => 'labela', 'srv_recode_to_label' => 'labela',
'srv_recode_to_value' => 'vrednost', 'srv_recode_to_value' => 'vrednost',
'srv_recode_naknadnoVprasanje' => 'Naknadno vprašanje [-4]', 'srv_recode_naknadnoVprasanje' => 'Naknadno vprašanje [-4]',
'srv_recode_note' => 'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več >></a>', 'srv_recode_note' => 'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več informacij.</a>',
'srv_recode_note_text' => 'Za tekstovne spremenljivke izberite kodiranje.', 'srv_recode_note_text' => 'Za tekstovne spremenljivke izberite kodiranje.',
'srv_recode_confirm_delete' => 'Ali ste prepričani da želite izbrisati rekodirane vrednosti?', 'srv_recode_confirm_delete' => 'Ali ste prepričani da želite izbrisati rekodirane vrednosti?',
'srv_recode_confirm_delete_sub' => 'Ali želite pobrisati tudi rekodirano spremenljivko:', 'srv_recode_confirm_delete_sub' => 'Ali želite pobrisati tudi rekodirano spremenljivko:',

20
lang/2.php
View File

@ -3997,10 +3997,10 @@ $lang = array (
"srv_verjetnost_pojavitve" => "Probability of occurence", "srv_verjetnost_pojavitve" => "Probability of occurence",
"srv_vnosi_no_entry" => "Survey currently has no entries!<br/>", "srv_vnosi_no_entry" => "Survey currently has no entries!<br/>",
"srv_vnosi_no_entry_filter" => "Entries does not meet the selected filter?<br/>", "srv_vnosi_no_entry_filter" => "Entries does not meet the selected filter?<br/>",
"srv_stevilo_vnosov" => "Add new test entries", "srv_stevilo_vnosov" => "Number of test entries",
"srv_testni_samo_veljavni" => "Only valid answers", "srv_testni_samo_veljavni" => "Only valid answers",
"srv_dodaj_vnose" => "Generate test responses", "srv_dodaj_vnose" => "Generate test responses",
"srv_delete_testdata" => "Delete test entries", "srv_delete_testdata" => "Delete all test entries",
"srv_delete_autogen_testdata" => "Delete auto generated data.", "srv_delete_autogen_testdata" => "Delete auto generated data.",
"srv_autogen_testni_podatki_alert" => "Some of test data is auto generated.", "srv_autogen_testni_podatki_alert" => "Some of test data is auto generated.",
"srv_sklop_osnovna" => "Basic questions - categories", "srv_sklop_osnovna" => "Basic questions - categories",
@ -4040,8 +4040,8 @@ $lang = array (
"srv_casi_po_blokih_blok" => "Block", "srv_casi_po_blokih_blok" => "Block",
"srv_frekvencna_porazdelitev" => "Frequency distribution", "srv_frekvencna_porazdelitev" => "Frequency distribution",
"srv_dejanski_casi" => "Actual duration of survey", "srv_dejanski_casi" => "Actual duration of survey",
"srv_testni_nagovor" => "Expected number of answers per question. Test data are distributed evenly for questions with several answer categories. <br /><br />A random 4-digit variable is generated for numeric questions and random text with 10 characters is generated for text questions.", "srv_testni_nagovor" => "Enter the number of automatic entries you want to generate. For numeric variables, a random 4-digit number is generated, and in the case of text, a random 10-digit text is generated. In the case of multiple categories, the answers are distributed evenly.",
"srv_testni_nakonec" => "Statistical analysis on test data can be performed by setting the missing values status to null.", "srv_testni_nakonec" => "Statistical analysis on test data can be performed in the 'ANALYSIS' tab by setting the missing values status to null.",
"srv_analiza_arhiv" => "Archive", // ahrhiv analiz, meni "srv_analiza_arhiv" => "Archive", // ahrhiv analiz, meni
"srv_analiza_arhiviraj" => "Archive", "srv_analiza_arhiviraj" => "Archive",
"srv_analiza_arhiviraj_ttl" => "Create analysis archive", "srv_analiza_arhiviraj_ttl" => "Create analysis archive",
@ -4488,6 +4488,11 @@ $lang = array (
"srv_comments_napredno" => "You can edit advanced settings below", "srv_comments_napredno" => "You can edit advanced settings below",
"srv_comments_anketa_ured" => "Administrative comments to the survey", "srv_comments_anketa_ured" => "Administrative comments to the survey",
"srv_comments_anketa_resp" => "Respondent comments to the survey", "srv_comments_anketa_resp" => "Respondent comments to the survey",
"srv_comments_user" => "User ",
"srv_comments_user2" => " commented:",
"srv_comments_archive" => "Archive comment",
"srv_comments_archived" => "Comment has already been archived",
"srv_comments_new" => "Comment",
"srv_zanka_profile_all" => "Without", "srv_zanka_profile_all" => "Without",
"srv_zanka_profile_session" => "Temporary", "srv_zanka_profile_session" => "Temporary",
"srv_zanka_note" => "Loop for: ", "srv_zanka_note" => "Loop for: ",
@ -4556,7 +4561,7 @@ $lang = array (
"srv_todo" => "To do", "srv_todo" => "To do",
"srv_done" => "Done", "srv_done" => "Done",
"srv_not_relevant" => "Not relevant", "srv_not_relevant" => "Not relevant",
"srv_comment_comment" => "Comment", "srv_comment_comment" => "Reply",
"srv_edit_data_title" => "Edit question data", "srv_edit_data_title" => "Edit question data",
"srv_edit_data_row" => "Edit respondents survey", "srv_edit_data_row" => "Edit respondents survey",
"srv_edit_data_row_quick" => "Quick edit respondents survey", "srv_edit_data_row_quick" => "Quick edit respondents survey",
@ -5872,7 +5877,8 @@ $lang = array (
"srv_no_reminder_all" => "Remove reminders from all questions", "srv_no_reminder_all" => "Remove reminders from all questions",
"srv_reminder_popup_warning" => "This functionality takes a long time to complete. Do you wish to proceed?", "srv_reminder_popup_warning" => "This functionality takes a long time to complete. Do you wish to proceed?",
"srv_jump_to" => "Jump to", "srv_jump_to" => "Jump to",
"srv_recode_h_variable" => "Variables", "srv_recode_h_variable" => "Variable",
"srv_recode_h_scale" => "Scale",
"srv_recode_h_actions" => "Recode functions", "srv_recode_h_actions" => "Recode functions",
"srv_recode_add" => "Add", "srv_recode_add" => "Add",
"srv_recode_remove" => "Remove", "srv_recode_remove" => "Remove",
@ -6078,7 +6084,7 @@ $lang = array (
'srv_recode_to_label' => 'label', 'srv_recode_to_label' => 'label',
'srv_recode_to_value' => 'value', 'srv_recode_to_value' => 'value',
'srv_recode_naknadnoVprasanje' => 'Subsequently question [-4]', 'srv_recode_naknadnoVprasanje' => 'Subsequently question [-4]',
'srv_recode_note' => 'Recoding is used to change or merge values of numeric and categorical variables, as well as to assign certain values as missing. For larger interventions we recommended recoding into a new variable. <a href="https://www.1ka.si/d/en/help/manuals/recoding" target="_blank">More >></a>', 'srv_recode_note' => 'Recoding is used to change or merge values of numeric and categorical variables, as well as to assign certain values as missing. For larger interventions we recommended recoding into a new variable. <a href="https://www.1ka.si/d/en/help/manuals/recoding" target="_blank">More information.</a>',
'srv_recode_note_text' => 'For text variables, please select the coding options.', 'srv_recode_note_text' => 'For text variables, please select the coding options.',
'srv_recode_confirm_delete' => 'Are you sure you want to delete recoded values?', 'srv_recode_confirm_delete' => 'Are you sure you want to delete recoded values?',
'srv_recode_confirm_delete_sub' => 'Do you want to delete a recoded variable:', 'srv_recode_confirm_delete_sub' => 'Do you want to delete a recoded variable:',

3340
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

1
resources/sass/admin_new/basic/icons/export.scss
View File

@ -122,7 +122,6 @@ span.faicon.xml.black::before{
// Arhiv // Arhiv
span.faicon.arhiv::before{ span.faicon.arhiv::before{
font-size: 16px;
content: "\f187"; content: "\f187";
} }
span.faicon.arhiv_mail::before{ span.faicon.arhiv_mail::before{

32
resources/sass/admin_new/pages/aktivnost/parapodatki.scss
View File

@ -1,4 +1,3 @@
div.page_diagnostics { div.page_diagnostics {
//Parapodatki //Parapodatki
@ -22,3 +21,34 @@ div.page_diagnostics {
} }
} }
} }
table.parapodatki_table {
width: 100%;
white-space: nowrap;
font-size: 14px;
td {
&.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
align-items: center;
.graph_full {
background-color: $blue;
height: 16px;
margin-right: 8px;
}
span {
font-size: inherit;
}
}
}
}
}

4
resources/sass/admin_new/pages/my_surveys/my_surveys.scss
View File

@ -8,8 +8,8 @@
@import "missing_values"; @import "missing_values";
@import "standardne_besede"; @import "standardne_besede";
@import "podatki"; @import "podatki";
@import "testiranje"; @import "testiranje/testiranje";
@import "oblika_teme"; @import "oblika_teme";
@import "objava"; @import "objava";
@import "komentarji"; @import "nastavitve_komentarji";

0
resources/sass/admin_new/pages/my_surveys/komentarji.scss → resources/sass/admin_new/pages/my_surveys/nastavitve_komentarji.scss
View File

1
resources/sass/admin_new/pages/my_surveys/objava.scss
View File

@ -308,6 +308,7 @@ div#general_popup {
width: 100%; width: 100%;
padding: 8px; padding: 8px;
height: auto; height: auto;
min-width: 600px;
&.iframe { &.iframe {
height: 155px; height: 155px;

194
resources/sass/admin_new/pages/my_surveys/testiranje.scss
View File

@ -1,194 +0,0 @@
// DIAGNOSTIKA
div#srv_diagnostic {
h2 {
font-size: 24px;
margin-top: 32px;
margin-bottom: 16px;
font-weight: $light;
&:first-of-type {
margin-top: 0;
}
}
table {
width: 100%;
td {
a.ok {
color: $dark-gray2 !important;
}
div.status_wrapper {
display: flex;
align-items: center;
justify-content: center;
div.status {
display: flex;
align-items: center;
justify-content: center;
height: 24px;
min-width: 88px;
border-radius: 2px;
font-size: 14px;
&.notok {
background-color: $status-red;
}
&.ok {
background-color: $status-green;
}
&.rec {
background-color: $status-blue;
}
a {
color: inherit;
text-decoration: none;
}
}
}
}
}
div.lastnosti_wrapper {
display: flex;
flex-direction: row;
align-items: flex-start;
gap: 32px;
div.lastnosti_left,
div.lastnosti_right {
width: 50%;
}
}
div.input_box {
border: 1px solid $dark-gray;
width: 300px;
padding: 10px 0 10px 8px;
input {
border: none;
margin: 0;
padding: 0;
font-size: 16px;
width: 90%
}
}
div.button_holder {
align-items: center;
margin-bottom: 0;
button {
margin: 0 0 0 8px;
}
}
}
//OCENJEVANJE TRAJANJA, DEJANSKI ČASI
div.subpage_predvidenicas,
div.subpage_cas {
table {
width: 100%;
white-space: nowrap;
td.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
}
}
td.time {
padding-right: 0;
}
td.predvideni {
color: $dark-gray;
}
&#casi_histogram {
padding: 0;
margin: 0;
td.histogram {
vertical-align: bottom;
margin: 0;
padding: 0;
border: none;
div.histogram {
background-color: $gray;
border: 1px solid transparent;
text-align: right;
width: 100%;
margin: 0;
padding: 0;
min-height: 1px;
}
}
td.histogram_time {
padding: 0;
text-align: left;
vertical-align: top;
color: $very-dark-gray;
border: none;
}
}
}
div.graph_full {
background-color: $blue;
height: 24px;
text-align: right;
}
div.graph_empty {
background-color: $gray;
height: 24px;
}
div.graph_red {
background-color: $status-red;
height: 24px;
}
div.tabela_trajanje_legenda {
display: flex;
flex-direction: row;
justify-content: start;
align-items: center;
margin-top: 16px;
span.legend {
font-size: 14px;
}
div.legend {
width: 14px;
height: 14px;
margin-right: 8px;
border-radius: 2px;
}
span.legend {
margin-right: 32px;
}
}
}

95
resources/sass/admin_new/pages/my_surveys/testiranje/diagnostika.scss Normal file
View File

@ -0,0 +1,95 @@
// DIAGNOSTIKA
div#srv_diagnostic {
h2 {
font-size: 24px;
margin-top: 32px;
margin-bottom: 16px;
font-weight: $light;
&:first-of-type {
margin-top: 0;
}
}
table {
width: 100%;
td {
a.ok {
color: $dark-gray2 !important;
}
div.status_wrapper {
display: flex;
align-items: center;
justify-content: center;
div.status {
display: flex;
align-items: center;
justify-content: center;
height: 24px;
min-width: 88px;
border-radius: 2px;
font-size: 14px;
&.notok {
background-color: $status-red;
}
&.ok {
background-color: $status-green;
}
&.rec {
background-color: $status-blue;
}
a {
color: inherit;
text-decoration: none;
}
}
}
}
}
div.lastnosti_wrapper {
display: flex;
flex-direction: row;
align-items: flex-start;
gap: 32px;
div.lastnosti_left,
div.lastnosti_right {
width: 50%;
}
}
div.input_box {
border: 1px solid $dark-gray;
width: 300px;
padding: 10px 0 10px 8px;
input {
border: none;
margin: 0;
padding: 0;
font-size: 16px;
width: 90%
}
}
div.button_holder {
align-items: center;
margin-bottom: 0;
button {
margin: 0 0 0 8px;
}
}
}

303
resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss Normal file
View File

@ -0,0 +1,303 @@
div.page_komentarji,
div.page_komentarji_anketa {
div#comment_question_note {
margin-bottom: 16px;
font-size: 20px;
span {
font-size: inherit;
}
}
div.testni_vnos {
margin-bottom: 16px;
a {
text-decoration: none;
}
.monitor {
position: relative;
&:after{
content: "T";
position: absolute;
top: 2px;
left: 37%;
font-family: $font_family;
font-size: 8px;
}
}
}
div.setting_holder {
display: flex;
flex-direction: column;
}
div.komentarji_anketa_holder {
margin-top: 32px;
display: flex;
flex-direction: row;
gap: 32px;
width: 100%;
div.komentarji_anketa {
width: 50%;
fieldset {
padding: 32px 24px;
div.comment_box {
width: 100%;
display: flex;
flex-direction: column;
border-bottom: 1px solid $gray;
margin-bottom: 16px;
.by {
margin-bottom: 4px;
.user {
font-weight: $semi-bold;
}
}
.date {
font-size: 14px;
color: $very-dark-gray2;
}
.content {
margin: 16px 0;
}
.archive_comment {
margin-bottom: 16px;
cursor: pointer;
color: $blue;
transition: 0.2s;
&:hover {
$color: darken ($blue, 3%);
}
}
.archived_comment {
margin-bottom: 16px;
color: $very-dark-gray2
}
}
div.new_comment {
display: flex;
flex-direction: column;
textarea {
width: 100%;
height: 100px;
}
button {
width: fit-content;
margin-top: 8px;
}
}
}
}
}
// Komentarji na vprašanja
ul {
list-style-type: none;
padding: 0;
margin: 32px 0 0 0;
div.question_comment_holder {
display: flex;
flex-direction: row;
margin-top: 16px;
margin-bottom: 32px;
div.question_comment {
display: flex;
flex-direction: column;
width: 50%;
&.editor {
border-right: 1px solid $gray;
padding-right: 62px;
margin-right: 62px;
}
div.comment_type {
font-weight: $semi-bold;
margin-bottom: 16px;
text-transform: uppercase;
}
div.comment_box {
width: 100%;
display: flex;
flex-direction: column;
border-bottom: 1px solid $gray;
margin-bottom: 16px;
.by {
margin-bottom: 4px;
.user {
font-weight: $semi-bold;
}
}
.date {
font-size: 14px;
color: $very-dark-gray2;
}
.content {
margin: 16px 0;
}
.bottom_options {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
.archive_comment {
cursor: pointer;
color: $blue;
transition: 0.2s;
&:hover {
$color: darken ($blue, 3%);
}
}
.archived_comment {
margin-bottom: 16px;
color: $very-dark-gray2
}
.reply_to {
a {
text-decoration: none;
}
}
}
}
div.reply_to_text,
div.new_comment {
display: flex;
flex-direction: column;
textarea {
width: 100%;
height: 100px;
}
button {
width: fit-content;
margin-top: 8px;
}
}
}
}
}
}
////////////////////////////////
#placeholder.komentarji{
margin: 0px;
}
.comment {
font-style: italic;
color: $red;
width: auto;
padding-right: 10px;
padding-top: 3px;
display: block;
float: left;
}
.if_comment {
font-style: italic;
color: $gray;
width: auto;
margin: 0px 3px;
}
.spr_comment {
font-style: italic;
color: $gray;
width: auto;
margin: 0px 3px;
}
#quick_comments_link {
margin-bottom: 1px !important;
margin-left: 3px !important;
padding-bottom: 3px !important;
a {
span.link {
display: inline-block;
padding: 3px !important;
padding-bottom: 5px !important;
font-size: 11px;
vertical-align: top;
}
}
}
#quick_comments_link.newCss {
height: 20px !important;
line-height: 20px !important;
text-align: center;
margin-top: 8px !important;
img {
vertical-align: middle;
}
}
.comments_on_alert {
margin-bottom: 10px;
a{
//color: white;
font-weight: 500;
&:hover{
color: $blue;
}
}
}
.comment_qtip_title_secondLine {
color: $gray;
font-weight: normal !important;
padding-top: 5px;
}
@mixin sub_settings_comments(){
}
#topSettingsHolder.komentarji,
#topSettingsHolder.komentarji_anketa {
#additional_navigation {
a {
span {
padding: 2px 0px 2px 0;
}
}
}
}

4
resources/sass/admin_new/pages/my_surveys/testiranje/testiranje.scss Normal file
View File

@ -0,0 +1,4 @@
@import "trajanje";
@import "diagnostika";
@import "komentarji";
@import "testni_vnosi";

57
resources/sass/admin_new/pages/my_surveys/testiranje/testni_vnosi.scss Normal file
View File

@ -0,0 +1,57 @@
div.subpage_testnipodatki {
fieldset {
fieldset {
&:first-of-type {
margin-top: 16px;
}
&:last-of-type {
margin-bottom: 0;
}
table {
width: 100%;
white-space: nowrap;
td {
&.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
align-items: center;
.graph_full {
background-color: $blue;
height: 16px;
margin-right: 8px;
}
}
}
}
}
}
div.setting_holder{
.max_wrap {
display: flex;
flex-direction: row;
align-items: center;
input.text {
width: 150px;
height: 40px;
margin-right: 8px;
}
}
}
.button_holder {
margin-bottom: 16px;
}
}
}

98
resources/sass/admin_new/pages/my_surveys/testiranje/trajanje.scss Normal file
View File

@ -0,0 +1,98 @@
//OCENJEVANJE TRAJANJA, DEJANSKI ČASI
div.subpage_predvidenicas,
div.subpage_cas {
table {
width: 100%;
white-space: nowrap;
td.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
}
}
td.time {
padding-right: 0;
}
td.predvideni {
color: $dark-gray;
}
&#casi_histogram {
padding: 0;
margin: 0;
td.histogram {
vertical-align: bottom;
margin: 0;
padding: 0;
border: none;
div.histogram {
background-color: $gray;
border: 1px solid transparent;
text-align: right;
width: 100%;
margin: 0;
padding: 0;
min-height: 1px;
}
}
td.histogram_time {
padding: 0;
text-align: left;
vertical-align: top;
color: $very-dark-gray;
border: none;
}
}
}
div.graph_full {
background-color: $blue;
height: 24px;
text-align: right;
}
div.graph_empty {
background-color: $gray;
height: 24px;
}
div.graph_red {
background-color: $status-red;
height: 24px;
}
div.tabela_trajanje_legenda {
display: flex;
flex-direction: row;
justify-content: start;
align-items: center;
margin-top: 16px;
span.legend {
font-size: 14px;
}
div.legend {
width: 14px;
height: 14px;
margin-right: 8px;
border-radius: 2px;
}
span.legend {
margin-right: 32px;
}
}
}

32
resources/sass/admin_new/pages/survey_data/calculations.scss
View File

@ -16,3 +16,35 @@ fieldset#calculations {
margin-bottom: 0; margin-bottom: 0;
} }
} }
//Rekodiranje
table#recode_table {
width: 100%;
white-space: nowrap;
td,th {
div.analysis_icons_holder,
div.functions {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
div.sep {
border-right: 1px solid $gray;
padding: 0 16px;
vertical-align: middle;
width: fit-content;
&.silver {
color: $very-dark-gray;
}
}
}
&.functions_column {
border-left: 1px solid $gray;
}
}
}