Merge pull request #70 from flipside-org/feature/42_respondents

Fix 42. Respondents import.
flipside-org · Mar 31, 2014 · 714a79e · 714a79e
2 parents fd721c7 + 518571d
commit 714a79e
Show file tree

Hide file tree

Showing 14 changed files with 836 additions and 212 deletions.
diff --git a/application/config/config.php b/application/config/config.php
@@ -382,5 +382,7 @@
 // Keep call tasks assigned for 3 days.
 $config['aw_enketo_call_tasks_reserve_exprire'] = 86400 * 3;
 
+$config['aw_respondents_per_page'] = 50;
+
 /* End of file config.php */
 /* Location: ./application/config/config.php */
diff --git a/application/config/mimes.php b/application/config/mimes.php
@@ -10,7 +10,7 @@
 
 $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'cpt'	=>	'application/mac-compactpro',
-				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'),
 				'bin'	=>	'application/macbinary',
 				'dms'	=>	'application/octet-stream',
 				'lha'	=>	'application/octet-stream',

diff --git a/application/config/permissions.php b/application/config/permissions.php
@@ -54,6 +54,7 @@
   'delete any survey'         => array(ROLE_ADMINISTRATOR, ROLE_MODERATOR),
   'download survey files'     => array(ROLE_ADMINISTRATOR, ROLE_MODERATOR, ROLE_CC_AGENT),
   'assign agents'             => array(ROLE_ADMINISTRATOR, ROLE_MODERATOR),
+  'manage respondents any survey' => array(ROLE_ADMINISTRATOR, ROLE_MODERATOR),
 
   // Although this permission exists should no be used.
   // It allows non assigned users to collect data which should not happen.

diff --git a/application/config/routes.php b/application/config/routes.php
@@ -50,6 +50,11 @@
 $route['survey/delete'] = 'survey/survey_delete_by_id';
 $route['survey/(:num)/files/(xls|xml)'] = 'survey/survey_file_download/$1/$2';
 $route['survey/(:num)/(testrun|data_collection)'] = 'survey/survey_enketo/$1/$2';
+// respondents
+$route['survey/(:num)/respondents/(:num)'] = 'survey/survey_respondents/$1/$2';
+$route['survey/(:num)/respondents'] = 'survey/survey_respondents/$1';
+$route['survey/(:num)/respondents/add'] = 'survey/survey_respondents_add/$1';
+$route['survey/(:num)/respondents/add/confirm'] = 'survey/survey_respondents_add_confirm/$1';
 
 $route['survey/(:num)/xslt_transform'] = 'survey/survey_xslt_transform/$1';
 
@@ -77,4 +82,4 @@
 $route['user/add'] = 'user/user_add';
 
 /* End of file routes.php */
-/* Location: ./application/config/routes.php */
+/* Location: ./application/config/routes.php */