From 8a32be95b9c5a233de562968f1e9002ed02b7fd4 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 18 Feb 2022 01:16:21 +0100
Subject: [PATCH] [Redizajn 1KA] - Podatki --> Uvozi --> Dodaj podatke - v1

---
 admin/survey/SurveyAdmin.php                  |   4 +-
 .../classes/class.SurveyAppendMerge.php       | 159 +++++++++++-------
 admin/survey/classes/tracking/CrossRoad.php   |   2 +-
 lang/1.php                                    |  43 +++--
 lang/2.php                                    |  41 +++--
 public/css/admin_new.css                      |  72 ++++++++
 .../pages/survey_data/append_merge.scss       |  95 +++++++++++
 .../pages/survey_data/calculations.scss       |  18 ++
 .../survey_data/popups/calculations.scss      |   9 +
 .../pages/survey_data/popups/popups.scss      |   1 +
 .../pages/survey_data/survey_data.scss        |   2 +
 11 files changed, 354 insertions(+), 92 deletions(-)
 create mode 100644 resources/sass/admin_new/pages/survey_data/append_merge.scss
 create mode 100644 resources/sass/admin_new/pages/survey_data/calculations.scss
 create mode 100644 resources/sass/admin_new/pages/survey_data/popups/calculations.scss

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 2d7d611bf..be22d47b0 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -3090,7 +3090,9 @@ class SurveyAdmin
         global $admin_type;
         global $global_user_id;
 
-        echo '<ul>';
+        echo '<span class="menu_left-title">'.$lang['srv_data_navigation_import'].'</span>';
+
+        echo '<ul class="menu_left-list">';
 
         # append
         echo '<li ' . ($_GET['m'] == 'append' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' class="active"' : '') . '>';
diff --git a/admin/survey/classes/class.SurveyAppendMerge.php b/admin/survey/classes/class.SurveyAppendMerge.php
index 1393f1da3..b08340c72 100644
--- a/admin/survey/classes/class.SurveyAppendMerge.php
+++ b/admin/survey/classes/class.SurveyAppendMerge.php
@@ -68,14 +68,18 @@ class SurveyAppendMerge {
 			echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
 			
 			# sporočilo za personalizirana e-vabila in respondente iz baze
-			echo $lang['srv_append_note'];
+			echo '<p class="bottom16">'.$lang['srv_append_note'].'</p>';
 			
 			// Korak 1
-			echo $lang['srv_append_step1'];
-			echo '<div class="append_step">';
+			echo '<p class="bold">'.$lang['srv_append_step1'].'</p>';
+			echo '<div class="appendmerge_indent">';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step1_notea'].'</li>';
+			echo '<li>'.$lang['srv_append_step1_noteb'].'</li>';
+			echo '<li>'.$lang['srv_append_step1_notec'].'</li>';
+			echo '</ul>';
 
-			echo $lang['srv_append_step1_note'];
-			
 			echo '<div id="inv_field_container">';
 
 			echo '<ul class="connectedSortable">';
@@ -102,23 +106,34 @@ class SurveyAppendMerge {
 					}
 				}
 			}
-			echo '</ul><br />';
+			echo '</ul>';
 			echo '</div>';
+
+			echo '<p>'.$lang['srv_append_step1_noted'].'</p>';
+
 			echo '</div>';
 			
 			
 			// Korak 2
-			echo $lang['srv_append_step2'];
-			echo '<div class="append_step">';
+			echo '<p class="bold">'.$lang['srv_append_step2'].'</p>';
+
+			echo '<div class="appendmerge_indent">';
 			
             echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
-			
-			echo '<span><label><input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
-			echo ''.$lang['srv_iz_seznama'].'</label></span>';
-			echo '<span><label><input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
-			echo ''.$lang['srv_iz_excela'].'</label></span>';
-			echo '<br class="clr"/>';		
-			echo '<br class="clr"/>';		
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_appendmerge_source'].'</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
+			echo '<label for="inv_import_type0">'.$lang['srv_iz_seznama'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
+			echo '<label for="inv_import_type1">'.$lang['srv_iz_excela'].'</label>';
+			echo '</div>';
+						
+			echo '</div>';
 
 			echo '<input type="hidden" name="do_merge" value="0" id="do_merge">';
 			
@@ -129,21 +144,32 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' style="display:none"').'>' ;
 			
 			// Korak 3
-			echo $lang['srv_append_step3'];
-			echo '<div class="append_step">';
+			echo '<p class="bold">'.$lang['srv_append_step3'].'</p>';
+			echo '<div class="appendmerge_indent">';
 			
 			echo $lang['srv_append_step3_note'];
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step3_note1'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note2'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note3'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note4'].'</p>';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step3_note5'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note6'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note7'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note8'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note9'].'</p>';
 			
-			echo '<span class="inv_sample" >';
-			echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">';
-			echo $lang['srv_inv_recipiens_sample1'];
-			echo '</span>';
-			echo '<br class="clr" />';
-			echo '</span>';
-			echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
-			echo implode(',',$field_lang);
-			echo '</span>';
-			echo '<br class="clr" /><textarea id="inv_recipients_list" cols="50" rows="9" name="inv_recipients_list" style="margin-bottom: 7px;">';
+			echo '<p class="top16">'.$lang['srv_append_step3_note10'].' <span id="inv_field_list" class="inv_type_0 bold">';
+			echo implode(', ',$field_lang);
+			echo '</span></p>';
+			echo '<textarea id="inv_recipients_list" name="inv_recipients_list"">';
 			if (is_array($recipients_list) && count($recipients_list) > 0 ) {
 				echo implode("\n",$recipients_list);
 			}
@@ -157,32 +183,28 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' style="display:none"').'>' ;
 						
 			// Korak 3
-			echo $lang['srv_append_step3_xls'];
-			echo '<div class="append_step">';
+			echo '<p class="bold">'.$lang['srv_append_step3_xls'].'</p>';
+
+			echo '<div class="appendmerge_indent">';
 						
-			echo $lang['srv_mailing_upload_list'];
-			echo ' <input type="file" name="recipientsFile" id="recipientsFile" />';
-			
-			echo '<br /><br />';
-			
-			echo $lang['srv_excel_upload_note'];
-			
+			echo '<p class="top16 bottom16"><input type="file" name="recipientsFile" id="recipientsFile" /></p>';
+
 			echo '</div>';
 			echo '</div>'; # id=inv_import_file
 
-			echo '<br class="clr" />';
-			echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(); return false;">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>';
-			
+			echo '<div class="button_holder bottom16">';
+			echo '<button class="medium blue" onclick="append_submit(); return false;">'.$lang['srv_append_add'].'</button>';
+			echo '</div>';
+
 			$d = new Dostop();
 			if ($d->checkDostopSub('edit')){
-				echo '<span style="margin: 5px 20px; line-height:24px">';
+				echo '<span class="red">';
 				printf($lang['src_coding_alert'], $this->anketa);
 				echo '</span>';
 			}
 						
 			echo '</form>';
 			
-			echo '<br class="clr"/>';	
 			
 			//echo '</div>'; # id=inv_import_list_container
 			
@@ -412,7 +434,9 @@ class SurveyAppendMerge {
 				else 
 					echo '<p>'.$lang['srv_append-merge_error_value'].'</p>';
 				
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" onclick="append_submit_close(); return false;"><span>'.$lang['back'].'</span></a></span>';
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['back'].'</button>';
+				echo '</div>';
 				
 			} else {
 								
@@ -423,9 +447,10 @@ class SurveyAppendMerge {
 				else
 					echo '<p>'.$lang['srv_append-merge_process_o_1'].' '.$result.' '.$lang['srv_append-merge_process_o_2'].'</p>';
 				
-				
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" onclick="append_submit_close(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(1); return false;"><span>'.$lang['srv_potrdi'].'</span></a></span>';
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['srv_cancel'].'</button>';				
+				echo '<button class="medium blue" onclick="append_submit(1); return false;">'.$lang['srv_potrdi'].'</button>';
+				echo '</div>';
 			}
 			
 		
@@ -436,9 +461,10 @@ class SurveyAppendMerge {
 			
 			echo '<p>'.$output.'</p>';
 			echo '<p>'.$lang['srv_append-merge_fin'].'</p>';
-			
-			echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'"><span>'.$lang['data_show'].'</span></a></span>';
-			
+
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'\'">'.$lang['data_show'].'</button>';
+			echo '</div>';
 		}
 		
 		if ($import_type == 1){
@@ -807,7 +833,7 @@ class SurveyAppendMerge {
 					echo $lang['srv_append_xls_note'];
 										
 					echo '<div id="inv_field_container">';
-					echo '<div class="append_step">';
+					echo '<div class="appendmerge_indent">';
 					
 					echo '<ul class="connectedSortable">';
 					foreach ($_POST['fields'] AS $spr_id)
@@ -820,27 +846,37 @@ class SurveyAppendMerge {
 						
 						
 					if (count($columns) > 0){
-						echo $lang['srv_append_xls_step1'];
+						echo '<p>'.$lang['srv_append_xls_step1'].'</p>';
 						
 						echo '<div id="inv_field_container">';
-						echo '<div class="append_step">';
+						echo '<div class="appendmerge_indent">';
 						echo '<ul class="connectedSortable">';
 						foreach ($columns AS $column){
-							echo '<li><label><input type="checkbox" name="xls_column[]" value="'.$column.'">'.$column.'</label></li>';
+							echo '<li><input type="checkbox" name="xls_column[]" id="'.$column.'" value="'.$column.'"><label for="'.$column.'">'.$column.'</label></li>';
 						}
 						echo '</ul>';
 						echo '</div>';
 						echo '</div>';
 					}
 					
+					echo $lang['srv_append_xls_step2'];
 					
-					echo $lang['srv_append_xls_step1'];
+					echo '<div class="appendmerge_indent">';
 					
-					echo '<div class="append_step">';
-					echo '<p>'.$lang['srv_append_xls_step2_begin'].': <input name="start_row" type="number" min="1" max="'.(int)$highestRow.'" value="1"></p>';
-					echo '<p>'.$lang['srv_append_xls_step2_end'].': <input name="end_row" type="number" min="1" max="'.(int)$highestRow.'" value="'.(int)$highestRow.'"></p>';
-					echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="$(\'#append_xml\').submit();">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>';
-					echo '<br /><br />';
+					echo '<div class="setting_holder">';
+					echo '<label>'.$lang['srv_append_xls_step2_begin'].'</label>';
+					echo '<input name="start_row" type="number" min="1" max="'.(int)$highestRow.'" value="1">';
+					echo '</div>';
+
+					echo '<div class="setting_holder">';
+					echo '<label>'.$lang['srv_append_xls_step2_end'].'</label>';
+					echo '<input name="end_row" type="number" min="1" max="'.(int)$highestRow.'" value="'.(int)$highestRow.'">';
+					echo '</div>';
+
+					echo '<div class="button_holder top16 bottom0">';
+					echo '<button class="medium blue" onclick="$(\'#append_xml\').submit();">'.$lang['srv_append_add'].'</button>';
+					echo '</div>';
+
 					echo '</div>';
 					
 					
@@ -991,11 +1027,12 @@ class SurveyAppendMerge {
 				
 			echo '<p>'.$output.'</p>';
 			echo '<p>'.$lang['fin_import_ok_text'].'</p>';
-				
-			echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa='.$this->anketa.'&a=data"><span>'.$lang['data_show'].'</span></a></span>';			
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data\'">'.$lang['data_show'].'</button>';
+			echo '</div>';
 		}
 		
-		echo '<br /><br />';
 		echo '</fieldset>';
 	}
 	
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index 220a25c52..8e0481264 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -358,7 +358,7 @@ class CrossRoad {
                         $layout_menu = 'menu_left';
                     }
 
-                    elseif($_GET['m'] == M_COLLECT_DATA_APPEND){
+                    elseif($_GET['m'] == M_COLLECT_DATA_APPEND || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls'){
                         $second_action = NAVI_DATA_IMPORT;  
                         $third_action = NAVI_DATA_IMPORT_APPEND;  
 
diff --git a/lang/1.php b/lang/1.php
index d4da0cc15..a8f003e9c 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2488,7 +2488,7 @@ $lang = array (
     "srv_mailing_all_with_status"	=>	"Vsem ki imajo status",
     "srv_mailing_add_help"      =>	 "<p><ul><li>V razdelku \"Spremenljivke\" izberite &#382;eljene spremenljivke. Izbrane spremenljivke bodo dodane na konec ankete kot sistemske spremenljivke.</li><li>V razdelku \"Respondenti\" dodajajte respondente po enega v vrstico.<br/>Stolpce lo&#269;ite z vejico, v enakem vrstnem redu kot so navedeni zgoraj (Spremenljivke).<br /><br />Primer:<div style=\"padding-left:30px;\">Spremenljivke: <i>email,ime</i></div><div style=\"padding-left:30px;\">Respondenti: <i>janez.novak@example.com,Janez Novak</i></div></li><br/><li>Lahko pa respondente prenesete iz tekstovne datoteke. S pomo&#269;jo spodnjega okna za prenos.</li></ul></p>",
     #"srv_mailing_set_help"      =>	 "<p>Za po&#154;iljanje e-po&#154;te mora biti dodana sistemska spremenljivka <strong>email</strong>!</p><br /><ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li><li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li><li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li><li>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul><strong>Sistemske spremenljivke, ki so na voljo:<br/></strong></p>",
-    "srv_mailing_upload_list"   =>	 "Nalo&#382;i seznam respondentov iz datoteke",
+    "srv_mailing_upload_list"   =>	 "Naloži seznam respondentov iz datoteke",
     "srv_ub_added"        		=>	 "Dodan v bazo",
     "srv_ub_addedby"        	=>	 "Dodal v bazo",
     "srv_ub_mailed"        		=>	 "Poslana e-po&#154;ta",
@@ -5950,23 +5950,35 @@ $lang = array (
 	"srv_custom_report_share_long"				=>	"Deli poročilo z drugimi uredniki ankete",
 	"srv_color"									=>	"Barva",
 	"src_coding_refresh"						=>	"Poženi novo računanje rekodiranih vrednosti", #Osveži podatke
-	"src_coding_alert"							=>	"Priporočamo, da <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a> ustvarite, preden pričnete z urejanjem.",
+	"src_coding_alert"							=>	"Opozorilo: Priporočamo, da ustvarite <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a>, preden začnete z urejanjem.",
 	"srv_coding_spr"							=>	"Prikaži izbrano spremenljivko",
 	"srv_coding_spr_1"							=>	"Prikaži vse spremenljivke",
 	"srv_coding_spr2"							=>	"Za več opcij pojdite v Napredne možnosti ter nato Spremenljivke",
 	"srv_coding_filter"							=>	"Filtriraj",
 	
-	"srv_append_note" 							=>	"<b>Dodajanje pomeni nove zapise (records)</b><br><br>Izberite polja, ki jih boste vnesli. S premikanjem lahko določite vrstni red.<br><br>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane. Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.",
-	"srv_append_note" 							=>	"<p>Uvoz odgovorov pomeni dodajanje novih zapisov (records).</p>",
-	"srv_append_step1" 							=>	"<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>",
-	"srv_append_step1_note" 					=>	"<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>",
-	"srv_append_step2" 							=>	"<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>",
-	"srv_append_step3" 							=>	"<p><b>3. korak: Vpišite ali kopirajte podatke.</b></p>",
-	"srv_append_step3_note" 					=>	"<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>",
-	"srv_append_step3_xls" 						=>	"<p><b>3. korak: Naložite podatke iz datoteke.</b></p>",
-	"srv_append_xls_note" 						=>	"<p>Pri dodajanju podatkov iz Excelove datoteke, bodo uvoženi podatki za naslednje spremenljivke <i>(ki ste jih izbrali v prejšnjem koraku)</i></p>",
-	"srv_append_xls_step1" 						=>	"<p><b>1. korak: izberite pripadajoča polja (stolpce)</b> iz Excelove datoteke h zgornjim spremenljivkam:</p>",
-	"srv_append_xls_step2" 						=>	"<p><b>2. korak: </b>vpišite številko začetne in zadnje vrstice podatkov respondentov v Excelovi datoteki</p>",
+	"srv_append_note" 							=>	"Dodajanje podatkov pomeni dodajanje odgovorov  za nove respondente, ki jih še ni v bazi podatkov vaše ankete. Dodani odgovori se shranijo v obstoječo bazo podatkov.",
+	"srv_append_step1" 							=>	"1. korak: Označite spremenljivke, ki jih boste vnesli:",
+	"srv_append_step1_notea" 					=>	"Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
+	"srv_append_step1_noteb" 					=>	"Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
+	"srv_append_step1_notec" 					=>	"Če v vprašalniku še nimate vprašanj, jih je najprej treba dodati.",
+	"srv_append_step1_noted" 					=>	"S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
+	"srv_append_step2" 							=>	"2. korak: Izberite vir podatkov, ki jih želite vnesti:",
+	"srv_append_step3" 							=>	"3. korak: Vpišite ali kopirajte podatke:",
+	"srv_append_step3_note1" 					=>	"Za vsakega respondenta vnesite podatke v svojo vrstico.",
+	"srv_append_step3_note2" 					=>	"Podatke vnesite le za tiste spremenljivke, ki ste jih označili v 1. koraku.",
+	"srv_append_step3_note3" 					=>	"Za vprašanja z enim ali več možnimi odgovori je treba vnesti vrednosti odgovorov - npr. 1, 2, 3 (in ne besedila). Do vrednosti posameznega odgovora lahko dostopate s klikom na opcijo 'Uredi vrednosti odgovorov', ki se nahaja v naprednem urejevalniku vprašanja v zavihku 'UREJANJE'- Vprašalnik.",
+	"srv_append_step3_note4" 					=>	"Če dodajate podatke za več spremenljivk, morate za vsako izmed njih:",
+	"srv_append_step3_note5" 					=>	"Podatke ločiti z vejico (,).",
+	"srv_append_step3_note6" 					=>	"Podatke vnesti v enakem vrstnem redu (od leve proti desni), kot so spremenljivke prikazane v 1. koraku.",
+	"srv_append_step3_note7" 					=>	"Primer - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njun elektronski naslov in ime:",
+	"srv_append_step3_note8" 					=>	"janez.novak@example.com,Janez",
+	"srv_append_step3_note9" 					=>	"janja.novak@example.com,Janja",
+	"srv_append_step3_note10" 					=>	"Podatke vnesite v tem vrstnem redu:",
+	"srv_append_add" 							=>	"Dodaj podatke",
+	"srv_append_step3_xls" 						=>	"3. korak: Naložite podatke iz datoteke:",
+	"srv_append_xls_note" 						=>	"Pri dodajanju podatkov iz Excelove datoteke bodo uvoženi podatki za naslednje spremenljivke (izbrali ste jih v prejšnjem koraku):",
+	"srv_append_xls_step1" 						=>	"<span class=\"bold\">1. korak: izberite stolpce iz Excelove datoteke</span>, v katerih se nahajajo podatki za izbrane spremenljivke:",
+	"srv_append_xls_step2" 						=>	"<span class=\"bold\">2. korak: izberite vrstice iz Excelove datoteke</span>, v katerih se nahajajo podatki:",
 	"srv_append_xls_step2_begin" 				=>	"Številka začetne vrstice",
 	"srv_append_xls_step2_end" 					=>	"Številka zadnje vrstice",
     
@@ -6534,8 +6546,9 @@ $lang = array (
 	'srv_privacy_text_1'						=>	'S klikom na Naslednja stran se strinjate z našo <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_privacy_text_2'						=>	'Strinjam se s <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_comment_splosen'						=>	'Splošen komentar',
-	'srv_iz_seznama'							=>	'Iz seznama (ločeno z vejico)',
-	'srv_iz_excela'								=>	'Iz Excelove datoteke (v formatu .xls)',
+	'srv_appendmerge_source'					=>	'Vir podatkov - podatke bom:',
+	'srv_iz_seznama'							=>	'Vnesel iz seznama (ločeno z vejico)',
+	'srv_iz_excela'								=>	'Uvozil iz Excelove datoteke (v formatu .xls)',
 	'srv_iz_excela_xls_error'					=>	'Napačen format datoteke! Datoteka mora biti v formatu .xls.',
 	'srv_izberite_identifikator'				=>	'Izberite polje po katerem želite izvesti združevanje (identifikator):',
 	'srv_show'									=>	'Prikaži',
diff --git a/lang/2.php b/lang/2.php
index 3baaa7a9e..b6fb58c4e 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5848,23 +5848,35 @@ $lang = array (
 	"srv_custom_report_share_long"				=>	"Share report with other editors",
 	"src_coding_refresh"						=>	"Run compute for all recoded variables", #Refresh data",
 	"srv_color"									=>	"Color",
-	"src_coding_alert"							=>	"We recommend you create a <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">data backup</a> before editing.",
+	"src_coding_alert"							=>	"Warning: We recommend that you create <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">an archive of the data</a> before you start editing.",
 	"srv_coding_spr"							=>	"Show variable",
 	"srv_coding_spr_1"							=>	"Show all variables",
 	"srv_coding_spr2"							=>	"For more options go to Advanced options and Variables",
 	"srv_coding_filter"							=>	"Filter",	
     
-    'srv_append_note' 							=>	"<b>Adding data means new records</b><br><br>Select fields, which you would like to add and determine their order.<br /><br />You can add text and numeric types of variables, questions with one or more answers - all currently existing variables are also displayed below. Other types of questions cannot yet be included. You can add additional variables in the editor.",
-	"srv_append_note" 							=>	"<p>Adding data means new records.</p>",
-	"srv_append_step1" 							=>	"<p><b>1. step: Define fields (variables) you would like to add.</b></p>",
-	"srv_append_step1_note" 					=>	"<p>You can determine their order by moving them.</p><p>If there are no questions in your survey, you will need to pre-enter them.</p><p>You can add text and numeric types of variables, questions with one or more answers - all currently existing variables are also displayed below.<br />Other types of questions cannot yet be included. You can add additional variables in the editor.</p>",
-	"srv_append_step2" 							=>	"<p><b>2. step: Select the data source you want to enter:</b></p>",
-	"srv_append_step3" 							=>	"<p><b>3. step: Enter or copy the data.</b></p>",
-	"srv_append_step3_note" 					=>	"<p>Enter the data in text form; add each record in a new row.<br />If you import additional fields, separate them by a comma and add them in the same order as above.</p>",
-	"srv_append_step3_xls" 						=>	"<p><b>3. step: Load data from a file.</b></p>",	
-	"srv_append_xls_note" 						=>	"<p>When adding the data from the excel file, data for the following variables <i>(which you selected in the previous step)</i> will be imported</p>",
-	"srv_append_xls_step1" 						=>	"<p><b>1. step: Select the corresponding fields (columns)</b> from the Excel file to the above variables:</p>",
-	"srv_append_xls_step2" 						=>	"<p><b>2. step: </b>Enter the number of initial and last row of respondent data in Excel file.</p>",
+	"srv_append_note" 							=>	"Adding data means adding responses for new respondents that are not yet in your survey database. The added responses are saved in the existing database.",
+	"srv_append_step1" 							=>	"<Step 1: Check the variables to be entered:",
+	"srv_append_step1_notea" 					=>	"The names of the existing variables in your questionnaire are listed below.",
+	"srv_append_step1_noteb" 					=>	"Adding data is only possible for variables of text and numeric types and for single-choice and multiple-choice questions.",
+	"srv_append_step1_notec" 					=>	"If you do not have any questions in the questionnaire, you will need to add them first.",
+	"srv_append_step1_noted" 					=>	"By moving the variables, you can change the order (from left to right) in which you enter the data.",
+	"srv_append_step2" 							=>	"Step 2: Select the data source you want to enter:",
+	"srv_append_step3" 							=>	"Step 3: Enter or copy the data:",
+	"srv_append_step3_note1" 					=>	"For each respondent, enter the data in their own row.",
+	"srv_append_step3_note2" 					=>	"Enter data only for the variables you checked in step 1.",
+	"srv_append_step3_note3" 					=>	"For questions with one or more possible answers, the answer values - e.g. 1, 2, 3 (not the text) - should be entered. You can access the values for each answer by clicking on the 'Edit answer values' option, which is located in the advanced question editor under the 'EDIT'- Questionnaire tab.",
+	"srv_append_step3_note4" 					=>	"If you are adding data for more than one variable, then for each variable, you must:",
+	"srv_append_step3_note5" 					=>	"Separate data with a comma (,).",
+	"srv_append_step3_note6" 					=>	"Enter the data in the same order (left to right) as the variables shown in step 1.",
+	"srv_append_step3_note7" 					=>	"Example - data entry for if you want to enter the email address and name of two respondents:",
+	"srv_append_step3_note8" 					=>	"john.smith@example.com,John",
+	"srv_append_step3_note9" 					=>	"jane.smith@example.com,Jane",
+	"srv_append_step3_note10" 					=>	"Enter data in this order:",
+	"srv_append_add" 							=>	"Add data",
+	"srv_append_step3_xls" 						=>	"Step 3: Load data from a file:",	
+	"srv_append_xls_note" 						=>	"When adding the data from the Excel file, data for the following variables (which you selected in the previous step) will be imported:",
+	"srv_append_xls_step1" 						=>	"<span class=\"bold\">Step 1: Select the columns from the Excel file</span> that contain the data for the selected variables:",
+	"srv_append_xls_step2" 						=>	"<span class=\"bold\">Step 2: Select the rows from the Excel file</span> that contain the data:",
 	"srv_append_xls_step2_begin" 				=>	"Number of initial row",
 	"srv_append_xls_step2_end" 					=>	"Number of last row",
     
@@ -6421,8 +6433,9 @@ $lang = array (
 	'srv_privacy_text_1'						=>	'By clicking on Next page you agree with our <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Privacy policy</a>.',
 	'srv_privacy_text_2'						=>	'I agree with the <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Privacy policy</a>.',
 	'srv_comment_splosen'						=>	'Basic comment',
-	'srv_iz_seznama'							=>	'From a list (separated by a comma)',
-	'srv_iz_excela'								=>	'From an Excel file (.xls format)',
+	'srv_appendmerge_source'					=>	'Data source - I will enter the data from:',
+	'srv_iz_seznama'							=>	'A list (separated by a comma)',
+	'srv_iz_excela'								=>	'An Excel file (.xls format)',
 	'srv_iz_excela_xls_error'					=>	'Wrong file type! XLS file type is required.',
 	'srv_izberite_identifikator'				=>	'Select identifier:',
 	'srv_show'									=>	'Show',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 0f04aa644..46f59e831 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -15053,6 +15053,78 @@ fieldset#calculations div.button_holder {
   margin-bottom: 0;
 }
 
+div.appendmerge_indent {
+  margin: 16px 0 16px 16px;
+}
+div.appendmerge_indent textarea {
+  width: 100%;
+}
+div.appendmerge_indent ul {
+  padding: 0;
+  margin: 0;
+  list-style-position: inside;
+}
+div.appendmerge_indent div.setting_holder input[type=number] {
+  border: 1px solid #C4C4C4;
+  box-sizing: border-box;
+  border-radius: 2px;
+  width: 100px;
+  margin-top: 4px;
+  height: 40px;
+  font-size: 16px;
+  padding: 9px 7px;
+  font-family: Source Sans Pro, sans-serif;
+}
+div.appendmerge_indent div.setting_holder input[type=number]:focus {
+  outline-style: none;
+  box-shadow: none;
+  border-color: transparent;
+  border-color: #1E88E5;
+}
+
+#inv_field_container {
+  display: block !important;
+  margin: 24px 0;
+  padding: 0px !important;
+  clear: both;
+  font-size: 11px;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  -ms-user-select: none;
+}
+#inv_field_container ul {
+  display: flex !important;
+  flex-wrap: wrap;
+  margin: 0px !important;
+  padding: 0px !important;
+  clear: both;
+  list-style-type: none;
+  font-size: 11px;
+  border: #E5E5E5;
+}
+#inv_field_container ul li {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  height: 44px;
+  width: 22%;
+  min-width: 200px;
+  box-sizing: border-box;
+  padding: 12px 16px;
+  margin: 8px;
+  text-align: left;
+  vertical-align: middle;
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+}
+#inv_field_container ul li label {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0;
+  line-height: 30px;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/pages/survey_data/append_merge.scss b/resources/sass/admin_new/pages/survey_data/append_merge.scss
new file mode 100644
index 000000000..e01e3c09a
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_data/append_merge.scss
@@ -0,0 +1,95 @@
+div.appendmerge_indent{
+	margin: 16px 0 16px 16px;
+
+	textarea {
+		width: 100%;
+	}
+
+	ul {
+		padding: 0;
+		margin: 0;
+		list-style-position: inside;
+	}
+
+	div.setting_holder {
+		
+		input[type="number"] {
+			border: 1px solid $dark-gray;
+			box-sizing: border-box;
+			border-radius: 2px;
+			width: 100px;
+			margin-top: 4px;
+
+			height: 40px;
+            font-size: 16px;
+            padding: 9px 7px;
+
+			font-family: $font_family;
+
+			&:focus {
+				outline-style: none;
+				box-shadow: none;
+				border-color: transparent;
+				border-color: $blue;
+			}
+		}
+	}
+}
+
+#inv_field_container {
+
+    display: block !important;
+	margin: 24px 0;
+	padding: 0px !important;
+	clear: both;
+    
+    font-size: 11px;
+	
+    -moz-user-select: none;
+	-webkit-user-select: none;
+	user-select: none;
+	-ms-user-select: none;
+	
+    ul {
+        display: flex !important;
+        flex-wrap: wrap;
+
+		margin: 0px !important;
+		padding: 0px !important;
+		clear: both;
+
+		list-style-type: none;
+		font-size: 11px;
+		
+        border: $gray;
+        
+		li {
+            display: flex;
+            align-items: center;
+			cursor: pointer;
+			height: 44px;
+			width: 22%;
+            min-width: 200px;
+            
+            box-sizing: border-box;
+			padding: 12px 16px;
+			margin: 8px;
+
+			text-align: left;
+			vertical-align: middle;
+
+            background-color: $light-gray;
+
+			border: 1px solid $gray;
+
+            label{
+                width: 100%;
+                box-sizing: border-box;
+
+                padding: 0;
+                line-height: 30px;
+            }
+		}
+    }
+	
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_data/calculations.scss b/resources/sass/admin_new/pages/survey_data/calculations.scss
new file mode 100644
index 000000000..478dec140
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_data/calculations.scss
@@ -0,0 +1,18 @@
+fieldset#calculations {
+    div.icon_holder {
+        margin-bottom: 16px;
+
+        span.faicon {
+            &:first-of-type {
+                margin-left: 32px;
+            }
+            margin-right: 20px;
+            margin-left: 0;
+        }
+    }
+
+    div.button_holder {
+        margin-top: 16px;
+        margin-bottom: 0;
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_data/popups/calculations.scss b/resources/sass/admin_new/pages/survey_data/popups/calculations.scss
new file mode 100644
index 000000000..96e4c8372
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_data/popups/calculations.scss
@@ -0,0 +1,9 @@
+//Wrapper za polja drug ob drugem horizontalno
+.setting_horizontal_wrapper {
+    display: flex;
+    flex-direction: row;
+
+    .setting_holder {
+        margin-right: 32px;
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_data/popups/popups.scss b/resources/sass/admin_new/pages/survey_data/popups/popups.scss
index 80813ea9c..446e8280d 100644
--- a/resources/sass/admin_new/pages/survey_data/popups/popups.scss
+++ b/resources/sass/admin_new/pages/survey_data/popups/popups.scss
@@ -1,2 +1,3 @@
 
 @import "data_setting";
+@import "calculations";
diff --git a/resources/sass/admin_new/pages/survey_data/survey_data.scss b/resources/sass/admin_new/pages/survey_data/survey_data.scss
index 5ffcf79bd..1d5513116 100644
--- a/resources/sass/admin_new/pages/survey_data/survey_data.scss
+++ b/resources/sass/admin_new/pages/survey_data/survey_data.scss
@@ -4,5 +4,7 @@
 @import "data_layout";
 @import "data_table_settings";
 @import "data_table";
+@import "calculations";
+@import "append_merge";
 
 @import "popups/popups";