Changeset 1364

Timestamp:

12/29/11 14:43:18 (18 months ago)

Author:

alex94040

Message:

Fixes #734 (QDatepickerBox: default to NULL date). Code by vakopian, review by alex94040.

Files:

• framework/branches/2.0/includes/qcubed/_core/base_controls/QDatepickerBoxBase.class.php (modified) (6 diffs)

framework/branches/2.0/includes/qcubed/_core/base_controls/QDatepickerBoxBase.class.php

@@ -1 +1 @@
 <?php
-    /**
+
+        /**
          * @property string $DateFormat
          * @property string $DateTimeFormat
@@ -8 +9 @@
          *
          */
-        class QDatepickerBoxBase extends QDatepickerBoxGen
-        {
-                protected $strDateTimeFormat = "MM/DD/YY";      // matches default of JQuery UI control
+        class QDatepickerBoxBase extends QDatepickerBoxGen {
+                protected $strDateTimeFormat = "MM/DD/YY"; // matches default of JQuery UI control
+                /** @var QDateTime */
                 protected $dttDateTime;
 
-        public function ParsePostData() {
-            // Check to see if this Control's Value was passed in via the POST data
-            if (array_key_exists($this->strControlId, $_POST)) {
-                parent::ParsePostData();
-                $this->dttDateTime = new QDateTime($this->strText);
-            }
-        }
+                public function ParsePostData() {
+                        // Check to see if this Control's Value was passed in via the POST data
+                        if (array_key_exists($this->strControlId, $_POST)) {
+                                parent::ParsePostData();
+                                $this->dttDateTime = new QDateTime($this->strText);
+                                if ($this->dttDateTime->IsNull()) {
+                                        $this->dttDateTime = null;
+                                }
+                        }
+                }
 
                 public function Validate() {
@@ -57 +61 @@
                         switch ($strName) {
                                 // MISC
-                                case "Maximum": return $this->MaxDate;
-                                case "Minimum": return $this->MinDate;
+                                case "Maximum":
+                                        return $this->MaxDate;
+                                case "Minimum":
+                                        return $this->MinDate;
                                 case 'DateTimeFormat':
-                                case 'DateFormat': return $this->strDateTimeFormat;
-                                case 'DateTime': return $this->dttDateTime;
+                                case 'DateFormat':
+                                        return $this->strDateTimeFormat;
+                                case 'DateTime':
+                                        return $this->dttDateTime;
 
                                 default:
@@ -72 +80 @@
                         }
                 }
+
                 /////////////////////////
                 // Public Properties: SET
@@ -98 +107 @@
                                         try {
                                                 $this->dttDateTime = QType::Cast($mixValue, QType::DateTime);
+                                                if ($this->dttDateTime->IsNull()) {
+                                                        $this->dttDateTime = null;
+                                                }
                                                 if (!$this->dttDateTime || !$this->strDateTimeFormat) {
                                                         parent::__set('Text', '');
@@ -150 +162 @@
                 }
         }
+
 ?>