Changeset 434

Timestamp:

Oct 12, 2012, 9:03:30 AM (12 years ago)

Author:

chronos

Message:

• Přidáno: Zobrazení vztahů ManyToOne.

Location:

trunk

Files:

• form_classes.php (modified) (2 diffs)
• forms.php (modified) (3 diffs)
• is/index.php (modified) (7 diffs)

trunk/form_classes.php

@@ -84 +84 @@
       'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => ''),
       'PermanentOnline' => array('Type' => 'Boolean', 'Caption' => 'Běží stále', 'Default' => '0'),
+      'Interfaces' => array('Type' => 'TInterfaceList', 'Caption' => 'Rozhraní', 'Default' => ''),
     ),
   ),
@@ -439 +440 @@
     'Filter' => '1',
   ),
+  'TInterfaceList' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkInterface',
+    'Id' => 'Id',
+    'Ref' => 'Device',
+    'Filter' => '1',
+  ),
 );
 

trunk/forms.php

@@ -26 +26 @@
     );
     foreach($this->Definition['Items'] as $Index => $Item)
+    if(!array_key_exists($Item['Type'], $FormTypes) or 
+    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
@@ -64 +66 @@
     if($Context != '') $Context = $Context.'-';
     foreach($this->Definition['Items'] as $Index => $Item)
+    if(!array_key_exists($Item['Type'], $FormTypes) or 
+    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
@@ -154 +158 @@
   function LoadValuesFromDatabase($Id)
   {
-    global $Database;
+    global $Database, $FormTypes;
 
     $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
     $DbRow = $DbResult->fetch_array();
     foreach($this->Definition['Items'] as $Index => $Item)
+    if(!array_key_exists($Item['Type'], $FormTypes) or 
+    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       $this->Values[$Index] = $DbRow[$Index];

trunk/is/index.php

@@ -33 +33 @@
     if(!array_key_exists('Action', $_SESSION)) $_SESSION['Action'] = 'list';
     
-    if($_SESSION['Action'] == 'list') $Output .= $this->ShowList();
+    if($_SESSION['Action'] == 'list') $Output .= $this->ShowList($_SESSION['Table']);
     else if($_SESSION['Action'] == 'edit') $Output .= $this->ShowEdit();
     else if($_SESSION['Action'] == 'add') $Output .= $this->ShowAdd();
@@ -115 +115 @@
   function ShowView()
   {
+    global $FormTypes;
+    
     $Form = new Form($_SESSION['Table']);
     $Form->LoadValuesFromDatabase($_SESSION['Id']);
@@ -126 +128 @@
     $Output .= '<a href="?a=delete"><img alt="Odstranit" title="Odstranit" src="'.
       $this->System->Link('/images/delete.png').'" onclick="return confirmAction(\'Opravdu smazat položku?\');"/></a>';
-    $Output .= '</div>';
-    return($Output);
-  }
-  
-  function ShowList()
+    $Output .= '</div><br/>';
+    
+    // Show ManyToOne relations
+    foreach($Form->Definition['Items'] as $Index => $Item)
+    if((array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
+    {
+      $Output .= '<div style="text-align: center;">'.$Form->Definition['Title'].'</div>';
+      $Output .= $this->ShowList($FormTypes[$Item['Type']]['Table'], '`'.$FormTypes[$Item['Type']]['Ref'].'`='.$_SESSION['Id']).'<br/>';
+    }    
+    return($Output);
+  }
+  
+  function ShowList($Table, $Filter = '')
   {   
     global $Type, $FormTypes, $FormClasses;
     
-    if(array_key_exists('Table', $_SESSION))
-      $FormClass = $FormClasses[$_SESSION['Table']];
+    if($Table != '') $FormClass = $FormClasses[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$FormClass['Table'].'`');
+    if($Filter != '') $Filter = ' WHERE '.$Filter;
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$FormClass['Table'].'`'.$Filter);
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);    
@@ -145 +155 @@
    
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+    if(!array_key_exists($FormItem['Type'], $FormTypes) or 
+      (array_key_exists($FormItem['Type'], $FormTypes) and ($FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
     $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
@@ -152 +164 @@
     $Output .= $Order['Output'];
 
-    $Query = 'SELECT * FROM `'.$FormClass['Table'].'` '.$Order['SQL'].$PageList['SQLLimit'];
+    $Query = 'SELECT * FROM `'.$FormClass['Table'].'`'.$Filter.' '.$Order['SQL'].$PageList['SQLLimit'];
     
     $DbResult = $this->Database->query($Query);
@@ -159 +171 @@
       $Output .= '<tr>';
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+      if(!array_key_exists($FormItem['Type'], $FormTypes) or 
+      (array_key_exists($FormItem['Type'], $FormTypes) and ($FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       {
         //$Output .= '<td>'.$Row[$ItemIndex].'</td>';
@@ -166 +180 @@
             $this->System->Type->RegisterType($FormItem['Type'], '', 
               $FormTypes[$FormItem['Type']]);
-          $Output .= '<td>'.$this->System->Type->ExecuteTypeEvent('OneToMany', 'OnView', 
+          $Value = $this->System->Type->ExecuteTypeEvent('OneToMany', 'OnView', 
             array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex, 
-            'Type' => $FormItem['Type'])).'</td>';
-        } else $Output .= '<td>'.$this->System->Type->ExecuteTypeEvent($FormItem['Type'], 'OnView', 
-          array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex)).'</td>';
+            'Type' => $FormItem['Type']));
+        } else $Value = $this->System->Type->ExecuteTypeEvent($FormItem['Type'], 'OnView', 
+          array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex));
+        if($Value == '') $Value = '&nbsp;';
+        $Output .= '<td>'.$Value.'</td>';
       }
-      $Output .= '<td><a href="?a=view&amp;id='.$Row['Id'].'"><img alt="Ukázat" title="Ukázat" src="'.
+      $Output .= '<td><a href="?a=view&amp;t='.$Table.'&amp;id='.$Row['Id'].'"><img alt="Ukázat" title="Ukázat" src="'.
         $this->System->Link('/images/view.png').'"/></a>'.
-        '<a href="?a=edit&amp;id='.$Row['Id'].'"><img alt="Upravit" title="Upravit" src="'.
+        '<a href="?a=edit&amp;t='.$Table.'&amp;id='.$Row['Id'].'"><img alt="Upravit" title="Upravit" src="'.
         $this->System->Link('/images/edit.png').'"/></a>'.
-        '<a href="?a=delete&amp;id='.$Row['Id'].'"><img alt="Smazat" title="Smazat" src="'.
+        '<a href="?a=delete&amp;t='.$Table.'&amp;id='.$Row['Id'].'"><img alt="Smazat" title="Smazat" src="'.
         $this->System->Link('/images/delete.png').'" onclick="return confirmAction(\'Opravdu smazat položku?\');"/></a></td>';
       $Output .= '</tr>';