From 5790520931c7607f56e8f45465c965e9d97f9566 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 26 Aug 2022 10:42:16 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA=20v2]=20Testiranje=20-->=20Kome?=
 =?UTF-8?q?ntarji=20-=20odstanjen=203rd=20nav=20row,=20hover=20v=20urejanj?=
 =?UTF-8?q?u=20vpra=C5=A1alnika,=20brisanje=20OK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/SurveyAdminAjax.php               |  8 ++++++--
 admin/survey/SurveyAdminSettings.php           | 10 +++++-----
 .../survey/classes/class.SurveyStaticHtml.php  |  7 ++++++-
 admin/survey/script/vprasanje.js               |  6 +++++-
 public/css/admin_new.css                       | 18 ++++++++++++++----
 .../survey_edit/questions/question_box.scss    | 10 ++++++++--
 .../pages/survey_testiranje/komentarji.scss    |  2 +-
 7 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 8feffcfaa..0a3ff75fc 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4918,8 +4918,12 @@ class SurveyAdminAjax {
 			
 		} elseif ($_GET['a'] == 'comment_delete') {
 			$id = $_POST['id'];
-			
-			$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
+
+			if (isset($_POST['id']) && $_POST['id'] != "" && $_POST['id'] > 0) {
+				$id = $_POST['id'];
+				$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
+				//$sql = sisplet_query("DELETE FROM post WHERE parent='$id'"); Ker so odgovori v bistvu appendani v vsebino osnovnega komentarja.
+			}
 			
 		} elseif ($_GET['a'] == 'archivePopup') {
 			echo '<div class="survey_archive_popup">';
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 922e72d99..4f7f2a4e4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -6746,7 +6746,7 @@ class SurveyAdminSettings {
 		return $txt;
 	}
 
-	function menu_komentarji () {
+	public function menu_komentarji () {
 		global $lang;
 
 		// Prestejemo komentarje (nereseni/vsi)
@@ -6754,12 +6754,12 @@ class SurveyAdminSettings {
 		$comment_count = $sas->testiranje_komentarji_count();
 
 		echo '<div id="additional_navigation">';
-		echo '<div id="menu">';
+		echo '<div id="komentarji_menu">';
 
 		// Komentarji na vprasanja
 		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->anketa . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
 		echo $lang['srv_testiranje_komentarji_anketa_title'];
 		echo '</a>';
 
@@ -6778,7 +6778,7 @@ class SurveyAdminSettings {
 		// Komentarji na anketo
 		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->anketa . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
 		echo $lang['srv_testiranje_komentarji_title'];
 		echo '</a>';
 
@@ -7730,7 +7730,7 @@ class SurveyAdminSettings {
 								while ($rowt = mysqli_fetch_array($sqlt)) {
 
 
-									echo '<div class="comment_box '.($rowt['ocena']==0 ? '' : 'archived').'">';
+									echo '<div class="comment_box '.($rowt['ocena']==0 ? '' : 'archived').'" id="comment_box_'.$rowt['id'].'">';
 
 									echo '<div class="by">';
 
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index d565ca284..482811fd2 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -288,13 +288,18 @@ class SurveyStaticHtml
         if( in_array($data_file_status, array(FILE_STATUS_SRV_DELETED, FILE_STATUS_NO_DATA))
             && in_array($podstran, array(
                 'status', 'para_analysis_graph', 'para_graph', 'usable_resp', 'status_advanced',
-                'data', 'quick_edit', 'variables', 'export', 
+                'data', 'quick_edit', 'variables', 'export',
                 'sumarnik', 'descriptor', 'frequency', 'crosstabs', 'ttest', 'means', 'break', 'multicrosstabs', 'charts', 'analysis_links'
             )) ){
 
             return;
         }
 
+        //V komentarjih ni tega menija
+        if($podstran == "komentarji" || $podstran == "komentarji_anketa") {
+            return;
+        }
+
         // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
         $userAccess = UserAccess::getInstance($global_user_id);
         
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 0b31c4ce7..e01d6b526 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -763,7 +763,11 @@ function comment_on_comment (id, user, date, spr_id) {
 }
 
 function comment_delete (id) {
-	$.post("ajax.php?a=comment_delete\', {id: \''+id+'\', anketa: srv_meta_anketa_id}");
+	$.post("ajax.php?a=comment_delete", {id: id, anketa: srv_meta_anketa_id}, function(){
+
+		$(".options_dropdown").addClass("displayNone");
+		$("#comment_box_"+id).remove();
+	});
 }
 
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c8d83ce2d..7a1dff4b9 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -14969,10 +14969,18 @@ div.spr,
   color: #333333;
 }
 li.spr:hover .spr_edit,
+li.spr:hover a.surveycomment,
 div.spr:hover .spr_edit,
-.jezik_row:hover .spr_edit {
+div.spr:hover a.surveycomment,
+.jezik_row:hover .spr_edit,
+.jezik_row:hover a.surveycomment {
   display: block;
 }
+li.spr a.surveycomment,
+div.spr a.surveycomment,
+.jezik_row a.surveycomment {
+  display: none;
+}
 li.spr .spr_edit,
 div.spr .spr_edit,
 .jezik_row .spr_edit {
@@ -15554,7 +15562,9 @@ div.spr .spremenljivka_content .comment_container_inline button,
 }
 
 li.spr_editing .spr_edit,
-div.spr_editing .spr_edit {
+li.spr_editing a.surveycomment,
+div.spr_editing .spr_edit,
+div.spr_editing a.surveycomment {
   display: block;
 }
 li.spr_editing span.display_editor,
@@ -24990,8 +25000,8 @@ div.page_komentarji_anketa #additional_navigation {
   display: flex;
   justify-content: center;
 }
-div.page_komentarji #additional_navigation #menu,
-div.page_komentarji_anketa #additional_navigation #menu {
+div.page_komentarji #additional_navigation #komentarji_menu,
+div.page_komentarji_anketa #additional_navigation #komentarji_menu {
   width: fit-content;
 }
 div.page_komentarji div#comment_question_note,
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
index e0a206704..4e8596804 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
@@ -10,11 +10,16 @@ div.spr,
     color: $black;
 
     &:hover {
-        .spr_edit {
+        .spr_edit,
+        a.surveycomment {
             display: block;
         }
     }
 
+    a.surveycomment {
+        display: none;
+    }
+
 
     // Nastavitve v naslovu vprasanja ki se prikazejo na hover
     .spr_edit{
@@ -468,7 +473,8 @@ div.spr,
 li.spr_editing,
 div.spr_editing{
 
-    .spr_edit {
+    .spr_edit,
+    a.surveycomment {
         display: block;
     }
 
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 74e9aa1b8..4e831c060 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -6,7 +6,7 @@ div.page_komentarji_anketa {
         display: flex;
         justify-content: center;
 
-        #menu {
+        #komentarji_menu {
             width: fit-content;
         }
     }