Changeset 456

Timestamp:

Oct 31, 2012, 4:52:38 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Opět se rozlišuje při načítání položek z databáze do jakého pole mají být data načtena. Indexy jmenné nebo číselné nebo obojí.
• Opraveno: Převod starých produktů na novou strukturu.
• Opraveno: Zobrazení výpisu zařízení ve stavu uživatele.

Location:

trunk

Files:

• Common/Database.php (modified) (1 diff)
• finance/user_state.php (modified) (2 diffs)
• temp/product.php (modified) (1 diff)

trunk/Common/Database.php

@@ -12 +12 @@
   function fetch_assoc()
   {
-    return($this->PDOStatement->fetch());
+    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
   }
   
   function fetch_array()
   {
-    return($this->PDOStatement->fetch());
+    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
   }
 
   function fetch_row()
   {
-    return($this->PDOStatement->fetch());
+    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
   }
 }

trunk/finance/user_state.php

@@ -32 +32 @@
     
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
-    $DbResult = $this->Database->query('SELECT * FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Subject='.$Subject['Id']);
+    $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyPlus AS MonthlyPlus '.
+      'FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Subject='.$Subject['Id']);
     $Member = $DbResult->fetch_assoc();
     $TarifName = $Finance->Tariffs[$Member['InternetTariffCurrentMonth']]['Name'];
@@ -122 +123 @@
       $DbResult = $this->Database->query('SELECT Product.Name AS Name, Product.Consumption AS Consumption '.
         'FROM StockItem JOIN Product ON Product.Id = StockItem.Product '.
-        'WHERE Location='.$Member['Id'].' AND (TimeElimination IS NULL)');
+        'WHERE (StockItem.Location='.$Member['Id'].') AND (StockItem.TimeElimination IS NULL)');
       $TotalW = 0;
       $TotalPrice = 0;

trunk/temp/product.php

@@ -16 +16 @@
     'Consumption' => $DbRow['Consumption'], 'UnitOfMeasure' => 1, 'VAT' => 20));
   $ProductId = $System->Database->insert_id;
-  if($DbRow['Used'] == 0) $Elimination = 'NULL';
-    else $Elimination = $DbRow['TimeElimination'];
+  //print_r($DbRow);
+  switch($DbRow['Used'])
+  {
+    case 0: $Elimination = '0000-00-00'; break;
+    case 1: $Elimination = NULL; break;
+    case 2: $Elimination = NULL; break;
+  }
+        
+  //  else $Elimination = $DbRow['TimeElimination'];
+  if($DbRow['Used'] == 2) $DbRow['User'] = NULL;
+  echo($DbRow['Used'].'"'.$Elimination.'"<br/>');
+//  print_r(array('Stock' => 1, 'Product' => $ProductId, 'Amount' => $DbRow['Count'],
+//    'Segment' => $DbRow['Segment'], 'TimeEnlistment' => $DbRow['Date'], 'TimeElimination' => $Elimination, 
+//    'SerialNumber' => $DbRow['DeviceId'], 'BuyPrice' => $DbRow['Price'], 'SellPrice' => $DbRow['Price'],
+//    'Location' => $DbRow['User'], 'Info' => $DbRow['Info']));
   $Database->insert('StockItem', array('Stock' => 1, 'Product' => $ProductId, 'Amount' => $DbRow['Count'],
     'Segment' => $DbRow['Segment'], 'TimeEnlistment' => $DbRow['Date'], 'TimeElimination' => $Elimination,