From 97a5b48649ae746cc4b037de74ce1551004b94eb Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 28 Apr 2022 19:30:53 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Podatki=20-->=20Izra?=
 =?UTF-8?q?=C4=8Duni=20-->=20Izra=C4=8Dunane=20vrednosti=20-=20popup=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Popravki za izpisovanje nastavitev
---
 admin/survey/Branching.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 8a89d2954..ef6ea2022 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -8801,8 +8801,9 @@ class Branching {
 
         echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
 
-        echo '<div id="calculation_editing_inner podatki">';
+        echo '<div id="calculation_editing_inner" class="podatki">';
         $this->calculation_editing_inner($condition, $vrednost);
+		echo '</div>';
 
         echo '<div id="bottom_options">';
 
@@ -8839,7 +8840,7 @@ class Branching {
 
 		echo '</div>';
 
-        echo '<div id="condition_editing_close podatki">';
+        echo '<div id="condition_editing_close" class="podatki">';
 
 		echo '<div class="button_holder">';
 
@@ -8873,9 +8874,6 @@ class Branching {
 		});
 		$('#calculation_editing_inner').scroll();
 		</script><?
-
-		echo '</div>'; #calculation_editing_inner
-
     }
 
     function calculation_editing_inner ($condition, $vrednost=0) {
@@ -8932,6 +8930,8 @@ class Branching {
         if (!$sql_count) die();
         $row_count = mysqli_fetch_array($sql_count);
 
+
+		// Headerji tabele - staro
         if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) {
 			echo '<table class="tbl_condition_editing">';
 			echo '<tr>';
@@ -8944,8 +8944,9 @@ class Branching {
 			echo '</tr>';
         	echo '</table>';
 
+			//Samo ena vrstica /spremenljivka/ v kalkulaciji
         } elseif ($row['vrstni_red'] == 1) {
-			echo '<table class="tbl_condition_editing"><tr><th>&nbsp;</th></tr></table>';
+			//echo '<table class="tbl_condition_editing"><tr><th>&nbsp;</th></tr></table>';
         }
 
         // form