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

Redesign - popravki napak - komentarji

Browse Source
This commit is contained in:
pero1203 2022-05-20 10:55:09 +02:00
parent b24e3024fa
commit 92de6a8c7e
5 changed files with 1489 additions and 1504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
admin/survey/SurveyAdminSettings.php
View File

@ -6815,61 +6815,6 @@ class SurveyAdminSettings {
} }
function testiranje_komentarji_links($comment_count){
global $lang;
global $site_url;
global $site_path;
global $admin_type;
global $global_user_id;
if($_GET['a'] == 'komentarji_anketa'){
// Gumb nazaj
echo '<div class="switch_button '.($_GET['a'] == A_KOMENTARJI ? ' active' : '').'">';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_KOMENTARJI.'" title="' . $lang['srv_testiranje_komentarji_title'] . '">' . $lang['srv_q_comments_back'] . '</a>';
echo '</div>';
echo '<span class="bold"> (';
if($comment_count['question']['unresolved'] > 0)
echo '<span class="orange">';
echo $comment_count['question']['unresolved'];
if($comment_count['question']['unresolved'] > 0)
echo '</span>';
echo '/'.$comment_count['question']['all'];
echo ')</span>';
}
else{
echo '<span id="comment_question_note">';
echo $lang['srv_komentarji_imate'].' ';
if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji');
if($comment_count['question']['unresolved'] > 0) echo '</span>';
echo ' '.$lang['srv_komentarji_odskupno'].' ';
echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs');
echo '</span>';
// Gumb splosni komentarji
echo '<div class="switch_button '.($_GET['a'] == A_KOMENTARJI_ANKETA ? ' active' : '').'">';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_KOMENTARJI_ANKETA.'" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">' . $lang['srv_testiranje_komentarji_anketa_title'] . '</a>';
echo '</div>';
echo '<span class="bold"> (';
if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0)
echo '<span class="orange">';
echo ($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']);
if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0)
echo '</span>';
echo '/'.($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']);
echo ')</span>';
}
}
function string_format($cnt,$lang_root) { function string_format($cnt,$lang_root) {
global $lang; global $lang;

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

@ -387,15 +387,13 @@ class SurveyStaticHtml
echo '<div id="additional_navigation">'; echo '<div id="additional_navigation">';
// Komentarji na vprasanja // Komentarji na vprasanja
echo '<span>'; echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">'; echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
echo '<span ' . ($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '') . '>';
echo $lang['srv_testiranje_komentarji_anketa_title']; echo $lang['srv_testiranje_komentarji_anketa_title'];
echo '</span>';
echo '</a>'; echo '</a>';
echo '<span class="bold" style="margin-right: 50px;"> ('; echo '<span class="bold">(';
if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0) if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
echo '<span class="orange">'; echo '<span class="orange">';
echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
@ -408,15 +406,13 @@ class SurveyStaticHtml
// Komentarji na anketo // Komentarji na anketo
echo '<span>'; echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">'; echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
echo '<span ' . ($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '') . '>';
echo $lang['srv_testiranje_komentarji_title']; echo $lang['srv_testiranje_komentarji_title'];
echo '</span>';
echo '</a>'; echo '</a>';
echo '<span class="bold"> ('; echo '<span class="bold">(';
if ($comment_count['question']['unresolved'] > 0) if ($comment_count['question']['unresolved'] > 0)
echo '<span class="orange">'; echo '<span class="orange">';
echo $comment_count['question']['unresolved']; echo $comment_count['question']['unresolved'];

18
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -136,13 +136,15 @@ class SurveyStatusProfiles
if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') { if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') {
$_podstran = 'vpogled'; $_podstran = 'vpogled';
} }
self::$currentProfileId = SurveyUserSetting :: getInstance()->getSettings('default_status_profile_'.$_podstran); self::$currentProfileId = SurveyUserSetting :: getInstance()->getSettings('default_status_profile_'.$_podstran);
if (!self::$currentProfileId) { if (!self::$currentProfileId) {
#self::$currentProfileId = 2; #self::$currentProfileId = 2;
self::$currentProfileId = self::$survayDefaultUstrezni; # je lahko 2 ali 3 self::$currentProfileId = self::$survayDefaultUstrezni; # je lahko 2 ali 3
} }
# ustrezni je lahko samo če so kakšni ustrezni zapisi v bazi ob pogoju da pa neustrezni obstajajao # ustrezni je lahko samo če so kakšni ustrezni zapisi v bazi ob pogoju da pa neustrezni obstajajao
if (self::$allValidCount == 0 && self::$allUserCount > 0) { if (self::$allValidCount == 0 && self::$allUserCount > 0) {
if (self::$currentProfileId == 2 || self::$currentProfileId == 3 ) { if (self::$currentProfileId == 2 || self::$currentProfileId == 3 ) {
@ -153,16 +155,22 @@ class SurveyStatusProfiles
# ce imamo nastavljen curent pid in profil z tem pid ne obstaja nastavomo na privzet profil # ce imamo nastavljen curent pid in profil z tem pid ne obstaja nastavomo na privzet profil
if (self::$currentProfileId != 1) { if (self::$currentProfileId != 1) {
if (!isset(self::$profiles[self::$currentProfileId])) { if (!isset(self::$profiles[self::$currentProfileId])) {
self::$currentProfileId = 1; self::$currentProfileId = 1;
} }
// Ce smo preklopili default ustrezni iz status 5,6 na 6 ali obratno
elseif(self::$currentProfileId == 2 || self::$currentProfileId == 3){
self::$currentProfileId = self::$survayDefaultUstrezni;
}
} }
# ce ne obstajajo podatki za cpid damo error # ce ne obstajajo podatki za cpid damo error
if (!isset(self::$profiles[self::$currentProfileId])) { if (!isset(self::$profiles[self::$currentProfileId])) {
die("Profile data is missing!"); die("Profile data is missing!");
return false; return false;
} else { }
else {
return true; return true;
} }
} }
@ -1214,14 +1222,16 @@ class SurveyStatusProfiles
} }
static function changeOnlyValidRadio() { static function changeOnlyValidRadio() {
if (isset($_POST['checked']) && (int)$_POST['checked'] > 0) { if (isset($_POST['checked']) && (int)$_POST['checked'] > 0) {
$dpid = (int)$_POST['checked']; $dpid = (int)$_POST['checked'];
} else { }
else {
#$dpid = 2; #$dpid = 2;
$dpid = (int)self::$survayDefaultUstrezni; $dpid = (int)self::$survayDefaultUstrezni;
} }
self::setDefaultProfileId($dpid);
self::setDefaultProfileId($dpid);
} }
/** preveri obstoj profila in vrne enak id če obstaja, če ne vrne id privzetega profila /** preveri obstoj profila in vrne enak id če obstaja, če ne vrne id privzetega profila

2877
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

25
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -147,6 +147,18 @@ div.page_komentarji_anketa {
padding: 0; padding: 0;
margin: 32px 0 0 0; margin: 32px 0 0 0;
// V vprasanju tukaj odstranimo urejanje
.spremenljivka_content{
.icons_holder{
display: none !important;
}
.add-variable{
display: none !important;
}
}
div.question_comment_holder { div.question_comment_holder {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -326,13 +338,20 @@ div.page_komentarji_anketa {
} }
#topSettingsHolder.komentarji, #topSettingsHolder.komentarji,
#topSettingsHolder.komentarji_anketa { #topSettingsHolder.komentarji_anketa {
#additional_navigation { #additional_navigation {
a {
span { span.bold {
padding: 2px 0px 2px 0; margin: 0 0 0 8px;
font-size: 14px;
span{
margin: 0;
padding: 0;
font-size: 14px;
} }
} }
} }