Changeset 455

Timestamp:

Oct 30, 2012, 6:51:08 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Pokud je položky v databázi typu čas nastavena na NULL, tak ji zobrazuj jako prázdnou ve výpisech.

Location:

trunk/Common

Files:

• Global.php (modified) (2 diffs)
• Types/Date.php (modified) (2 diffs)
• Types/DateTime.php (modified) (1 diff)
• Types/Time.php (modified) (1 diff)

trunk/Common/Global.php

@@ -277 +277 @@
 }
 
-function MysqlDateTimeToTime($Time)
-{
-  $Parts = explode(' ', $Time);
+function MysqlDateTimeToTime($DateTime)
+{
+  if($DateTime == '') return(0);      
+  $Parts = explode(' ', $DateTime);
   $DateParts = explode('-', $Parts[0]); 
   $TimeParts = explode(':', $Parts[1]);
@@ -286 +287 @@
 }
 
-function MysqlDateToTime($Time)
-{
-  return(MysqlDateTimeToTime($Time.' 0:0:0'));  
+function MysqlDateToTime($Date)
+{
+  if($Date == '') return(0);
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));  
 }
 
 function MysqlTimeToTime($Time)
 {
+  if($Time == '') return(0);
   return(MysqlDateTimeToTime('0000-00-00 '.$Time));  
 }

trunk/Common/Types/Date.php

@@ -11 +11 @@
     global $MonthNames;
 
+    if($Item['Value'] == 0) return('');
     if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
@@ -25 +26 @@
     $Parts = getdate($Item['Value']);
 
+    $Output = '';
+    //if($Item['Value'] == '') $Checked = ' checked="1"'; else $Checked = '';
+    //$Output .= '<input type="checkbox" name="'.$Item['Name'].'-null"'.$Checked.'/>';
+
     // Day
-    $Output = '<select name="'.$Item['Name'].'-day">';
+    $Output .= '<select name="'.$Item['Name'].'-day">';
     for($I = 1; $I <= 31; $I++)
     {

trunk/Common/Types/DateTime.php

@@ -11 +11 @@
     global $MonthNames;
     
+    if($Item['Value'] == 0) return('');
     if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);

trunk/Common/Types/Time.php

@@ -9 +9 @@
   function OnView($Item)
   {
+    if($Item['Value'] == 0) return('');
     if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $TimeParts = getdate($Item['Value']);