From 991c2e975ddafe0ecdc92a0d605ae3c2fe508d50 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 27 May 2022 00:39:32 +0200
Subject: [PATCH] [Redizajn 1ka] Popravki

---
 admin/survey/Branching.php                    |  2 +-
 admin/survey/BranchingAjax.php                |  9 +-------
 .../classes/class.SurveyStatusProfiles.php    | 23 ++++++++++---------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 894c74679..037494999 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7437,7 +7437,7 @@ class Branching {
         // gumbi na desni v novem oknu
 		if ($vrednost==0) {
 
-			// floating box
+			// floating box 
 			echo '<div id="div_condition_editing_float">';
 
 
diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 98a2b8f16..92c0ac090 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -1610,14 +1610,7 @@ class BranchingAjax {
 			if ($_GET['izpis'] == 'long') {
 				echo '<p class="semi-bold center">'.$lang['srv_check_pogoji_ok'].'!</p>';
 			
-				?>
-				<script>
-				$(function () {
-                    $('#check_pogoji').animate({opacity: 1.0}, 3000).fadeOut('slow');
-                    $('#fade').fadeOut("slow");
-				})
-				</script>
-				<?php
+				
 			} else {
 				echo '1';
 			}
diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php
index c42f2e1fe..218394290 100644
--- a/admin/survey/classes/class.SurveyStatusProfiles.php
+++ b/admin/survey/classes/class.SurveyStatusProfiles.php
@@ -349,12 +349,11 @@ class SurveyStatusProfiles
 		# preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi)
 		list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"));
 
-		echo '<table><tr>';
+		echo '<table>';
+
+		echo '<tr>';
 		// dodamo veljavne
 		foreach (self::$appropriateStatus as $index) {
-			if ($cnt&1) { 
-				echo '</tr><tr>';
-			}
 			echo '<td style="width:50%">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
@@ -363,10 +362,11 @@ class SurveyStatusProfiles
 			echo '</label></td>';
 			$cnt++;
 		}
+		echo '</tr>';
+
 		// dodamo neveljavne
+		echo '<tr>';
 		foreach (self::$unAppropriateStatus as $index) {
-			if ($cnt&1) 
-				echo '</tr><tr>';
 			echo '<td style="width:50%">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . 
@@ -376,11 +376,11 @@ class SurveyStatusProfiles
 			echo '</label></td>';
 			$cnt++;
 		}
-		// dodamo null
-		foreach (self::$unKnownStatus as $index) {
+		echo '</tr>';
 
-			if ($cnt&1) 
-				echo '</tr><tr>';
+		// dodamo null
+		echo '<tr>';
+		foreach (self::$unKnownStatus as $index) {
 			echo '<td style="width:50%">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
@@ -390,8 +390,9 @@ class SurveyStatusProfiles
 			echo '</label></td>';
 			$cnt++;
 		}
+		echo '</tr>';
 		
-		echo '</tr></table>';
+		echo '</table>';
 		
 		echo '</fieldset>';