Added handlers to the views integration form and fixed the template for the form

base/tripal_core/tripal_core.install

@@ -100,6 +100,16 @@ function tripal_core_get_schemas (){
       'primary key' => array('mview_id'),
   );
 
+   $schema = tripal_core_views_integration_schema();
+
+	return $schema;
+}
+/************************************************************************
+* 
+*
+* @ingroup tripal_core
+*/
+function tripal_core_views_integration_schema(){
 	$schema['tripal_views_integration'] = array(
 		'description' => 'contains the setupes, their materialized view id and base table name that was used.',
 		'fields' => array(
@@ -234,7 +244,29 @@ function tripal_core_get_schemas (){
 	  ),
 		'primary key' => array('handler_id'),
 	);
-	return $schema;
-  return $schema;
+
+   return $schema;
+}
+/************************************************************************
+* 
+*
+* @ingroup tripal_core
+*/
+function tripal_core_update_6000(){
+   // recreate the materialized view
+   tripal_feature_add_organism_count_mview();
+   $ret = array(
+      '#finished' => 1,
+   );
+   
+   return $ret;
+}
+/************************************************************************
+* 
+*
+* @ingroup tripal_core
+*/
+tripal_core_update_6000_views_integration(){
+
 }
 ?>

base/tripal_core/tripal_core.module

@@ -7,6 +7,7 @@ require_once "chado_install.php";
 require_once "tripal_views_integration.inc";
 
 require_once "tripal_core.api.inc";
+require_once "tripal_core.views.inc";
 
 /**
  * @defgroup tripal_modules Tripal Modules

base/tripal_core/tripal_views_integration.inc

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Purpose: Provide Guidance to new Tripal Admin
  *
@@ -207,26 +208,32 @@ function tripal_core_views_integration_new_setup_form(&$form_state){
 
     $i=1;
     $chado_tables = tripal_core_get_chado_tables();
-    $chado_tables = array_merge(array('',), $chado_tables);
+    $chado_tables = array_merge(array('Select a Join Table',), $chado_tables);
 
-    $handlers_filters = array('<default>');
-    $handlers_fields = array('<default>');
     $form['view_setup_table']["instructions"] = array(
          '#type' => 'markup',
          '#value' => "Select an optional table to which the fields of the materialized view can join.  If a field does not need to join you may leave the selection blank.",
     );
-    $form['view_setup_table']["fields_headers"] = array(
-         '#type' => 'markup',
-         '#value' => "<div class=\"field-headers\">".
-              "<div class=\"column-id\">Field Name and Type</div>".
-              "<div class=\"fields-column-join\">Join Table</div>".
-              "<div class=\"fields-column-join-column\">Join Column</div>".
-              "<div class=\"fields-filter-handler\">Filter Handler</div>".
-              "<div class=\"fields-field-handler\">Field Handler</div></div>",
-    );
 
     $data['field_types'] = array();
 
+
+    // get list of all handlers
+    $all_handlers = tripal_core_views_integration_discover_handlers();
+    $handlers_fields = array();
+    $handlers_filters = array();
+    
+    $handlers_fields[] = "Select a Field Handler"; 
+    $handlers_filters[] = "Select a Filter Handler";
+    foreach($all_handlers as $handler){
+       if(preg_match("/views_handler_field/",$handler)){
+          $handlers_fields[] = $handler;
+       }
+       if(preg_match("/views_handler_filter/",$handler)){
+          $handlers_filters[] = $handler;
+       }
+    }
+
     foreach ($columns as $column){
       $column = trim($column);  // trim trailing and leading spaces
       preg_match("/^(.*?)\ (.*?)$/",$column,$matches);
@@ -241,8 +248,11 @@ function tripal_core_views_integration_new_setup_form(&$form_state){
       $form['view_setup_table']["fields_name_$mview_id-$i"] = array(
         '#type' => 'markup',
         '#attributes' => array('class' => 'fields-column-name'),
-        '#value' => "<div class=\"column-id\"><span class=\"column-name\">$column_name</span>".
-                   "<br><span class=\"column-type\">$column_type</span></div>",
+        '#value' => "<div class=\"column-id\">".
+                      "<span class=\"column-name\">$column_name</span>".
+                      "<br><span class=\"column-type\">$column_type</span>".
+                    "</div>".
+                    "<div class=\"column-form-fields\"><div class=\"column-one\">",
       );
 
       $data['field_types'][$column_name] = $column_type;
@@ -261,41 +271,42 @@ function tripal_core_views_integration_new_setup_form(&$form_state){
            'effect' => 'fade',
            'event' => 'change',
            'method' => 'replace',
-      ),
+         ),
       );
+      
       if($table){
         $table_desc = module_invoke_all('chado_'.$table.'_schema');
         $columns = array_keys($table_desc['fields']);
       } else {
-        $columns = array();
+        $columns = array('Select Join Column');
       }
       $form['view_setup_table']["fields_join_column_$mview_id-$i"] = array(
         '#type' => 'select',
-        '#prefix' => "<div id=\"fields-column-join-column-$mview_id-$i\" class=\"fields-column-join-column\">",
-        '#suffix' => "</div>",
+        '#prefix' => "  <div id=\"fields-column-join-column-$mview_id-$i\" class=\"fields-column-join-column\">",
+        '#suffix' => "</div></div>",
         '#options' => $columns,
         '#required' => FALSE,
-      );
-      
-      $form['view_setup_table']["fields_filter_handler_$mview_id-$i"] = array(
-        '#type' => 'select',
-        '#prefix' => "<div class=\"fields-filter-handler\">",
-        '#suffix' => "</div>",
-        '#options' => $handlers_filters,
-        '#required' => FALSE,
-      );
+      );      
       
       $form['view_setup_table']["fields_field_handler_$mview_id-$i"] = array(
          '#type' => 'select',
-         '#prefix' => "<div class=\"fields-field-handler\">",
+         '#prefix' => "<div class=\"column-two\">".
+                        "<div class=\"fields-field-handler\">",
          '#suffix' => "</div>",
          '#options' => $handlers_fields,
          '#required' => FALSE,
       );
+      $form['view_setup_table']["fields_filter_handler_$mview_id-$i"] = array(
+        '#type' => 'select',
+        '#prefix' => "<div class=\"fields-filter-handler\">",
+        '#suffix' => "</div></div>",
+        '#options' => $handlers_filters,
+        '#required' => FALSE,
+      );
       
       $form['view_setup_table']["fields_end_$i"] = array(
         '#type' => 'markup',
-        '#value' => "</div>",
+        '#value' => "</div></div>",
       );
       $i++;
    }
@@ -373,3 +384,74 @@ function tripal_core_views_integration_new_setup_form_submit($form, &$form_state
 
 }
 
+/**
+ *
+ * @ingroup tripal_views_integration
+ */
+function tripal_core_views_integration_discover_handlers() {
+
+   $handlers = array();
+
+   // Get handlers from all modules.
+   foreach (module_implements('views_handlers') as $module) {
+     $function = $module . '_views_handlers';
+     $result = $function();
+     if (!is_array($result)) {
+       continue;
+     }
+     foreach ($result['handlers'] as $handler => $parent){
+        $handlers[] = $handler;
+     }
+   }
+
+   // these handlers are hard coded because I could not 
+   // get the views_views_handlers() function to be called
+   // in the code above.  However, we will be creating 
+   // Chado wrappers for many of these and once that work
+   // is done these will no longer be needed.
+
+   // argument handlers
+   $handlers[] = 'views_handler_argument';
+   $handlers[] = 'views_handler_argument_numeric';
+   $handlers[] = 'views_handler_argument_formula';
+   $handlers[] = 'views_handler_argument_date';
+   $handlers[] = 'views_handler_argument_string';
+   $handlers[] = 'views_handler_argument_many_to_one';
+   $handlers[] = 'views_handler_argument_null';
+
+   // field handlers
+   $handlers[] = 'views_handler_field';
+   $handlers[] = 'views_handler_field_date';
+   $handlers[] = 'views_handler_field_boolean';
+   $handlers[] = 'views_handler_field_markup';
+   $handlers[] = 'views_handler_field_xss';
+   $handlers[] = 'views_handler_field_url';
+   $handlers[] = 'views_handler_field_file_size';
+   $handlers[] = 'views_handler_field_prerender_list';
+   $handlers[] = 'views_handler_field_numeric';
+   $handlers[] = 'views_handler_field_custom';
+   $handlers[] = 'views_handler_field_counter';
+
+   // filter handlers
+   $handlers[] = 'views_handler_filter';
+   $handlers[] = 'views_handler_filter_equality';
+   $handlers[] = 'views_handler_filter_string';
+   $handlers[] = 'views_handler_filter_boolean_operator';
+   $handlers[] = 'views_handler_filter_boolean_operator_string';
+   $handlers[] = 'views_handler_filter_in_operator';
+   $handlers[] = 'views_handler_filter_numeric';
+   $handlers[] = 'views_handler_filter_float';
+   $handlers[] = 'views_handler_filter_date';
+   $handlers[] = 'views_handler_filter_many_to_one';
+
+   // relationship handlers
+   $handlers[] = 'views_handler_relationship';
+
+   // sort handlers
+   $handlers[] = 'views_handler_sort';
+   $handlers[] = 'views_handler_sort_formula';
+   $handlers[] = 'views_handler_sort_date';
+   $handlers[] = 'views_handler_sort_menu_hierarchy';
+   $handlers[] = 'views_handler_sort_random';
+   return $handlers;
+ }

base/tripal_core/tripal_views_integration_fields_form.tpl.php

@@ -9,10 +9,11 @@
 #tripal-core-views-integration-new-setup-form .form-item {
    margin: 0px 0px 5px 0px;
 }
-#tripal-core-views-integration-new-setup-form .column-id, .fields-column-join,.fields-column-join-column, .fields-filter-handler, .fields-field-handler {
+#tripal-core-views-integration-new-setup-form .column-id, .column-form-fields, .column-one, .column-two {
    display: inline-block;
    margin: 0px;
    vertical-align: top;
+   //border: 1px solid #000;
 }
 #tripal-core-views-integration-new-setup-form  .field-headers {
    font-weight: bold;
@@ -23,25 +24,40 @@
    vertical-align: top;
 }
 #tripal-core-views-integration-new-setup-form .column-name {
-
+   font-weight: bold;
 }
 #tripal-core-views-integration-new-setup-form .column-type {
    font-style: italic;
 }
 #tripal-core-views-integration-new-setup-form .column-id {
-   width: 15%;
+   width: 20%;
+   height: 50px;
+}
+#tripal-core-views-integration-new-setup-form  .fields-new-row {
+   padding-bottom: 10px;
+   margin-bottom: 5px;
+   padding-top: 10px;
+}
+#tripal-core-views-integration-new-setup-form .column-form-fields {
+   //border: 3px solid #f00;
+}
+#tripal-core-views-integration-new-setup-form .column-one {
+   margin-left: 15px;
+}
+#tripal-core-views-integration-new-setup-form .column-two {
+   margin-left: 15px;
 }
 #tripal-core-views-integration-new-setup-form .fields-column-join {
-   width: 30%;
+
 }
 #tripal-core-views-integration-new-setup-form .fields-column-join-column {
-   width: 30%;
+
 }
 #tripal-core-views-integration-new-setup-form .fields-filter-handler {
-   width: 10%;
+
 }
 #tripal-core-views-integration-new-setup-form .fields-field-handler {
-   width: 10%;
+
 }
 
 </style>