Changeset 1464

Timestamp:

12/08/07 02:01:13 (8 months ago)

Author:

Shadowhand

Message:

Updated Forge:

• Dateselect handles AM/PM properly now
  
• Dateselect can now be overloaded to change format (almost)
  
• updated /forge_demo
  

Files:

• trunk/modules/forge/controllers/forge_demo.php (modified) (2 diffs)
• trunk/modules/forge/libraries/Form_Dateselect.php (modified) (3 diffs)
• trunk/modules/forge/libraries/Form_Input.php (modified) (1 diff)
• trunk/system/helpers/date.php (modified) (1 diff)

trunk/modules/forge/controllers/forge_demo.php

@@ -23 +23 @@
-                $form->input('username')->label(TRUE)->rules('required|length[5,32]');
-                $form->password('password')->label(TRUE)->rules('required|length[5,32]');
-
+->matches($form->password)
-                $form->checkbox('remember')->label('Remember Me');
-                $form->checklist('foods')->label('Favorite Foods')->options($foods)->rules('required');
-                $form->dropdown('state')->label('Home State')->options(locale_US::states())->rules('required');
-value(time()
+minutes(5
-                $form->submit('Save');
-
-                $form->confirm->matches($form->password);
-
-                if ($form->validate())
@@ -40 +38 @@
-        }
-
+        public function bench()
+        {
+                Benchmark::start('using_array');
+                $output = array();
+                for ($i = 0; $i < 1000; $i++)
+                {
+                        $output[] = ($i % 2 == 0) ? 'a' : 'b';
+                }
+                $output = implode('', $output);
+                $array = Benchmark::get('using_array');
+
+                unset($i, $output);
+
+                Benchmark::start('using_string');
+                $output = '';
+                for ($i = 0; $i < 1000; $i++)
+                {
+                        $output .= ($i % 2 == 0) ? 'a' : 'b';
+                }
+
+                $string = Benchmark::get('using_string');
+
+                echo Kohana::debug('imploded array: ', $array, 'string append: ', $string);
+        }
+
-} // End

trunk/modules/forge/libraries/Form_Dateselect.php

@@ -11 +11 @@
-        protected $protect = array('type');
-
+        // Precision for the parts, you can use @ to insert a literal @ symbol
+        protected $parts = array
+        (
+                'month'   => NULL,
+                'day'     => 1,
+                'year'    => NULL,
+                ' @ ',
+                'hour'    => NULL,
+                ':',
+                'minute'  => 5,
+                'am_pm'   => NULL,
+        );
+
-        public function __construct($name)
-        {
@@ -20 +33 @@
-        }
-
+        public function __call($method, $args)
+        {
+                if (isset($this->parts[substr($method, 0, -1)]))
+                {
+                        // Set options for date generation
+                        $this->parts[substr($method, 0, -1)] = $args[0];
+                        return $this;
+                }
+
+                return parent::__call($method, $args);
+        }
+
-        public function html_element()
-        {
-                // Import base data
-
-
+
-
-                // Get the options and default selection
-base_
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        protected function time_array($timestamp)
-        {
-
+
+
-                        array('month', 'day', 'year', 'hour', 'minute', 'am_pm'), 
-
+
+
-
-                // Minutes should always be in 5 minute increments
-5
+$this->parts['minute']
-
-                return $time;
@@ -61 +118 @@
-                $this->data['value'] = mktime
-                (
-
-
+
-                        $time['minute'],
-                        0,
-                        $time['month'],
-                        $time['day'],
-
+
+
-        }
-

trunk/modules/forge/libraries/Form_Input.php

@@ -104 +104 @@
-                if ($val === NULL)
-                {
-
+
+
+
+
-                }
-                else

trunk/system/helpers/date.php

@@ -202 +202 @@
-
-        /**
+         * Adjusts a non-24-hour number into a 24-hour number.
+         *
+         * @param   integer  hour to adjust
+         * @param   string   AM or PM
+         * @return  string
+         */
+        public static function adjust($hour, $ampm)
+        {
+                $hour = (int) $hour;
+                $ampm = strtolower($ampm);
+
+                switch($ampm)
+                {
+                        case 'am':
+                                if ($hour == 12)
+                                        $hour = 0;
+                        break;
+                        case 'pm':
+                                if ($hour < 12)
+                                        $hour += 12;
+                        break;
+                }
+
+                return sprintf('%02s', $hour);
+        }
+
+        /**
-         * Method: days
-         *  Number of days in month.