Changeset 6100

Timestamp:

11/19/07 00:12:30 (1 year ago)

Author:

Leon.van.der.Ree

Message:

Added renderer for group-by-header, which supports master-detail up to 3th level of foreign-value (ForeignTable?->ForeignTable?->column). Used some hardcoding to reach 3th level, needs nicer solution with iteration.

Files:

• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_json_list_td.php (modified) (3 diffs)
• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_layout.php (modified) (4 diffs)
• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_renderer.php (modified) (2 diffs)
• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/listSuccess.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/lib/helper/ExtjsHelper.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php (modified) (9 diffs)

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_json_list_td.php

@@ -12 +12 @@
-
-$hs = $this->getParameterValue('list.hide', array());
+//TODO This probably does not work with partials and links (=columnname)
-$display = $this->getParameterValue('list.display', array());
+$groupingDisplay = $this->getParameterValue('list.grouping.display', array());
-$columns = $this->getColumns('list.display');
-
@@ -21 +23 @@
-$columns[] = $this->getAdminColumnForField($pk);
-
-
-
+
-$groupColumnName = $this->getParameterValue('list.grouping.field', null);
-if ($groupColumnName) 
-{
-
+
+
-    $columns[] = $this->getAdminColumnForField($groupColumnName);
-  }
-}
-
+//add grouping.display.fields (which do not necesarrily has to be defined in the display array)
+if (count($groupingDisplay) > 0) 
+{
+  $groupColumns = $this->getColumns('list.grouping.display');
+  
+  foreach ($groupColumns as $groupColumn)
+  {
+    $groupColumnName = $groupColumn->getName();
+    
+    if (!in_array($groupColumnName, $display)) 
+    {
+      $columns[] = $this->getAdminColumnForField($groupColumnName);
+    }
+  }
+}
-
-//add PrimaryKeys of foreign-classes
@@ -43 +60 @@
-
-    // add column if not already in list
-
+
+
-      $columns[] = $this->getAdminColumnForField($columnName);
-    }

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_layout.php

@@ -125 +125 @@
-
-  $hs = $this->getParameterValue('list.hide', array());
-//  $columns = $this->getColumns('list.display');
-
-
-  // iterate through all related classes
@@ -218 +216 @@
-
-
-<?php echo $this->getModuleName() ?>/
+
-
-  // ------------------------
@@ -228 +226 @@
-  $columns = $this->getColumns('list.display');
-
- of current class
+
-  foreach ($columns as $column) :
-    // can we skip it?
@@ -365 +363 @@
-?>
-<?php endforeach; ?>
-<?php echo $this->getModuleName() ?>/
+
-
-      cm = <?php echo _extjs_write_class('grid.ColumnModel', array($cmOptions), true, $expander) ?>;

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_renderer.php

@@ -17 +17 @@
-$prefix = strtolower($this->getClassName());
-
+//iterate through all columns of all class
+$completeColumns = $this->getColumnsGroup($pk);
+
-?>
+      function renderHeader(value, p, record){
+<?php 
+$display = $this->getParameterValue('list.grouping.display', null);
+if ($display!=null) 
+{
+    
+  // the header text which is build from the list.grouping.display-array with this code
+  $headerText = "";
+
+  $columns = $this->getColumns('list.grouping.display');
+  
+  //iterate through all columns for grouping display
+  foreach ($columns as $column)
+  {
+    if (false !== strpos($column->getName(), '/'))
+    {
+      list($relatedClassName, $relatedColumn) = explode('/', $column->getName(),2);
+      $key_name = $completeColumns['related'][$relatedClassName]['pk']->getName();
+      
+      // TODO: add iteration to define related-column-names
+      $relatedColumn = str_replace('/',$tableDelimiter,$relatedColumn);
+    }
+    
+    //header values
+    $h_moduleName = $relatedClassName;
+    $h_tableName = $relatedClassName;
+    $h_pkn = $key_name;
+    
+    $h_valuePrefix = $this->getParameterValue('list.fields.'.$column->getName().'.params.header_valuePrefix',
+                     $this->getParameterValue('fields.'.$column->getName().'.params.header_valuePrefix', ' '));
+    $h_valueSuffix = $this->getParameterValue('list.fields.'.$column->getName().'.params.header_valueSuffix', 
+                     $this->getParameterValue('fields.'.$column->getName().'.params.header_valueSuffix', ' '));
+    
+    // TODO: Prevent collapsing when clicking link
+    if ($column->isLink())
+    {
+      //TODO remove hardcoded tag for underline, add option to set stylesheet-class, don't forget to remove the closing tag as well...
+      $headerText .= "<u><a href=\'".$controller->genUrl($h_moduleName."/edit?".$h_pkn."=")."/'+record.data['".$h_tableName.$tableDelimiter.$h_pkn."']+'\'>";
+    }
+    $headerText .= $h_valuePrefix."'+record.data['".$h_tableName.$tableDelimiter.$relatedColumn."']+'".$h_valueSuffix;
+    if ($column->isLink())
+    {
+      $headerText .= "</a></u>";
+    }
+  }
+}
+else // no grouping.display defined use grouping.field
+{
+  $columnName = $this->getParameterValue('list.grouping.field', null);
+  
+  $h_valuePrefix = '';
+  $h_valueSuffix = '';
+  
+  if ($columnName != null) {
+    $h_valuePrefix = $this->getParameterValue('list.fields.'.$columnName.'.params.header_valuePrefix',
+                     $this->getParameterValue('fields.'.$columnName.'.params.header_valuePrefix', ' '));
+    $h_valueSuffix = $this->getParameterValue('list.fields.'.$columnName.'.params.header_valueSuffix', 
+                     $this->getParameterValue('fields.'.$columnName.'.params.header_valueSuffix', ' '));
+  }
+   
+  $headerText = $h_valuePrefix."'+value+'".$h_valueSuffix;
+}
+?>
+          return '<?php echo $headerText ?>';
+      }
+
-
-      // TODO: remove hardcoded html-tags, set css 
-      // a column with a value which is a link (to edit)
-      function renderLink(value, p, record){
-"<?php echo $controller->genUrl($this->getModuleName().'/edit?'.$pkn.'=') ?>/{1}"
+\'<?php echo $controller->genUrl($this->getModuleName().'/edit?'.$pkn.'=') ?>/{1}\'
-      }
-
@@ -46 +115 @@
-      // a column with a weight
-      function renderWeight(v){
+        v = String(v);
-        var ps = v.split('.');
-        var whole = ps[0];

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/listSuccess.php

@@ -37 +37 @@
-  [?php echo __('no result') ?]
-  [?php else: ?]
-<?php echo $this->getModuleName() ?>/
+
-  [?php endif; ?]
-  [?php include_partial('list_actions') ?]

plugins/sfExtjsThemePlugin/lib/helper/ExtjsHelper.php

@@ -87 +87 @@
-  }
-
-$type === 'float'
+($type === 'float') || ($type === 'double')
-  {
-    return 'float';

plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

@@ -190 +190 @@
-      return $for == 'edit' ? "$columnGetter ? 'true' : 'false'" : "$columnGetter ? 1 : 0";
-    }
-
+
-    return parent::getColumnListTag($column, $params);
-  }
@@ -231 +231 @@
-
-  /**
-he
+thei
-   *
-   * @param string $pk (optional) primary key admin column
-   */
+  // TODO maybe we again can make this somewhat nicer, contains much copy-paste to support grouping and group-display-array in same way as to process regular (display)columns
-  public function getColumnsGroup($pk = null)
-  {
@@ -251 +252 @@
-        $column = $this->getAdminColumnForField($groupColumnName);
-
+        // check if foreign
-        if (false !== strpos($groupColumnName, '/'))
-        {
-
-
-->getPhpName()
+
+PhpName
-          $relatedClassName = sfInflector::underscore($peerName);
-
@@ -275 +277 @@
-          $columns['related'][$relatedClassName]['columns'][$relatedColumnUnderscore] = $this->getAdminColumnForField($relatedColumn);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    foreach ($this->getColumns('list.display') as $column)
-    {
-      if ($column->isPrimaryKey()) continue;
-
+      // check if foreign
-      if (false !== strpos($column->getName(), '/'))
-      {
@@ -313 +390 @@
-        $columns['related'][$relatedClassName]['columns'][$relatedColumnUnderscore] = $this->getAdminColumnForField($relatedColumn);
-      }
-
+ // local column
-      {
-        $columnUnderscore = sfInflector::underscore($column->getPhpName());
@@ -347 +424 @@
-    if (isset($columns['related']))
-    {
-es
+
-      {
-        // Add id
-es['pk']->getName()] = $class.$tableDelimiter.$relatedClasse
-es['pk']->getName()] = $relatedClasse
+['pk']->getName()] = $class.$tableDelimiter.$relatedClas
+['pk']->getName()] = $relatedClas
-        
-        // Add preload-value
-es
+
-        {
-          $fieldsName[$class.'_'.$relatedColumn] = $class.$tableDelimiter.$relatedColumn;
-          $fieldsType[$class.'_'.$relatedColumn] = $col->getType();
+        }
+
+        // Add the related-related foreign-keys, TODO: Hardcoded, this should also be solved with recursion
+        if (isset($relatedClass['related']))
+        {
+          foreach ($relatedClass['related'] as $class2 => $relatedClass2)
+          {
+            // Add preload-value
+            foreach ($relatedClass2['columns'] as $relatedColumn2 => $col2)
+            {
+              $fieldsName[$class.'_'.$class2.'_'.$relatedColumn2] = $class.$tableDelimiter.$class2.$tableDelimiter.$relatedColumn2;
+              $fieldsType[$class.'_'.$class2.'_'.$relatedColumn2] = $col->getType();
+            }
+          }
-        }
-      }
@@ -417 +508 @@
-        $options['vtype'] = $params['type'];
-      }
+    } else {
+      $definition['renderer'] = isset($params['renderer']) ? $params['renderer'] : 'renderHeader';
-    }
-    
@@ -542 +635 @@
-      }
-    }
-
+
+
-    {
-      $editor = _extjs_write_class('form.NumberField', array($options), true);
@@ -557 +651 @@
-        }
-
-
-
-
-
+
-
-        return $definition;