Changeset 29 for base.php

Timestamp:

Dec 9, 2008, 1:24:32 PM (16 years ago)

Author:

george

Message:

• Upraveno: Hledání položek v seznamu dle zadaného filtru.

File:

• base.php (modified) (11 diffs)

base.php

@@ -1 +1 @@
 <?php
 
-function ShowList($List, $Column = '', $ColumnValue = 0, $Title = '')
+function ShowList($List, $Column = '', $ColumnValue = 0, $Title = '', $Filter = '')
 {
   global $Database, $Config;
@@ -33 +33 @@
     $FullListLink = '';
   }
+  if($Filter != '') $Where .= ' AND '.$Filter;
 
   // Handle ordering
@@ -53 +54 @@
   //$Where .= ' AND (ValidFromTime <= NOW()) AND ((ValidToTime >= NOW()) OR (ValidToTime IS NULL))';
   $Where .= ' '.$Order;
-  $DbResult = $Database->query('SELECT COUNT(*) AS Count FROM `'.$List['TableName'].'` WHERE 1'.$Where);
+  $DbResult = $Database->query('SELECT COUNT(*) AS Count FROM `'.$List['TableName'].'` WHERE '.$Where);
   $DbRow = $DbResult->fetch_row();
   $TotalItemCount = $DbRow[0];
@@ -177 +178 @@
   (
     'Title' => '',
-    'SubmitBuffonText' => 'Uložit',
+    'SubmitButtonText' => 'Uložit',
     'Items' => $DefinitionItems,
   );
@@ -214 +215 @@
   (
     'Title' => '',
-    'SubmitBuffonText' => 'Uložit',
+    'SubmitButtonText' => 'Uložit',
     'Items' => $DefinitionItems,
   );
@@ -258 +259 @@
   (
     'Title' => '',
-    'SubmitBuffonText' => 'Přidat',
+    'SubmitButtonText' => 'Přidat',
     'Items' => $DefinitionItems,
   );
@@ -299 +300 @@
   (
     'Title' => '',
-    'SubmitBuffonText' => 'Přidat',
+    'SubmitButtonText' => 'Přidat',
     'Items' => $DefinitionItems,
   );
@@ -404 +405 @@
   (
     'Title' => 'Hledání',
-    'SubmitBuffonText' => 'Vyhledat',
+    'SubmitButtonText' => 'Vyhledat',
     'Items' => $DefinitionItems,
   );
@@ -417 +418 @@
 
   if(!CheckPermission('Write', $List['Id'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
-  $System->Modules['Log']->Add($List['Id'], $Id, $LogActionType['Delete']);
-  $System->Modules['DatabaseList']->DeleteItem($List['Id'], $Id);
-  $Output = 'Položka smazána.';
-  $Output .= ShowList($List, $_SESSION['Column'], $_SESSION['ColumnValue']).'<br /><br />';
-  ExecuteListEvent($List['Id'], 'OnDelete', $Id);
-  return($Output);
-
-  $Output = ShowList($List);
+  $DefinitionItems = array();
+  $AfterTableOutput = '';
+  foreach($List['Items'] as $Item)
+  {
+    //echo($Item['Name'].',');
+    $Type = GetTypeDefinition($Item['Type']);
+    if(($Type['BaseType'] != 'PointerOneToMany') and ($Item['Name'] != $Column))
+    {
+      if($Item['Required'] == 1) $Required = '*'; else $Required = '';
+      $DefinitionItems[] = array('Name' => $Item['Name'], 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'].$Required, 'Value' => '', 'SourceTable' => $List['Id'], 'SourceItemId' => 0);
+    } else
+    if($Item['Name'] == $Column)
+    {
+      $DefinitionItems[] = array('Name' => $Column, 'Type' => TypeHiddenId, 'Caption' => '', 'Value' => $ColumnValue);
+    }
+  }
+
+  $Form = new Form();
+  $Form->Definition = array
+  (
+    'Title' => '',
+    'SubmitButtonText' => 'Přidat',
+    'Items' => $DefinitionItems,
+  );
+  $Form->LoadValuesFromForm();
+  $Filter = '1';
+  print_r($Form);
+  foreach($Form->Definition['Items'] as $Item)
+  {
+    //if($Item['Editable'] == 1)
+    {
+      //echo($Item['Name'].',');
+      $Type = GetTypeDefinition($Item['Type']);
+      $TypeObject = $Type['Class'];
+      $Filter .= ' AND (`'.$Item['Name'].'` LIKE '.$TypeObject->DatabaseEscape($Form->Values[$Item['Name']]).')';
+    }
+  }
+  echo('d'.$Filter.'d');
+  $Output = ShowList($List, $_SESSION['Column'], $_SESSION['ColumnValue'], '', $Filter).'<br /><br />';
   return($Output);
 }
@@ -476 +508 @@
         case 'ShowSearch':
           $Output = ShowSearch($List);
+          break;
+        case 'Search':
+          $Output = Search($List);
           break;
         case 'EditItem':
@@ -620 +655 @@
 
   $Result = FALSE;
-  //return(TRUE);
+  return(TRUE);
   $DbResult = $Database->query('SELECT t1.* FROM `Permission` AS t1 WHERE t1.PermissionGroup = (SELECT PermissionGroup.Id FROM PermissionGroup WHERE PermissionGroup.Id=(SELECT User.PermissionGroup FROM User WHERE User.Id='.$System->Modules['User']->User['Id'].')) AND t1.List='.$ListId);
   if($DbResult->num_rows > 0)