Changeset 433

Timestamp:

Oct 12, 2012, 8:27:30 AM (12 years ago)

Author:

chronos

Message:

• Přidáno: Možnost mazat položky.
• Přidáno: Přidávání a změna hodnot položek.

Files:

• branches/Modular/Modules/System/System.php (modified) (2 diffs)
• trunk/form_classes.php (modified) (2 diffs)
• trunk/forms.php (modified) (1 diff)
• trunk/images/list.png (added)
• trunk/is/index.php (modified) (6 diffs)
• trunk/style/new/global.js (modified) (1 diff)
• trunk/style/simple/global.js (modified) (1 diff)

branches/Modular/Modules/System/System.php

@@ -118 +118 @@
 class ModuleSystem extends Module
 {
+  var $InstalledChecked;
+        
   function __construct($Database, $System)
   {
@@ -216 +218 @@
   function IsInstalled()
   {
-    $DbResult = $this->Database->query('SELECT table_name FROM information_schema.tables
+    if($this->InstalledChecked == false)
+    {
+      $DbResult = $this->Database->query('SELECT table_name FROM information_schema.tables
 WHERE table_schema = "'.$this->Database->Database.'" AND table_name = "SystemVersion";');    
-    if($DbResult->num_rows > 0) return(true); 
-      else return(false);
+      if($DbResult->num_rows > 0) $this->Installed = true;
+        else $this->Installed = false;
+      $this->InstalledChecked = true;
+    }
+    return($this->Installed); 
   }
   

trunk/form_classes.php

@@ -2 +2 @@
 
 $FormClasses = array(
+  'FinanceTreasury' => array(
+    'Title' => 'Pokladny',
+    'Table' => 'FinanceTreasury',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
+    ),
+  ),
+  'FinanceBankAccount' => array(
+    'Title' => 'Účty',
+    'Table' => 'FinanceBankAccount',
+    'DefaultSortColumn' => 'Comment',
+    'Items' => array(
+      'Comment' => array('Type' => 'String', 'Caption' => 'Komentář', 'Default' => ''),
+      'Number' => array('Type' => 'String', 'Caption' => 'Číslo', 'Default' => ''),
+      'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
+    ),
+  ),
   'Country' => array(
     'Title' => 'Země',
@@ -19 +38 @@
       'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
       'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-      'LastIP' => array('Type' => 'String', 'Caption' => 'Poslední IP adresy', 'Default' => ''),
+      'LastIpAddress' => array('Type' => 'String', 'Caption' => 'Poslední IP adresy', 'Default' => ''),
       'LastLoginTime' => array('Type' => 'DateTime', 'Caption' => 'Poslední čas přihlášení', 'Default' => ''),
       'RegistrationTime' => array('Type' => 'DateTime', 'Caption' => 'Čas registrace', 'Default' => ''),

trunk/forms.php

@@ -193 +193 @@
     {
       $this->Values['Id'] = $Id;
-      $DbResult = $Database->replace($this->Definition['Table'], $this->Values);
+      $DbResult = $Database->insert($this->Definition['Table'], $this->Values);
     } else
     $DbResult = $Database->update($this->Definition['Table'], 'Id='.$Id, $this->Values);

trunk/is/index.php

@@ -30 +30 @@
     if(array_key_exists('a', $_GET)) $_SESSION['Action'] = $_GET['a'];
     if(array_key_exists('id', $_GET)) $_SESSION['Id'] = $_GET['id'];
-    
-    if($_SESSION['Action'] == 'list')
-    {
-      if(array_key_exists('Table', $_SESSION))
-        $Output .= $this->ShowList($FormClasses[$_SESSION['Table']]);
-    } else
-    if($_SESSION['Action'] == 'edit') $Output .= $this->ShowEdit();
+       
+    if(!array_key_exists('Action', $_SESSION)) $_SESSION['Action'] = 'list';
+    
+    if($_SESSION['Action'] == 'list') $Output .= $this->ShowList();
+    else if($_SESSION['Action'] == 'edit') $Output .= $this->ShowEdit();
     else if($_SESSION['Action'] == 'add') $Output .= $this->ShowAdd();
     else if($_SESSION['Action'] == 'view') $Output .= $this->ShowView();
@@ -47 +45 @@
   function ShowEdit()
   {
-    $Form = new Form($_SESSION['Table']);
-    $Form->LoadValuesFromDatabase($_SESSION['Id']);
-    $Form->OnSubmit = '?a=view';
-    $Output = $Form->ShowEditForm();
+    $Output = '';
+    if(array_key_exists('o', $_GET))
+    {
+      if($_GET['o'] == 'save')
+      {
+        $Form = new Form($_SESSION['Table']);
+        $Form->LoadValuesFromForm();
+        $Form->SaveValuesToDatabase($_SESSION['Id']);
+        $Output .= $this->SystemMessage('Úprava položky', 'Položka upravena');
+        $_SESSION['Action'] = 'view';
+        $Output .= $this->ShowView();   
+      }
+    } else 
+    {
+      $Form = new Form($_SESSION['Table']);
+      $Form->LoadValuesFromDatabase($_SESSION['Id']);
+      $Form->OnSubmit = '?a=edit&o=save';
+      $Output .= $Form->ShowEditForm();
+      $Output .= '<br/><div style="text-align: center;">';
+      $Output .= '<a href="?a=view"><img alt="Prohlížet" title="Prohlížet" src="'.
+      $this->System->Link('/images/view.png').'"/></a>';
+      $Output .= '<a href="?a=list"><img alt="Seznam" title="Seznam" src="'.
+        $this->System->Link('/images/list.png').'"/></a>';
+      $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);
   }
@@ -57 +78 @@
   {
     $Output = '';
+    $this->Database->delete($_SESSION['Table'], 'Id='.$_SESSION['Id']);
+    $Output .= $this->SystemMessage('Odstranění položky', 'Položka odstraněna');
+    $_SESSION['Action'] = 'list';
+    $Output .= $this->ShowList();   
     return($Output);
   }
@@ -62 +87 @@
   function ShowAdd()
   {
-    $Form = new Form($_SESSION['Table']);
-    $Form->OnSubmit = '?a=view';
-    $Output = $Form->ShowEditForm();
+    $Output = '';
+    if(array_key_exists('o', $_GET))
+    {
+      if($_GET['o'] == 'save')
+      {
+        $Form = new Form($_SESSION['Table']);
+        $Form->LoadValuesFromForm();
+        $Form->SaveValuesToDatabase(0);
+        $Output .= $this->SystemMessage('Přidání položky', 'Nová položka vytvořena');
+        $_SESSION['Action'] = 'view';
+        $_SESSION['Id'] = $this->Database->insert_id;
+        $Output .= $this->ShowView();   
+      }
+    } else 
+    {
+      $Form = new Form($_SESSION['Table']);
+      $Form->OnSubmit = '?a=add&amp;o=save';
+      $Output .= $Form->ShowEditForm();
+      $Output .= '<br/><div style="text-align: center;">';
+      $Output .= '<a href="?a=list"><img alt="Seznam" title="Seznam" src="'.
+        $this->System->Link('/images/list.png').'"/></a>';
+      $Output .= '</div>';
+    }
     return($Output);
   }
@@ -74 +119 @@
     $Form->OnSubmit = '?a=view';
     $Output = $Form->ShowViewForm();
-    $Output .= '<br/><div style="text-align: center;"><a href="?a=edit"><img alt="Upravit" title="Upravit" src="'.
-        $this->System->Link('/images/edit.png').'"/></a></div>';
-    return($Output);
-  }
-  
-  function ShowList($FormClass)
+    $Output .= '<br/><div style="text-align: center;">';
+    $Output .= '<a href="?a=edit"><img alt="Upravit" title="Upravit" src="'.
+      $this->System->Link('/images/edit.png').'"/></a>';
+    $Output .= '<a href="?a=list"><img alt="Seznam" title="Seznam" src="'.
+      $this->System->Link('/images/list.png').'"/></a>';
+    $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()
   {   
-    global $Type, $FormTypes;
-    
+    global $Type, $FormTypes, $FormClasses;
+    
+    if(array_key_exists('Table', $_SESSION))
+      $FormClass = $FormClasses[$_SESSION['Table']];
+      else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$FormClass['Table'].'`');
     $DbRow = $DbResult->fetch_row();
@@ -123 +177 @@
         $this->System->Link('/images/edit.png').'"/></a>'.
         '<a href="?a=delete&amp;id='.$Row['Id'].'"><img alt="Smazat" title="Smazat" src="'.
-        $this->System->Link('/images/delete.png').'"/></a></td>';
+        $this->System->Link('/images/delete.png').'" onclick="return confirmAction(\'Opravdu smazat položku?\');"/></a></td>';
       $Output .= '</tr>';
     }
     $Output .= '</table>';
     $Output .= $PageList['Output'];
-    $Output .= '<br/><div style="text-align: center;"><a href="?a=add"><img alt="Přidat" title="Přidat" src="'.
-        $this->System->Link('/images/add.png').'"/></a></div>';
+    $Output .= '<br/><div style="text-align: center;">';
+    $Output .= '<a href="?a=add"><img alt="Přidat" title="Přidat" src="'.
+        $this->System->Link('/images/add.png').'"/></a>';
+    $Output .= '</div>';
     return($Output);
   }

trunk/style/new/global.js

@@ -24 +24 @@
   }
 }
+
+function confirmAction(theMessage)
+{
+  // TODO: Confirmation is not required in the configuration file
+  // or browser is Opera (crappy js implementation)
+  if (typeof(window.opera) != 'undefined') 
+  {
+    return true;
+  }
+
+  var is_confirmed = confirm(theMessage);
+
+  return is_confirmed;
+}

trunk/style/simple/global.js

@@ -24 +24 @@
   }
 }
+
+function confirmAction(theMessage)
+{
+  // TODO: Confirmation is not required in the configuration file
+  // or browser is Opera (crappy js implementation)
+  if (typeof(window.opera) != 'undefined') 
+  {
+    return true;
+  }
+
+  var is_confirmed = confirm(theMessage);
+
+  return is_confirmed;
+}