Changeset 843

Timestamp:

Jan 1, 2017, 5:03:41 PM (8 years ago)

Author:

chronos

Message:

• Added: Show sub-lists in IS item view as multiple subtabs to avoid always loading all subtables at once.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (2 diffs)
• style/new/style.css (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 838; // Subversion revision
+$Revision = 844; // Subversion revision
 $DatabaseRevision = 838; // SQL structure revision
-$ReleaseTime = strtotime('2016-09-18');
+$ReleaseTime = strtotime('2017-01-01');

trunk/Modules/IS/IS.php

@@ -358 +358 @@
     return($Output);
   }
+  
+  function ShowTabs($Tabs, $QueryParamName, $TabContent)
+  {
+        $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
+        
+    if(array_key_exists($QueryParamName, $_GET)) $TabIndex = $_GET[$QueryParamName];
+      else $TabIndex = 0;
+
+    $Output = '<div class="Tab">'.
+      '<ul>';
+    foreach($Tabs as $Index => $Tab)
+    {
+      $QueryItems[$QueryParamName] = $Index;
+      if($Index == $TabIndex) $Selected = ' id="selected"';
+        else $Selected = '';
+      $Output .= '<li'.$Selected.'><a href="?'.SetQueryStringArray($QueryItems).'">'.$Tab.'</a></li>';
+    }
+    $Output .= '</ul></div><div class="TabContent">'.$TabContent.'</div>';
+    return($Output);
+  }
 
   function ShowView($Table, $Id, $WithoutActions = false)
@@ -379 +399 @@
     if($WithoutActions == false)
     {
-    $Actions = array(
-      $this->ShowAction('Upravit', '?a=edit&amp;t='.$TableModify.'&amp;i='.$Id,
-        $this->System->Link('/images/edit.png')),
-      $this->ShowAction('Seznam', '?a=list&amp;t='.$Table,
-        $this->System->Link('/images/list.png')),
-      $this->ShowAction('Odstranit', '?a=delete&amp;t='.$Table.'&amp;i='.$Id,
-        $this->System->Link('/images/delete.png'), 'Opravdu smazat položku?'),
-      $this->ShowAction('Přidat', '?a=add&amp;t='.$TableModify,
-        $this->System->Link('/images/add.png'))
-    );
-    if(array_key_exists('ItemActions', $FormClass))
-    {
-      foreach($FormClass['ItemActions'] as $Action)
-      {
-        $URL = str_replace('#RowId', $Id, $this->System->Link($Action['URL']));
-        $Actions[] = $this->ShowAction($Action['Caption'], $URL,
-          $this->System->Link('/images/action.png'));
-      }
-    }
-    $Output .= '<ul class="ActionMenu">';
-    foreach($Actions as $Action)
-    {
-      $Output .= '<li>'.$Action.'</li>';
-    }
-    $Output .= '</ul><br/>';
+      $Actions = array(
+        $this->ShowAction('Upravit', '?a=edit&amp;t='.$TableModify.'&amp;i='.$Id,
+          $this->System->Link('/images/edit.png')),
+        $this->ShowAction('Seznam', '?a=list&amp;t='.$Table,
+          $this->System->Link('/images/list.png')),
+        $this->ShowAction('Odstranit', '?a=delete&amp;t='.$Table.'&amp;i='.$Id,
+          $this->System->Link('/images/delete.png'), 'Opravdu smazat položku?'),
+        $this->ShowAction('Přidat', '?a=add&amp;t='.$TableModify,
+          $this->System->Link('/images/add.png'))
+      );
+      if(array_key_exists('ItemActions', $FormClass))
+      {
+        foreach($FormClass['ItemActions'] as $Action)
+        {
+          $URL = str_replace('#RowId', $Id, $this->System->Link($Action['URL']));
+          $Actions[] = $this->ShowAction($Action['Caption'], $URL,
+            $this->System->Link('/images/action.png'));
+        }
+      }
+      $Output .= '<ul class="ActionMenu">';
+      foreach($Actions as $Action)
+      {
+        $Output .= '<li>'.$Action.'</li>';
+      }
+      $Output .= '</ul><br/>';
+    }
 
     // Show ManyToOne relations
+    $Tabs = array();
     foreach($Form->Definition['Items'] as $Index => $Item)
     if((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
     ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
     {
-      $Output .= $this->ShowList($this->System->FormManager->FormTypes[$Item['Type']]['Table'], '`'.
-        $this->System->FormManager->FormTypes[$Item['Type']]['Ref'].'`='.$Id, $Item['Caption'],
-        $this->System->FormManager->FormTypes[$Item['Type']]['Ref'], $Id).'<br/>';
-    }
-    }
+          $Tabs[] = $Item['Caption'];
+    }
+    $Tabs[] = 'Vše';
+    if(array_key_exists('tab', $_GET)) $TabIndex = $_GET['tab'];
+      else $TabIndex = 0;
+    
+    $TabContent = '';
+    $I = 0;
+    foreach($Form->Definition['Items'] as $Index => $Item)
+    if((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
+    ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
+    {
+          $TypeItem = $this->System->FormManager->FormTypes[$Item['Type']];
+      if (($TabIndex == $I) or ($TabIndex == (count($Tabs) - 1)))
+      { 
+        $TabContent .= $this->ShowList($TypeItem['Table'], '`'.
+          $TypeItem['Ref'].'`='.$Id, $Item['Caption'],
+          $TypeItem['Ref'], $Id).'<br/>';
+          }
+          $I++;
+        }
+
+    $Output .= $this->ShowTabs($Tabs, 'tab', $TabContent);
     return($Output);
   }

trunk/style/new/style.css

@@ -468 +468 @@
   text-align: center;
 }
+
+.Tab
+{
+}
+
+.Tab ul 
+{
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+    
+.Tab li 
+{
+  float: left;
+  border: 1px solid #bbb;
+  border-bottom-width: 0;
+  margin: 0;
+}
+    
+.Tab a 
+{
+  text-decoration: none;
+  display: block;
+  background: #eee;
+  padding: 0.24em 1em;
+  text-align: center;
+}
+  
+.Tab a:hover 
+{
+  background: #fdd;
+}
+  
+.Tab #selected 
+{
+  border-color: black;
+}
+  
+.Tab #selected a 
+{
+  position: relative;
+  top: 1px;
+  background: white;
+  font-weight: bold;
+}
+
+.TabContent
+{
+  border: 1px solid black;
+  clear: both;
+  padding: 5px;
+}