From d8baef60cc9f7ad3dacc2f61d1faafb747cccd64 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 31 May 2022 09:57:31 +0200
Subject: [PATCH] Redesign - popravki napak - arhiv analiz

---
 .../surveyAnalysis/class.SurveyAnalysisArchive.php | 14 +++++++++-----
 public/css/admin_new.css                           |  2 ++
 .../admin_new/pages/survey_analysis/archive.scss   |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index d7a577317..078c45ed4 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -1259,7 +1259,9 @@ class SurveyAnalysisArchive {
 	 * 
 	 */
 	static function createArchiveFromAnaliza() {
+
 		$content = null;
+
 		if($_POST['podstran'] == 'charts'){
 			# kreiramo arhiv za grafe
 			$SC = new SurveyChart();
@@ -1280,13 +1282,15 @@ class SurveyAnalysisArchive {
 			if ($_POST['podstran'] == 'anal_arch') {
 				$_POST['podstran'] = 'sumarnik';
 			}
+            
 			if (!isset($_POST['content'])) {
 				SurveyAnalysis::Init(self::$sid);
 				SurveyAnalysis::setUpIsForArchive(true);
 				SurveyAnalysis::setUpReturnAsHtml(true);
 				
 				$content = SurveyAnalysis::Display();
-			} else {
+			} 
+            else {
 				$content = $_POST['content'];
 			}
 		}	
@@ -1301,12 +1305,12 @@ class SurveyAnalysisArchive {
 		$ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8);
 		if (isset($_POST['podstran']))
 			$type = $ArchiveTypes[$_POST['podstran']];
-		if (isset($content) && trim($content) != null && self::$sid > 0) {
 
+		if (isset($content) && trim($content) != null && self::$sid > 0) {
 			SurveyAnalysisArchive :: Init(self::$sid);
-			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);
-						
-		} else {
+			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);		
+		} 
+        else {
 			echo 'Error! (SurveyAnalysisArchive :: CreateArchive)';
 		}
 		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4b4ec084f..6cbd02ff6 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -30394,6 +30394,8 @@ input#endDate {
 #arch_body_div .analysis_bottom_settings {
   margin-bottom: 32px;
 }
+#arch_body_div .analysis_bottom_settings .comment_holder,
+#arch_body_div .analysis_bottom_settings a:nth-child(2),
 #arch_body_div .analysis_bottom_settings a:nth-child(6) {
   display: none;
 }
diff --git a/resources/sass/admin_new/pages/survey_analysis/archive.scss b/resources/sass/admin_new/pages/survey_analysis/archive.scss
index 0b2b3d54a..025f43a2d 100644
--- a/resources/sass/admin_new/pages/survey_analysis/archive.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/archive.scss
@@ -16,6 +16,8 @@
     .analysis_bottom_settings{
         margin-bottom: 32px;
 
+        .comment_holder,
+        a:nth-child(2),
         a:nth-child(6){
             display: none;
         }