浏览代码

code has theme bug +

alexgl 13 年之前
父节点
当前提交
3409f356ff

+ 39 - 23
base/tripal_views_setup/includes/tripal_views_setup.admin.inc

@@ -22,41 +22,61 @@ function tripal_views_setup_admin_form(){
 	}
 
 	dpm($records, 'records');
+	
+	$record_fields = array('setup_id', 'mview_id', 'base_table_name', 'name', 'description');
 
-		// dpm($record, 'record' . (string)$int_i);
-// 		
-		// $item_name = 'tripal_views_setup_config_query_record_' . (string)$int_i;
-// 		
-		// $form[$item_name] = array(
-			// '#type' => 'checkbox',
-			// '#title' => t($record->name),
-			// '#description' => t('Search of mview ' . $record->mview_id . ' and ' . $record->base_table_name),
-			// '#required' => TRUE,
-		// );
-// 		
-	 	// $int_i++;	
-	// }
+	$form = tripal_helper_form_createformdata($form, $records, $record_fields);
+	
+	
+	
+	$form['submit'] = array(
+		'#type' => 'submit',
+		'#value' => t('Remove'),
+	);
 	
-	$form['featured'] = array(
-		'#type' => 'checkboxes',
-		'#options' => $options,
-		'#default_value' => $status,
+	$form['cancel'] = array(
+		'#type' => 'markup',
+		'#value' => l(t('Cancel'), 'admin/tripal/'),
 	);
 	
+	
 	dpm($form, 'admin_form');
 	return $form;
 	//return system_settings_form($form);
 }
 
 
-function tripal_views_setup_form_submit($form_id, $form){
+function tripal_views_setup_admin_form_submit($form_id, $form){
 	$form_values = $form['values'];
-	$featured = $form_values['featured'];
+	dpm($form, 'submitted form');
+	dpm($form_values, 'submitted form values');
+	$featured = $form_values['row_checkboxes'];
+	$selected_checkbox = array();
+	
+	foreach($featured as $key => $value){
+		if($value){
+			$selected_checkbox[] = "'$value'";
+		}
+	}
 	
+	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;");
+		
+	}
 	
 }
 
 
+
+
+
+
+
 function tripal_views_setup_new_search_form(){
 	$form = array();
 	
@@ -80,7 +100,3 @@ function tripal_views_setup_btable_list(){
 
 	return $options;
 }
-
-
-
-

+ 4 - 3
base/tripal_views_setup/tripal_views_setup.module

@@ -50,7 +50,8 @@ function tripal_views_setup_theme(){
 	return $theme;
 }
 
-
-function theme_tripal_views_setup_form($form){
-	// return tripal_helper_form_themeform($form, array('name', 'setup_id', 'mview_id', 'base_table_name', 'description'));
+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');
+	return $output;
 }

+ 47 - 11
tripal_helpers/tripal_helper_form/tripal_helper_form.module

@@ -8,44 +8,80 @@
  * to be run as a regular function, within a module's theme function implementation
  */
 
-function tripal_helper_form_themeform(&$form, $field_keys){
+function tripal_helper_form_themeform($form, $field_keys){
 	$rows = array();
 	foreach (element_children($form) as $key) {
 		$row = array();
 		if (isset($form[$key]['name'])) {
  
-			$status = drupal_render($form['featured'][$key]);
+			$status = drupal_render($form['row_checkboxes'][$key]);
 			$row[] = array(’data’ => $status, ‘class’ => ‘checkbox’);
  
  			$bool_first = TRUE;
  			foreach ($field_keys as $field_key => $value) {
 				if($bool_first){
-					$row[] = ‘‘. drupal_render($form[$key][$field_keys[$field_key]]) .’‘;//for "bold style"
+					$row[] = ‘‘. drupal_render($form[$key][$value]) .’‘;//for "bold style"
 					$bool_first = FALSE;
 				}
 				else{
-					$row[] = array(’data’ => drupal_render($form[$key][$field_keys[$field_key]]),);
+					$row[] = array(’data’ => drupal_render($form[$key][$value]),);
 				}
 			}
  
 			$rows[] = $row;
 		}
 	}
- 
+
 	// Individual table headers.
 	$header = array();
-	$header[] = array(’data’ => t(’Featured’), ‘class’ => ‘checkbox’);
+	$header[] = array(’data’ => t(’Select’), ‘class’ => ‘checkbox’);
 	
 	foreach ($field_keys as $key => $value) {
-		$header[] = t($key);
+		$header[] = t("'$value'");
 	}
  
 	$output = theme(’table’, $header, $rows);
 	$output .= drupal_render($form);
+	dpm($output, 'formoutput');
 	return $output;
 }
 
-// function tripal_helper_form_createformdata
-
-
-
+function tripal_helper_form_createformdata($form, $query_results, $data_array){
+	dpm($form, 'createform');
+	dpm($query_results, 'createqeuryresults');
+	dpm($data_array, 'createarray');
+	
+	// $status = array();
+	$options = array();
+	
+	foreach ($query_results as $qr_key => $qr_value) {
+		$options[$qr_key] = '';
+		
+		foreach ($data_array as $da_key => $da_value) {
+			dpm($qr_value->$da_value, '$da_value');
+			$form[$qr_key][$da_value] = array('#value' => $qr_value->$da_value);
+			
+		}
+		// $status[] = '-1';
+	}
+	
+	$form['row_checkboxes'] = array(
+		'#type' => 'checkboxes',
+		'#options' => $options,
+		// '#default_value' => $status,
+	);
+	
+	// $form['submit'] = array(
+		// '#type' => 'submit',
+		// '#value' => t('Remove'),
+	// );
+// 	
+	// $form['cancel'] = array(
+		// '#type' => 'markup',
+		// '#value' => l(t('Cancel'), 'dashboard'),
+	// );
+	
+	
+	
+	return $form;
+}