Changeset 5

Timestamp:

Sep 15, 2008, 10:44:29 PM (16 years ago)

Author:

george

Message:

• Upraveno: Definice typů přesunuty do databáze tabulky SystemType. Funkční pro každý typ je řešena jako samostatný soubor v podsložce types se stejným jménem jako je jméno typu.

Files:

• base.php (modified) (6 diffs)
• index.php (modified) (1 diff)
• types (added)
• types.php (deleted)
• types/Boolean.php (added)
• types/Date.php (added)
• types/Enumeration.php (added)
• types/Integer.php (added)
• types/Password.php (added)
• types/PointerOneToMany.php (added)
• types/PointerOneToOne.php (added)
• types/String.php (added)

base.php

@@ -4 +4 @@
 include('lists.php');
 include('common.php');
+
+// Include type definitions
+include('types/Enumeration.php');
+include('types/Boolean.php');
+include('types/Integer.php');
+include('types/String.php');
+include('types/PointerOneToMany.php');
+include('types/PointerOneToOne.php');
+include('types/Date.php');
+include('types/Password.php');
 
 function ShowList($List, $Column = '', $ParentId = 0)
@@ -54 +64 @@
         $Type = $Types[$ItemType[0]];
         if(count($ItemType) > 1) $Type['Parameter'] = $ItemType[1];
-        if(is_callable($Type['ViewHtml'])) $Value = $Type['ViewHtml']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
-        else $Value = $Type['ViewHtml'];
+        if(is_callable($Type['CallbackView'])) $Value = $Type['CallbackView']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
+        else $Value = $Type['CallbackView'];
         $Value = str_replace('%value%', $DbRow[$Index], $Value);
         $Output .= '<td>'.$Value.'</td>';
@@ -84 +94 @@
         $Type = $Types[$ItemType[0]];
         if(count($ItemType) > 1) $Type['Parameter'] = $ItemType[1];
-        if(is_callable($Type['EditHtml'])) $Value = $Type['EditHtml']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
-        else $Value = $Type['EditHtml'];
+        if(is_callable($Type['CallbackEdit'])) $Value = $Type['CallbackEdit']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
+        else $Value = $Type['CallbackEdit'];
         $Value = str_replace('%value%', $DbRow[$Index], $Value);
         $Value = str_replace('%name%', $Index, $Value);
@@ -131 +141 @@
       $Type = $Types[$ItemType[0]];
       if(count($ItemType) > 1) $Type['Parameter'] = $ItemType[1];
-      if(is_callable($Type['EditHtml'])) $Value = $Type['EditHtml']($Type, $Type['InitValue'], $List['TableName'], 0);
-      else $Value = $Type['EditHtml'];
+      if(is_callable($Type['CallbackEdit'])) $Value = $Type['CallbackEdit']($Type, $Type['InitValue'], $List['TableName'], 0);
+      else $Value = $Type['CallbackEdit'];
       $Value = str_replace('%value%', $Type['InitValue'], $Value);
       $Value = str_replace('%name%', $Index, $Value);
@@ -180 +190 @@
         $Type = $Types[$ItemType[0]];
         if(count($ItemType) > 1) $Type['Parameter'] = $ItemType[1];
-        if(is_callable($Type['ViewHtml'])) $Value = $Type['ViewHtml']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
-        else $Value = $Type['ViewHtml'];
+        if(is_callable($Type['CallbackView'])) $Value = $Type['CallbackView']($Type, $DbRow[$Index], $List['TableName'], $DbRow['Id']);
+        else $Value = $Type['CallbackView'];
         $Value = str_replace('%value%', $DbRow[$Index], $Value);
         $Output .= '<tr><td>'.$Item['TextBefore'].':</td><td title="'.$Item['Help'].'">'.$Value.'</td></tr>';
@@ -297 +307 @@
 }
 
+function LoadTypeDefinition()
+{
+  global $Database, $Types;
+
+  $Types = array();
+  $DbResult = $Database->select('SystemType', '*');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $DbRow['Parameters'] = explode('|', $DbRow['Parameters']);
+    $Types[$DbRow['Name']] = $DbRow;
+  }
+
+  // Merge parent type definition
+  foreach($Types as $Index => $Type)
+  {
+    if($Type['ParentType'] != '')
+    {
+      foreach($Type as $Index2 => $Item)
+        if($Item == '') 
+      {
+        $Types[$Index][$Index2] = $Types[$Type['ParentType']][$Index2];
+      }
+    }
+  }
+  //print_r($Types);
+}
+
 ?>

index.php

@@ -16 +16 @@
     </head><body><table class="base"><tr><td class="menu">';
 
+LoadTypeDefinition();
 LoadListDefinition();
 $Output .= $Output;