Thread: [Gemstracker-svn] SF.net SVN: gemstracker:[1192] trunk/library/classes (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1192
          http://sourceforge.net/p/gemstracker/code/1192
Author:   matijsdejong
Date:     2013-03-18 18:04:19 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Fixed bug in EventCaculations where 0 was equal to null (pulse #568)
Added sort handling to transformer

Modified Paths:
--------------
    trunk/library/classes/Gems/Event/EventCalculations.php
    trunk/library/classes/Gems/Tracker/Token.php
    trunk/library/classes/MUtil/Model/ModelAbstract.php
    trunk/library/classes/MUtil/Model/ModelTransformerAbstract.php
    trunk/library/classes/MUtil/Model/ModelTransformerInterface.php
    trunk/library/classes/MUtil/Model/Transform/JoinTransformer.php

Modified: trunk/library/classes/Gems/Event/EventCalculations.php
===================================================================

--- trunk/library/classes/Gems/Event/EventCalculations.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/Gems/Event/EventCalculations.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -149,7 +149,7 @@
 
         foreach($values as $name => $result) {
             $result = intval($result);
-            if ($tokenAnswers[$name] != $result) {
+            if (($tokenAnswers[$name] != $result) && ($tokenAnswers[$name] !== null)) {
                 $results[$name] = $result;
             }
         }

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/Gems/Tracker/Token.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -385,11 +385,11 @@
             // added to the url.
             $surveyReturn['RouteReset'] = true;
 
+            // MUtil_Echo::track($currentUri, MUtil_Html::urlString($surveyReturn));
             return $currentUri . MUtil_Html::urlString($surveyReturn);
-            // MUtil_Echo::track($currentUri . MUtil_Html::urlString($surveyReturn));
         }
 
-        // Ultimate backup solution for reutrn
+        // Ultimate backup solution for return
         return $currentUri . '/ask/forward/' . MUtil_Model::REQUEST_ID . '/' . urlencode($this->getTokenId());
     }
 

Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -132,7 +132,7 @@
     }
 
     /**
-     * Checks the filter on sematic correctness and replaces the text seacrh filter
+     * Checks the filter on sematic correctness and replaces the text search filter
      * with the real filter.
      *
      * @param mixed $filter True for the filter stored in this model or a filter array
@@ -143,7 +143,7 @@
         if (true === $filter) {
             $filter = $this->getFilter();
         }
-        if ($filter && is_array($filter)) {
+        if (is_array($filter)) {
             foreach ($this->_transformers as $transformer) {
                 $filter = $transformer->transformFilter($this, $filter);
             }
@@ -162,16 +162,27 @@
         return array();
     }
 
+    /**
+     * Checks the sort on sematic correctness
+     *
+     * @param mixed $sort True for the sort stored in this model or a sort array or a single sort value
+     * @return array The filter to use
+     */
     protected function _checkSortUsed($sort)
     {
         if (true === $sort) {
-            return $this->getSort();
+            $sort = $this->getSort();
+        } elseif (false === $sort) {
+            $sort = array();
+        } else {
+            $sort = $this->_checkSortValue($sort);
         }
-        if (false === $sort) {
-            return array();
+
+        foreach ($this->_transformers as $transformer) {
+            $sort = $transformer->transformSort($this, $sort);
         }
 
-        return $this->_checkSortValue($sort);
+        return $sort;
     }
 
     protected function _checkSortValue($value)
@@ -1313,13 +1324,21 @@
         return $this;
     }
 
-    public function setAlias($name, $alias)
+    /**
+     * Set the value to be an alias of another field
+     * 
+     * @param string $name
+     * @param string $aliasOf
+     * @return \MUtil_Model_ModelAbstract
+     * @throws MUtil_Model_ModelException
+     */
+    public function setAlias($name, $aliasOf)
     {
-        if ($this->has($alias)) {
-            $this->set($name, self::ALIAS_OF, $alias);
+        if ($this->has($aliasOf)) {
+            $this->set($name, self::ALIAS_OF, $aliasOf);
             return $this;
         }
-        throw new MUtil_Model_ModelException("Alias for '$name' set to non existing field '$alias'");
+        throw new MUtil_Model_ModelException("Alias for '$name' set to non existing field '$aliasOf'");
     }
 
     /**

Modified: trunk/library/classes/MUtil/Model/ModelTransformerAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelTransformerAbstract.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/MUtil/Model/ModelTransformerAbstract.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -156,7 +156,7 @@
     /**
      * This transform function checks the filter for
      * a) retreiving filters to be applied to the transforming data,
-     * b) adding filters that are the result
+     * b) adding filters that are needed
      *
      * @param MUtil_Model_ModelAbstract $model
      * @param array $filter
@@ -169,6 +169,21 @@
     }
 
     /**
+     * This transform function checks the sort to
+     * a) remove sorts from the main model that are not possible
+     * b) add sorts that are required needed
+     *
+     * @param MUtil_Model_ModelAbstract $model
+     * @param array $sort
+     * @return array The (optionally changed) sort
+     */
+    public function transformSort(MUtil_Model_ModelAbstract $model, array $sort)
+    {
+        // No changes
+        return $sort;
+    }
+
+    /**
      * The transform function performs the actual transformation of the data and is called after
      * the loading of the data in the source model.
      *

Modified: trunk/library/classes/MUtil/Model/ModelTransformerInterface.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelTransformerInterface.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/MUtil/Model/ModelTransformerInterface.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -60,15 +60,26 @@
     /**
      * This transform function checks the filter for
      * a) retreiving filters to be applied to the transforming data,
-     * b) adding filters that are the result
+     * b) adding filters that are needed
      *
      * @param MUtil_Model_ModelAbstract $model
      * @param array $filter
      * @return array The (optionally changed) filter
      */
     public function transformFilter(MUtil_Model_ModelAbstract $model, array $filter);
-    
+
     /**
+     * This transform function checks the sort to
+     * a) remove sorts from the main model that are not possible
+     * b) add sorts that are required needed
+     *
+     * @param MUtil_Model_ModelAbstract $model
+     * @param array $sort
+     * @return array The (optionally changed) sort
+     */
+    public function transformSort(MUtil_Model_ModelAbstract $model, array $sort);
+
+    /**
      * The transform function performs the actual transformation of the data and is called after
      * the loading of the data in the source model.
      *

Modified: trunk/library/classes/MUtil/Model/Transform/JoinTransformer.php
===================================================================
--- trunk/library/classes/MUtil/Model/Transform/JoinTransformer.php	2013-03-18 13:16:50 UTC (rev 1191)
+++ trunk/library/classes/MUtil/Model/Transform/JoinTransformer.php	2013-03-18 18:04:19 UTC (rev 1192)
@@ -120,6 +120,29 @@
     }
 
     /**
+     * This transform function checks the sort to
+     * a) remove sorts from the main model that are not possible
+     * b) add sorts that are required needed
+     *
+     * @param MUtil_Model_ModelAbstract $model
+     * @param array $sort
+     * @return array The (optionally changed) sort
+     */
+    public function transformSort(MUtil_Model_ModelAbstract $model, array $sort)
+    {
+        foreach ($this->_subModels as $sub) {
+            foreach ($sort as $key => $value) {
+                if ($sub->has($key)) {
+                    // Remove all sorts on columns from the submodel
+                    unset($sort[$key]);
+                }
+            }
+        }
+
+        return $sort;
+    }
+
+    /**
      * The transform function performs the actual transformation of the data and is called after
      * the loading of the data in the source model.
      *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Gemstracker-svn] SF.net SVN: gemstracker:[1192] trunk/library/classes (Page 3)

gemstracker-svn