Changeset 131 for trunk/trax/vendor/trax/action_view

Timestamp:

02/13/06 12:15:03 (6 years ago)

Author:

john

Message:

fixed a bunch of helpers

Location:

trunk/trax/vendor/trax/action_view/helpers

Files:

• date_helper.php (modified) (19 diffs)
• form_helper.php (modified) (2 diffs)
• form_tag_helper.php (modified) (2 diffs)

trunk/trax/vendor/trax/action_view/helpers/date_helper.php

@@ -24 +24 @@
 
 class DateHelper extends Helpers {
-
+    public $selected_years = array();
     function __construct($object_name = null, $attribute_name = null) {
         parent::__construct();
@@ -32 +32 @@
 
     private function value() {
-        if(!$value = $_REQUEST[$this->object_name][$this->attribute_name]) {
+        if(!$value = $this->check_request_for_value()) {
             $object = $this->object();
             if(is_object($object) && $this->attribute_name) {
@@ -40 +40 @@
         return $value;
     }
+    
+    private function check_request_for_value() {
+        if(!$value = $_REQUEST[$this->object_name][$this->attribute_name]) {
+            # check if this a date / datetime
+            if($year_value = $_REQUEST[$this->object_name][$this->attribute_name."(1i)"]) {
+                $this->request_years[$this->attribute_name] = $year_value;    
+            }
+            if($month_value = $_REQUEST[$this->object_name][$this->attribute_name."(2i)"]) {
+                $this->request_months[$this->attribute_name] = $month_value;    
+            }
+            if($day_value = $_REQUEST[$this->object_name][$this->attribute_name."(3i)"]) {
+                $this->request_days[$this->attribute_name] = $day_value;    
+            }
+            if($minute_value = $_REQUEST[$this->object_name][$this->attribute_name."(4i)"]) {
+                $this->request_minutes[$this->attribute_name] = $minute_value;    
+            }   
+            if($hour_value = $_REQUEST[$this->object_name][$this->attribute_name."(5i)"]) {
+                $this->request_hours[$this->attribute_name] = $hour_value;    
+            }              
+            if($second_value = $_REQUEST[$this->object_name][$this->attribute_name."(6i)"]) {
+                $this->request_seconds[$this->attribute_name] = $second_value;    
+            }                                                                   
+        }   
+        return $value;     
+    }
 
     private function object($object_name = null) {
@@ -47 +72 @@
 
     private function select_html($type, $options, $prefix = null, $include_blank = false, $discard_type = false) {
-        $select_html  = "<select name=\"$prefix";
-        if(!$discard_type) $select_html .= "[$type]";
+        $select_html  = "<select name=\"$prefix";       
+        if(!$discard_type) {
+            if($prefix) $select_html .= "["; 
+            $select_html .= $type;
+            if($prefix) $select_html .= "]"; 
+        }
         $select_html .= "\">\n";
         if($include_blank) $select_html .= "<option value=\"\"></option>\n";
@@ -58 +87 @@
     private function leading_zero_on_single_digits($number) {
         return $number > 9 ? $number : "0$number";
+    }
+    
+    function expiration_date_select($options = array()) {
+        return $this->to_expiration_date_select_tag($options);      
     }
         
@@ -68 +101 @@
     #   datetime_select("post", "written_on")
     #   datetime_select("post", "written_on", array("start_year" => 1995))
-    function date_select($options = array()) {     
+    function date_select($options = array()) {   
         return $this->to_date_select_tag($options);
-    }           
+    }  
+    
+    function select_expiration_date($date = null, $options = array()) {
+        $options['month_before_year'] = true;      
+        $options['use_month_numbers'] = true;   
+        $options['start_year'] = date("Y");
+        $options['end_year'] = date("Y") + 7;
+        $options['field_seperator'] = " / ";        
+        $options['field_name'] = $options['year_name'] ? $options['year_name'] : "expiration_year"; 
+        $date = ($_REQUEST[$options['field_name']]) ? date("Y-m-d", strtotime($_REQUEST[$options['field_name']]."-01-01")) : date("Y-m-d");
+        $year_select = $this->select_year($date, $options);
+        $options['field_name'] = $options['month_name'] ? $options['month_name'] : "expiration_month";
+        $date = ($_REQUEST[$options['field_name']]) ? date("Y-m-d", strtotime("2006-".$_REQUEST[$options['field_name']]."-01")) : date("Y-m-d");
+        $month_select = $this->select_month($date, $options);
+        if($options['month_before_year']) {
+            $select_html =  $month_select . $options['field_seperator'] .  $year_select;     
+        } else {
+            $select_html =  $year_select . $options['field_seperator'] .  $month_select;
+        }
+        return $select_html;
+    }               
 
     # Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+.
@@ -103 +156 @@
     function select_second($datetime, $options = array()) {
         $second_options = "";
-
-        for($second = 0; $second <= 59; $second++) {
+        
+        if($this->request_seconds[$this->attribute_name]) {
+            $datetime_sec = $this->request_seconds[$this->attribute_name];    
+        } elseif(strlen($datetime) == 2 && is_numeric($datetime)) {
+            $datetime_sec = $datetime;
+        } else {                  
+            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
             $datetime_sec = date("s",strtotime($datetime));
+        }
+        
+        for($second = 0; $second <= 59; $second++) {          
             $second_options .= ($datetime && ($datetime_sec == $second)) ?
             "<option value=\"".$this->leading_zero_on_single_digits($second)."\"  selected=\"selected\">".$this->leading_zero_on_single_digits($second)."</option>\n" :
@@ -120 +181 @@
     function select_minute($datetime, $options = array()) {
         $minute_options = "";
-
-        for($minute = 0; $minute <= 59; $minute++) {
+        
+        if($this->request_minutes[$this->attribute_name]) {
+            $datetime_min = $this->request_minutes[$this->attribute_name];    
+        } elseif(strlen($datetime) == 2 && is_numeric($datetime)) {
+            $datetime_min = $datetime;
+        } else {                  
+            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
             $datetime_min = date("i",strtotime($datetime));
+        }
+        
+        for($minute = 0; $minute <= 59; $minute++) {        
             $minute_options .= ($datetime && ($datetime_min == $minute)) ?
             "<option value=\"".$this->leading_zero_on_single_digits($minute)."\"  selected=\"selected\">".$this->leading_zero_on_single_digits($minute)."</option>\n" :
@@ -136 +205 @@
     function select_hour($datetime, $options = array()) {
         $hour_options = "";
+        
+        if($this->request_hours[$this->attribute_name]) {
+            $datetime_hour = $this->request_hours[$this->attribute_name];    
+        } elseif(strlen($datetime) == 2 && is_numeric($datetime)) {
+            $datetime_hour = $datetime;
+        } else {                  
+            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            $datetime_hour = date("H",strtotime($datetime)); 
+        }
 
         for($hour = 0; $hour <= 23; $hour++) {
-            $datetime_hour = date("H",strtotime($datetime));
+            
             $hour_options .= ($datetime && ($datetime_hour == $hour)) ?
             "<option value=\"".$this->leading_zero_on_single_digits($hour)."\"  selected=\"selected\">".$this->leading_zero_on_single_digits($hour)."</option>\n" :
@@ -152 +230 @@
     function select_day($datetime, $options = array()) {
         $day_options = "";
-
-        for($day = 1; $day <= 31; $day++) {
-            $datetime_day = date("d",strtotime($datetime));
+        
+        if($this->request_days[$this->attribute_name]) {
+            $datetime_day = $this->request_days[$this->attribute_name];    
+        } elseif(strlen($datetime) == 2 && is_numeric($datetime)) {
+            $datetime_day = $datetime;
+        } else {                  
+            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            $datetime_day = date("d",strtotime($datetime));  
+        }
+        
+        for($day = 1; $day <= 31; $day++) {        
             $day_options .= ($datetime && ($datetime_day == $day)) ?
             "<option value=\"".$this->leading_zero_on_single_digits($day)."\"  selected=\"selected\">".$this->leading_zero_on_single_digits($day)."</option>\n" :
@@ -176 +262 @@
     function select_month($date, $options = array()) {
         $month_options = "";
-        $date_month = date("m",strtotime($date));
+        
+        if($this->request_months[$this->attribute_name]) {
+            $date_month = $this->request_months[$this->attribute_name];    
+        } elseif(strlen($date) != 2 && !is_numeric($date)) {
+            $date = $date ? $date : date("Y-m-d"); 
+            $date_month = date("m",strtotime($date));    
+        }
+   
         for($month_number = 1; $month_number <= 12; $month_number++) {
             if($options['use_month_numbers']) {
@@ -205 +298 @@
     function select_year($date, $options = array()) {
         $year_options = "";
-        $y = $date ? date("Y",strtotime($date)) : date("Y");
+
+        if($this->request_years[$this->attribute_name]) {
+            $date_year = $this->request_years[$this->attribute_name];    
+        } elseif(strlen($date) == 4 && is_numeric($date)) {
+            $date_year = $date;     
+        } else {
+            $date_year = $date ? date("Y",strtotime($date)) : date("Y");
+        } 
 
         $start_year = ($options['start_year']) ? $options['start_year'] : $y - 5;
@@ -211 +311 @@
 
         for($year = $start_year; $year <= $end_year; $year++) {
-            $date_year = date("Y",strtotime($date));
             $year_options .= ($date && ($date_year == $year)) ?
             "<option value=\"$year\" selected=\"selected\">$year</option>\n" :
@@ -225 +324 @@
         $options  = array_merge($defaults, $options);
         $options_with_prefix = array();
-        for($i=1; $i < 4 ; $i++) {
+        for($i=1 ; $i <= 3 ; $i++) {
             $options_with_prefix[$i] = array_merge($options, array('prefix' => "{$this->object_name}[{$this->attribute_name}({$i}i)]"));
         }        
@@ -237 +336 @@
         }
 
-        $date_select = '';
+        $date_select = array();
         if($options['month_before_year']) {
             $options['order'] = array('month', 'year', 'day');
@@ -253 +352 @@
         foreach($options['order'] as $param) {
             if(!$discard[$param]) {
-                $date_select .= call_user_func(array($this, "select_$param"),  $date, $options_with_prefix[$position[$param]]);
-            }
+                $date_select[] = call_user_func(array($this, "select_$param"),  $date, $options_with_prefix[$position[$param]]);
+            }
+        }
+        
+        if(count($date_select)) {
+            $seperator = $options['field_seperator'] ? $options['field_seperator'] : " ";
+            $date_select = implode($seperator, $date_select);            
         }
 
@@ -264 +368 @@
         $options = array_merge($defaults, $options);
         $options_with_prefix = array();
-        for($i=1; $i < 6 ; $i++) {
+        for($i=1 ; $i < 6 ; $i++) {
             $options_with_prefix[$i] = array_merge($options, array('prefix' => "{$this->object_name}[{$this->attribute_name}({$i}i)]"));
         }
@@ -288 +392 @@
         return $datetime_select;
     }
+    
+    function to_expiration_date_select_tag($options = array()) {
+        $options['discard_day'] = true; 
+        $options['month_before_year'] = true;      
+        $options['use_month_numbers'] = true;   
+        $options['start_year'] = date("Y");
+        $options['end_year'] = date("Y") + 7;
+        $options['field_seperator'] = " / ";
+        return $this->to_date_select_tag($options);               
+    }  
 
 }
@@ -308 +422 @@
 }
 
+# select_expiration_date($datetime = null, $options = array())
+function select_expiration_date() {
+    $date_helper = new DateHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($date_helper, 'select_expiration_date'), $args);        
+}
+
 function datetime_select($object, $attribute, $options = array()) {
     $date_helper = new DateHelper($object, $attribute);
-    $args = func_get_args();
-    return call_user_func_array(array($date_helper, 'datetime_select'), $options);    
+    return $date_helper->datetime_select($options);    
 }
 
 function date_select($object, $attribute, $options = array()) {
     $date_helper = new DateHelper($object, $attribute);
-    $args = func_get_args();
-    return call_user_func_array(array($date_helper, 'date_select'), $options);    
+    return $date_helper->date_select($options);    
+}
+
+function expiration_date_select($object, $attribute, $options = array()) {
+    $date_helper = new DateHelper($object, $attribute);
+    return $date_helper->expiration_date_select($options);        
+}
+
+function select_year() {
+    $date_helper = new DateHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($date_helper, 'select_year'), $args);    
+}
+
+function select_month() {
+    $date_helper = new DateHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($date_helper, 'select_month'), $args);    
+}
+
+function select_day() {
+    $date_helper = new DateHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($date_helper, 'select_day'), $args);    
 }
 

trunk/trax/vendor/trax/action_view/helpers/form_helper.php

@@ -39 +39 @@
             $object = $this->object();
             if(is_object($object) && $this->attribute_name) {
-                $attribute = $this->attribute_name;
-                if(!$value = $object->$attribute) {
-                    $value = $object->send($attribute);
-                }
+                $value = $object->send($this->attribute_name);
             }
         }
@@ -115 +112 @@
 
     function to_text_area_tag($options = array()) {
-        if (isset($options["size"])) {
-            $options["cols"] = reset(explode('x', $options["size"]));
-            $options["rows"] = end(explode('x', $options["size"]));
-            unset($options["size"]);
-        }          
         $options = array_merge($this->default_text_area_options, $options);
-        $options = $this->add_default_name_and_id($options);      
+        $options = $this->add_default_name_and_id($options);
         return $this->error_wrapping($this->content_tag("textarea", htmlspecialchars($this->value()), $options),$this->object()->errors[$this->attribute_name]);
     }

trunk/trax/vendor/trax/action_view/helpers/form_tag_helper.php

@@ -26 +26 @@
 
 
-    private function convert_options($options) {
+    private function convert_options($options = array()) {
         $arr = array('disabled', 'readonly', 'multiple');
         foreach($arr as $a) {
-            $this->boolean_attribute($options, $a);
+            $this->boolean_attribute(&$options, $a);
         }
         return $options;
     }
 
-    private function boolean_attribute($options, $attribute) {
-        if(isset($options[$attribute])) {
+    private function boolean_attribute(&$options, $attribute) {
+        if($options[$attribute]) {
             $options[$attribute] = $attribute;
         } else {
@@ -80 +80 @@
 
     function text_area_tag($name, $content = null, $options = array()) {
-        if (isset($options["size"])) {
+        if ($options["size"]) {
             $options["cols"] = reset(explode('x', $options["size"]));
             $options["rows"] = end(explode('x', $options["size"]));