Changeset 557

Timestamp:

Jul 18, 2013, 7:38:14 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Při zobrazení položky v IS nezobrazuj sloupec s odkazem na viditelný objekt pro podseznamy.

Location:

trunk

Files:

• Modules/IS/IS.php (modified) (7 diffs)
• ToDo.txt (modified) (1 diff)

trunk/Modules/IS/IS.php

@@ -210 +210 @@
     {
       $Output .= $this->ShowList($this->System->FormManager->FormTypes[$Item['Type']]['Table'], '`'.
-        $this->System->FormManager->FormTypes[$Item['Type']]['Ref'].'`='.$Id, $Item['Caption']).'<br/>';
+        $this->System->FormManager->FormTypes[$Item['Type']]['Ref'].'`='.$Id, $Item['Caption'], 
+        $this->System->FormManager->FormTypes[$Item['Type']]['Ref']).'<br/>';
     }    
     return($Output);
   }
   
-  function ShowTable($Table, $Filter = '', $Title = '', $RowActions = array())
+  function ShowTable($Table, $Filter = '', $Title = '', $RowActions = array(), $ExcludeColumn = '')
   {   
-    if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
+        if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
 
@@ -227 +228 @@
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
-          (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
-              ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+      (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
+      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))      
       {
         $UseType = $UseType = $FormItem['Type'];
@@ -253 +254 @@
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
-          (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
-              ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
-      {
-        $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
+      (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
+      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+      {
+        if($ExcludeColumn != $ItemIndex)
+          $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
         $UseType = $UseType = $FormItem['Type'];
         if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
@@ -310 +312 @@
     $Output .= '<tr><form action="?a='.$_GET['a'].'&amp;t='.$Table.'&amp;filter=1'.$Addition.'" method="post">';
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
-          (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
-              ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+    if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
+    ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne'))) and
+    ($ExcludeColumn != $ItemIndex))
     {
       if(array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
@@ -329 +332 @@
       $Output .= '<tr>';
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or 
+      if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or 
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and 
-      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
-      {
-        //$Output .= '<td>'.$Row[$ItemIndex].'</td>';
+      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne'))) and
+      ($ExcludeColumn != $ItemIndex))
+      {
+        //$Output .= '<td>'.$Row[$ItemIndex].'</td>';
         $UseType = $UseType = $FormItem['Type'];
         if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
@@ -376 +380 @@
   }   
   
-  function ShowList($Table, $Filter = '', $Title = '')  
+  function ShowList($Table, $Filter = '', $Title = '', $ExcludeColumn = '')  
   {
     $RowActions = '<a href="?a=view&amp;t='.$Table.'&amp;i=#RowId"><img alt="Ukázat" title="Ukázat" src="'.
@@ -392 +396 @@
           $this->System->Link('/images/action.png').'"/></a>';
     }   
-    $Output = $this->ShowTable($Table, $Filter, $Title, $RowActions);
+    $Output = $this->ShowTable($Table, $Filter, $Title, $RowActions, $ExcludeColumn);
     $Output .= '<ul class="ActionMenu">';
     $Output .= '<li><a href="?a=add&amp;t='.$Table.'"><img alt="Přidat" title="Přidat" src="'.

trunk/ToDo.txt

@@ -21 +21 @@
     # datové položky. 
     # položky globálního nastavení
-    # akce
+    # akce, položky nabídky
     # soubory, ikony
+    # plus libovolné další datové položky jiných modulů
+  * základ systému by měl fungovat i bez databáze, peristenci v datových souborech
 - IS:  
   * Obecný export/import dat (XML, CVS)