1 files changed, 46 insertions, 10 deletions

diff --git a/admin/survey/definition.php b/admin/survey/definition.php
index db3951f..9cfa1ef 100644
--- a/admin/survey/definition.php
+++ b/admin/survey/definition.php
@@ -22,18 +22,27 @@
     define("NAVI_TESTIRANJE_PREDVIDENI", "NAVI_TESTIRANJE_PREDVIDENI");

     define("NAVI_TESTIRANJE_CAS", "NAVI_TESTIRANJE_CAS");

     define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI");

-    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY");

-    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD");

+    define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA");

+

     define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING");

     define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA");

     define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA");

     define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT");

     define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE");

-    define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA");

     define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE");

+    define("NAVI_UREJANJE_ARHIVI", "NAVI_UREJANJE_ARHIVI");

+    define("NAVI_UREJANJE_ARHIVI_TRACKING1", "NAVI_UREJANJE_ARHIVI_TRACKING1");

+    define("NAVI_UREJANJE_ARHIVI_TRACKING2", "NAVI_UREJANJE_ARHIVI_TRACKING2");

+    define("NAVI_UREJANJE_ARHIVI_TRACKING3", "NAVI_UREJANJE_ARHIVI_TRACKING3");

+    define("NAVI_UREJANJE_ARHIVI_EXPORT1", "NAVI_UREJANJE_ARHIVI_EXPORT1");

+    define("NAVI_UREJANJE_ARHIVI_EXPORT2", "NAVI_UREJANJE_ARHIVI_EXPORT2");

+

     define("NAVI_OBJAVA", "NAVI_OBJAVA");

+    define("NAVI_OBJAVA_SETTINGS", "NAVI_OBJAVA_SETTINGS");

+    define("NAVI_OBJAVA_URL", "NAVI_OBJAVA_URL");

+

+    

     define("NAVI_ANALYSIS", "NAVI_ANALYSIS");

-    define("NAVI_RESULTS", "NAVI_RESULTS");

     define("NAVI_ADVANCED", "NAVI_ADVANCED");

     define("NAVI_UPORABNOST", "NAVI_UPORABNOST");

     define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN");

@@ -48,9 +57,28 @@
     define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS");

     define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS");

     define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES");

+

+    define("NAVI_ARHIVI", "NAVI_ARHIVI");

+

+    define("NAVI_RESULTS", "NAVI_RESULTS");

     define("NAVI_DATA", "NAVI_DATA");

-    define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT");

 

+    define("NAVI_DATA_CALC", "NAVI_DATA_CALC");

+    define("NAVI_DATA_CALC_CALCULATION", "NAVI_DATA_CALC_CALCULATION");

+    define("NAVI_DATA_CALC_CODING", "NAVI_DATA_CALC_CODING");

+    define("NAVI_DATA_CALC_CODING_AUTO", "NAVI_DATA_CALC_CODING_AUTO");

+    define("NAVI_DATA_CALC_RECODING", "NAVI_DATA_CALC_RECODING");

+

+    define("NAVI_DATA_IMPORT", "NAVI_DATA_IMPORT");

+    define("NAVI_DATA_IMPORT_APPEND", "NAVI_DATA_IMPORT_APPEND");

+    define("NAVI_DATA_IMPORT_MERGE", "NAVI_DATA_IMPORT_MERGE");

+

+    define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT");

+    define("NAVI_DATA_EXPORT_EXCEL", "NAVI_DATA_EXPORT_EXCEL");

+    define("NAVI_DATA_EXPORT_EXCEL_XLS", "NAVI_DATA_EXPORT_EXCEL_XLS");

+    define("NAVI_DATA_EXPORT_SAV", "NAVI_DATA_EXPORT_SAV");

+    define("NAVI_DATA_EXPORT_TXT", "NAVI_DATA_EXPORT_TXT");

+    define("NAVI_DATA_EXPORT_SPSS", "NAVI_DATA_EXPORT_SPSS");

 

 	# Dashboard - status - report

 	define("A_REPORTI", "reporti");

@@ -66,6 +94,7 @@
 	define("A_REMINDER_TRACKING", "reminder_tracking");

 	define("A_REMINDER_TRACKING_RECNUM", "recnum");

 	define("A_REMINDER_TRACKING_VAR", "vars");

+	define("A_STATUS_ADVANCED", "status_advanced");

 

 	#urejanje

 	define("A_BRANCHING", "branching");

@@ -90,6 +119,7 @@
 

 	# objava

 	define('A_VABILA', 'vabila');

+	define('A_OTHER_INV', 'other_inv');

 	define('A_EMAIL', 'email');

 	define('A_INVITATIONS', 'invitations');

 	define('M_INVITATIONS_STATUS', 'inv_status');

@@ -105,6 +135,9 @@
 	# PANEL

 	define('A_PANEL', 'panel');

 

+	# EMAIL ACCESS

+	define('A_EMAIL_ACCESS', 'email_access');

+

 	# FIELDWORK (tablice, notebooki)

 	define('A_FIELDWORK', 'fieldwork');

         

@@ -165,10 +198,13 @@
 	define('M_COLLECT_DATA_PRINT', 'print');

 	define('M_COLLECT_DATA_CALCULATION', 'calculation');

 	define('M_COLLECT_DATA_CODING', 'coding');

+	define('M_COLLECT_DATA_CODING_AUTO', 'coding_auto');

 	define('M_COLLECT_DATA_RECODING', 'recoding');

 	define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard');

 	define('A_COLLECT_DATA_EXPORT', 'export');

 	define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF');

+    define('M_COLLECT_DATA_APPEND', 'append');

+    define('M_COLLECT_DATA_MERGE', 'merge');

 	define('M_EXPORT_EXCEL', 'excel');

 	define('M_EXPORT_EXCEL_XLS', 'excel_xls');

 	define('M_EXPORT_SPSS', 'spss');

@@ -187,6 +223,7 @@
 	define('A_SOCIAL_NETWORK', 'social_network');

 	define('A_SLIDESHOW', 'slideshow');

 	define('A_ADVANCED_PARADATA', 'advanced_paradata');

+	define('A_ADVANCED_TIMESTAMPS', 'advanced_timestamps');

 	define('A_JSON_SURVEY_EXPORT', 'json_survey_export');

 

 

@@ -212,13 +249,12 @@
 	define('A_FORMA', 'forma');	# urejanje ankete - manjkajoče vrednosti

 	define('A_METADATA', 'metadata');	# urejanje ankete - prikaz metapodatkov

 	define('A_MOBILESETTINGS', 'mobile_settings');	# urejanje ankete - nastavitve prikaza pri mobitelih

+	define('A_TABLESETTINGS', 'table_settings');	# urejanje ankete - nastavitve prikaza tabel

 	define('A_PRIKAZ', 'prikaz');	# prikaz podatkov in analiz

 	define('A_MAILING', 'advanced_email');	# nastavitve email strežnika

 	define('A_SKUPINE', 'skupine');	# skupine

 	define('A_EXPORTSETTINGS', 'export_settings');	# nastavitve pdf/rtf izvozov

 	define('A_GDPR', 'gdpr_settings');	# GDPR nastavitve posamezne ankete

-    define('A_LANGUAGE_TECHNOLOGY', 'language_technology');    # skupine

-	define('A_LANGUAGE_TECHNOLOGY_OLD', 'language_technology_old');	# skupine

 

 	##### NAVIGACIJA ####

 

@@ -258,9 +294,9 @@
 	# - time insered (unix) (7)

 	# - record_number (8)

 	define('USER_ID_FIELD', '$1');

-	define('RELEVANCE_FIELD', '$2');

-	define('EMAIL_FIELD', '$3');

-	define('STATUS_FIELD', '$4');

+	define('STATUS_FIELD', '$2');

+	define('RELEVANCE_FIELD', '$3');

+	define('EMAIL_FIELD', '$4');

 	define('LURKER_FIELD', '$5');

 	define('TIME_FIELD', '$6');

 	define('MOD_REC_FIELD', '$7');