|
@@ -56,9 +56,11 @@ function tripal_views_setup_admin_form_submit($form, &$form_state){
|
|
db_query("DELETE FROM public.tripal_mviews_join WHERE setup_id = $value;");
|
|
db_query("DELETE FROM public.tripal_mviews_join WHERE setup_id = $value;");
|
|
}
|
|
}
|
|
|
|
|
|
-function tripal_views_setup_new_search_form(){
|
|
|
|
|
|
+function tripal_views_setup_new_search_form($form_state){
|
|
$form = array();
|
|
$form = array();
|
|
|
|
|
|
|
|
+ $form['#cache'] = TRUE;
|
|
|
|
+
|
|
$form['row_name'] = array(
|
|
$form['row_name'] = array(
|
|
'#title' => t('Name'),
|
|
'#title' => t('Name'),
|
|
'#type' => 'textfield',
|
|
'#type' => 'textfield',
|
|
@@ -77,20 +79,32 @@ function tripal_views_setup_new_search_form(){
|
|
'#required' => TRUE,
|
|
'#required' => TRUE,
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+ $mview_query = db_query("SELECT name FROM {tripal_mviews} ORDER BY name;");
|
|
|
|
+ $mview_options = array();
|
|
|
|
+ while ($mview_option = db_fetch_array($mview_query)){
|
|
|
|
+ $mview_options[] = $mview_option['name'];
|
|
|
|
+ }
|
|
|
|
+
|
|
$form['row_mview'] = array(
|
|
$form['row_mview'] = array(
|
|
'#title' => t('Materialized View'),
|
|
'#title' => t('Materialized View'),
|
|
'#type' => 'select',
|
|
'#type' => 'select',
|
|
- '#options' => array('stub'),
|
|
|
|
- '#maxlength' => 128,
|
|
|
|
|
|
+ '#options' => $mview_options,
|
|
'#description' => 'Which materialized view to use.',
|
|
'#description' => 'Which materialized view to use.',
|
|
'#required' => TRUE,
|
|
'#required' => TRUE,
|
|
|
|
+ // '#ahah' => array(
|
|
|
|
+ // 'path' => 'rowmview/ahah',
|
|
|
|
+ // 'wrapper' => 'rowmview-ahah',
|
|
|
|
+ // 'effect' => 'fade',
|
|
|
|
+ // 'event' => 'change',
|
|
|
|
+ // 'method' => 'replace',
|
|
|
|
+ // ),
|
|
);
|
|
);
|
|
|
|
|
|
$form['row_base_table_name'] = array(
|
|
$form['row_base_table_name'] = array(
|
|
'#title' => t('Base Table Name'),
|
|
'#title' => t('Base Table Name'),
|
|
'#type' => 'select',
|
|
'#type' => 'select',
|
|
- '#options' => array('stub'),
|
|
|
|
- '#maxlength' => 128,
|
|
|
|
|
|
+ // '#options' => array('stub'),
|
|
|
|
+ '#options' => tripal_core_get_chado_tables(),
|
|
'#description' => 'Select which chado table to use for this view.',
|
|
'#description' => 'Select which chado table to use for this view.',
|
|
'#required' => TRUE,
|
|
'#required' => TRUE,
|
|
);
|
|
);
|
|
@@ -101,16 +115,15 @@ function tripal_views_setup_new_search_form(){
|
|
'#title' => t('View Column'),
|
|
'#title' => t('View Column'),
|
|
'#type' => 'select',
|
|
'#type' => 'select',
|
|
'#options' => array('stub'),
|
|
'#options' => array('stub'),
|
|
- '#maxlength' => 128,
|
|
|
|
'#description' => 'Which materialized view column to use.',
|
|
'#description' => 'Which materialized view column to use.',
|
|
'#required' => TRUE,
|
|
'#required' => TRUE,
|
|
|
|
+
|
|
);
|
|
);
|
|
|
|
|
|
$form['row_chado_column'] = array(
|
|
$form['row_chado_column'] = array(
|
|
'#title' => t('Chado Column'),
|
|
'#title' => t('Chado Column'),
|
|
'#type' => 'select',
|
|
'#type' => 'select',
|
|
'#options' => array('stub'),
|
|
'#options' => array('stub'),
|
|
- '#maxlength' => 128,
|
|
|
|
'#description' => 'Which Chado table column to use.',
|
|
'#description' => 'Which Chado table column to use.',
|
|
'#required' => TRUE,
|
|
'#required' => TRUE,
|
|
);
|
|
);
|
|
@@ -124,6 +137,34 @@ function tripal_views_setup_new_search_form(){
|
|
return $form;
|
|
return $form;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+// function rowmview_ahah(){
|
|
|
|
+ // $query = "SELECT mv_specs FROM tripal_mviews;";
|
|
|
|
+ // $row_options = db_fetch_array(db_query($query));
|
|
|
|
+//
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+// function tripal_views_setup_ajax_db_mview_columns(){
|
|
|
|
+ // $mview = $_POST['row_mview'];
|
|
|
|
+ // $form = drupal_get_form('tripal_views_setup_mview_column_form', $mview);
|
|
|
|
+ // drupal_json(array('status' => TRUE, 'data' => $form));
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+// function tripal_views_setup_mview_column_form(&$form_state = NULL, $mview = NULL){
|
|
|
|
+ // if ($mview){
|
|
|
|
+ // $mview_query = db_fetch_array(db_query("SELECT mv_specs FROM tripal_mviews WHERE name = $mview;"));
|
|
|
|
+//
|
|
|
|
+ // $form['row_mview']
|
|
|
|
+ // }
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+// function tripal_views_setup_ajax_db_chado_tables(){
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
function tripal_views_setup_new_search_form_submit($form, &$form_state){
|
|
function tripal_views_setup_new_search_form_submit($form, &$form_state){
|
|
|
|
|
|
}
|
|
}
|