Redesign - popravki napak - komentarji
This commit is contained in:
pero1203
parent
0ce1dafc61
commit
b24e3024fa
@ -6956,6 +6956,7 @@ class SurveyAdminSettings {
|
||||
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
|
||||
$survey_comment_resp = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment_resp');
|
||||
$comment_count = $this->testiranje_komentarji_count();
|
||||
$commentmarks_who = SurveySetting::getInstance()->getSurveyMiscSetting('commentmarks_who');
|
||||
|
||||
$rowa = SurveyInfo::getInstance()->getSurveyRow();
|
||||
|
||||
@ -6971,16 +6972,6 @@ class SurveyAdminSettings {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
|
||||
echo ' <span class="tooltip clr spaceLeft">';
|
||||
echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
|
||||
echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
|
||||
echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
|
||||
echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
|
||||
echo '<span class="arrow"></span>';
|
||||
echo '</span>'; // expanded-tooltip bottom
|
||||
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>';
|
||||
@ -6998,7 +6989,8 @@ class SurveyAdminSettings {
|
||||
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(); " >
|
||||
<option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option>
|
||||
<option value="1"'.($_GET['only_unresolved']==1?' selected="selected"':'').'>'.$lang['srv_comments_unresolved'].'</option>
|
||||
@ -7008,7 +7000,6 @@ class SurveyAdminSettings {
|
||||
<option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
}
|
||||
//echo ' '.Help::display('srv_comments_only_unresolved');
|
||||
|
||||
$only_unresolved = " ";
|
||||
switch($_GET['only_unresolved']){
|
||||
@ -7046,11 +7037,6 @@ class SurveyAdminSettings {
|
||||
while ($row = mysqli_fetch_array($sql)) {
|
||||
|
||||
if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) {
|
||||
/*if ($row['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';*/
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
@ -7070,7 +7056,10 @@ class SurveyAdminSettings {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
|
||||
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();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
@ -7078,10 +7067,8 @@ class SurveyAdminSettings {
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
} else {
|
||||
/*// 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 '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
|
||||
}
|
||||
else {
|
||||
|
||||
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>';
|
||||
@ -7093,10 +7080,13 @@ class SurveyAdminSettings {
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
@ -7140,12 +7130,6 @@ class SurveyAdminSettings {
|
||||
|
||||
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'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';*/
|
||||
|
||||
$datetime = strtotime($row['comment_time']);
|
||||
$datetime = date("d.m.Y G:i", $datetime);
|
||||
|
||||
@ -7174,7 +7158,10 @@ class SurveyAdminSettings {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
|
||||
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();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
@ -7182,10 +7169,8 @@ class SurveyAdminSettings {
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
} else {
|
||||
/*// 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 '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
|
||||
}
|
||||
else {
|
||||
|
||||
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>';
|
||||
@ -7197,7 +7182,9 @@ class SurveyAdminSettings {
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -7744,9 +7731,11 @@ class SurveyAdminSettings {
|
||||
|
||||
if ($admin_type <= $question_comment_viewadminonly) { // vidi vse komentarje
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved ORDER BY time $orderby, id $orderby");
|
||||
} elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje
|
||||
}
|
||||
elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved AND uid='$global_user_id' ORDER BY time $orderby, id $orderby");
|
||||
} else { // ne vidi nobenih komentarjev
|
||||
}
|
||||
else { // ne vidi nobenih komentarjev
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE 1=0");
|
||||
}
|
||||
|
||||
@ -7796,19 +7785,6 @@ class SurveyAdminSettings {
|
||||
|
||||
$i = 0;
|
||||
while ($rowt = mysqli_fetch_array($sqlt)) {
|
||||
/* if ($_GET['only_unresolved'] == 1) {
|
||||
if ($rowt['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($rowt['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($rowt['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';
|
||||
} else {
|
||||
if ($rowt['ocena'] == 0) echo '<span style="color:#990000">';
|
||||
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($rowt['ocena'] == 2) echo '<span style="color:black">';
|
||||
elseif ($rowt['ocena'] == 3) echo '<span style="color:black">';
|
||||
else echo '<span>';
|
||||
}*/
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
@ -7894,25 +7870,17 @@ class SurveyAdminSettings {
|
||||
if ($admin_type <= $question_resp_comment_viewadminonly) {
|
||||
|
||||
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 = " ";
|
||||
|
||||
$sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id ASC");
|
||||
$sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id $orderby");
|
||||
if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']);
|
||||
while ($rowt = mysqli_fetch_array($sqlt)) {
|
||||
|
||||
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'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($rowt['text2'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>'; */
|
||||
|
||||
// Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja
|
||||
$sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'");
|
||||
if(mysqli_num_rows($sqlTime) > 0){
|
||||
@ -7958,7 +7926,9 @@ class SurveyAdminSettings {
|
||||
}
|
||||
|
||||
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>
|
||||
@ -7983,12 +7953,12 @@ class SurveyAdminSettings {
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
echo '</div>'; #div.question_comment.resp
|
||||
|
||||
|
||||
echo '</div>'; #div.question_comment_holder
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user