alexgl 13 жил өмнө
parent
commit
10502b8adb

+ 53 - 18
base/tripal_views_setup/includes/tripal_views_setup.admin.inc

@@ -11,22 +11,46 @@
 
 function tripal_views_setup_admin_form(){
 	
-	$query_resulst = db_query('SELECT * FROM public.tripal_views_setup;');
+	// $query_results = db_query('SELECT * FROM public.tripal_views_setup;');
+	$result = db_query('SELECT * FROM public.tripal_views_setup;');
 	
 	$form = array();
 	$int_i = 0;
 	
-	$records = array();
-	while($record = db_fetch_object($query_resulst)){
-		$records[] = $record;
-	}
-
-	dpm($records, 'records');
+		
+	//set limit for pager]
+	$limit = 20;
+  //define table header
+  $header = array(
+    '', //note empty value, will use this later
+    array('data' => t('Setup ID'), 'field' => 'setup_id', 'sort' => 'asc'),
+    array('data' => t('MView ID'), 'field' => 'mview_id'),
+    array('data' => t('Base Table Name'), 'field' => 'base_table_name'),
+  );
 	
-	$record_fields = array('setup_id', 'mview_id', 'base_table_name', 'name', 'description');
-
-	$form = tripal_helper_form_createformdata($form, $records, $record_fields);
+	//allows sorting
+	$tablesort = tablesort_sql($header);
+	//add pager to results
+	// $result = pager_query($query_results,$limit, $tablesort);
 	
+	while ($item = db_fetch_object($result)){
+		//add row key
+		$checkboxes[$item->setup_id] = '';
+		$form['setup_id'][$item->setup_id] = array(
+			'#value' => $item->setup_id,
+		);
+		$form['mview_id'][$item->mview_id] = array(
+			'#value' => $item->mview_id,
+		);
+		
+		$form['base_table_name'][$item->setup_id] = array(
+			'#value' => $item->base_table_name,
+		);
+		
+	}
+
+	$form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
+	$form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));	
 	
 	
 	$form['submit'] = array(
@@ -36,7 +60,12 @@ function tripal_views_setup_admin_form(){
 	
 	$form['cancel'] = array(
 		'#type' => 'markup',
-		'#value' => l(t('Cancel'), 'admin/tripal/'),
+		'#value' => l(t('Cancel '), 'admin/tripal/'),
+	);
+	
+	$form['new'] = array(
+		'#type' => 'markup',
+		'#value' => l(t(' New'), 'admin/tripal/tripal_views_setup_new'),
 	);
 	
 	
@@ -61,13 +90,13 @@ function tripal_views_setup_admin_form_submit($form_id, $form){
 	
 	dpm($selected_checkbox, 'selected');
 	
-	foreach ($selected_checkbox as $key => $value) {
-		
-		dpm((string)$value, 'delete value');
-		dpm("DELETE FROM public.tripal_views_setup WHERE setup_id = $value;", 'delete stuff');
-		db_query("DELETE FROM public.tripal_views_setup WHERE setup_id = $value;");
-		
-	}
+	// foreach ($selected_checkbox as $key => $value) {
+// 		
+		// dpm((string)$value, 'delete value');
+		// dpm("DELETE FROM public.tripal_views_setup WHERE setup_id = $value;", 'delete stuff');
+		// db_query("DELETE FROM public.tripal_views_setup WHERE setup_id = $value;");
+// 		
+	// }
 	
 }
 
@@ -80,6 +109,12 @@ function tripal_views_setup_admin_form_submit($form_id, $form){
 function tripal_views_setup_new_search_form(){
 	$form = array();
 	
+	$form['q1'] = array(
+		'#type' => 'select',
+		'#options' => tripal_views_setup_mview_list(),
+		
+	);
+	
 	return $form;
 }
 

+ 33 - 17
base/tripal_views_setup/tripal_views_setup.module

@@ -16,7 +16,7 @@ function tripal_views_setup_menu(){
 	);
 	
 	//page to actually create searche->mview->chado table relationships
- 	$items['admin/tripal/tripal_views_setup/new'] = array(
+ 	$items['admin/tripal/tripal_views_setup_new'] = array(
 		 'title' => 'Create New Views Setup',
      'page callback' => 'drupal_get_form',
      'page arguments' => array('tripal_views_setup_new_search_form'),
@@ -27,19 +27,6 @@ function tripal_views_setup_menu(){
 	return $items;
 }
 
-
-/* this needs to go into the function tripal_views_setup_block()
- $limitnum = variable_get("onthisdate_maxdisp", 3);
-
-$query = "SELECT nid, title, created FROM " .
-"{node} WHERE created >= %d " .
-"AND created <= %d";
-
-$query_result = db_query_range($query, $start_time, $end_time, 0, $limitnum);
-*/
-
-//TODO: validation for the admin pages
-
 function tripal_views_setup_theme(){
 	$theme = array();
 	
@@ -47,11 +34,40 @@ function tripal_views_setup_theme(){
 		'arguments' => array('form' => NULL,),
 	);
 	
+	$theme['tripal_views_setup_admin_form'] = array(
+		'arguments' => array(),
+	);
+	
 	return $theme;
 }
 
-function tripal_views_setup_admin_form_theme($form){
-	$output = tripal_helper_form_themeform($form, array('name', 'setup_id', 'mview_id', 'base_table_name', 'description'));
-	dpm($output, 'theme output');
+
+function theme_tripal_views_setup_admin_form($form){
+	$header = array(
+		theme('table_select_header_cell'),//using previously empty field
+		array('data' => t('Setup ID'), 'field' => 'setup_id', 'sort' => 'asc'),
+    array('data' => t('MView ID'), 'field' => 'mview_id'),
+    array('data' => t('Base Table Name'), 'field' => 'base_table_name'),
+  );
+	
+	if(!empty($form['checkboses']['#options'])) {
+		foreach (element_children($form['uid']) as $key) {
+			$rows[] = array(
+				drupal_render($form['checkboxes'][$key]),
+				drupal_render($form['setup_id'][$key]),
+				drupal_render($form['mview_id'][$key]),
+				drupal_render($form['base_table_name'][$key]),
+			);
+		}
+	}
+	else {
+		$row[] = array(array('data' => '<div class="error">click link above to add entries</div>', 'colspan' => 4));
+	}
+	
+	$output .= theme('table', $header, $rows);
+	
+	$output .= drupal_render($form);
 	return $output;
+	
 }
+