Changeset 410

Timestamp:

Oct 4, 2012, 10:12:08 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Vazba tabulky User na Member oddělena do samostatné tabulky jako vztah N:N.

Location:

trunk

Files:

• finance/finance.php (modified) (4 diffs)
• finance/user_state.php (modified) (1 diff)
• sql/updates/410.sql (added)
• temp/transform.php (deleted)
• user.php (modified) (1 diff)

trunk/finance/finance.php

@@ -172 +172 @@
       $Consumption = 0;
       $ID = $Member['NetworkSegment'];
-      while($ID != 'NULL')
+      while($ID != '')
       {
         $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$ID);
@@ -213 +213 @@
     $Output = 'Aktualizuji parametry segmentů...<br />';
     $this->Database->query('UPDATE `NetworkSegment` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegments`');
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegment`');
     while($NetworkSegment = $DbResult->fetch_array())
     {
@@ -222 +222 @@
       $RowP2 = $DbResult2->fetch_array();
 
-      $DbResult2 = $this->Database->query('SELECT SUM(Price) AS Price, SUM(Consumption) AS Consumption FROM NetworkDevice WHERE Segment='.$NetworkSegment['Id'].' AND Used=1');
+      $DbResult2 = $this->Database->query('SELECT SUM(Price) AS Price, SUM(Consumption) AS Consumption FROM Product WHERE Segment='.$NetworkSegment['Id'].' AND Used=1');
       $Row2 = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['Id']);
       $Row3 = $DbResult2->fetch_array();
-      $ID = $NetworkSegment['parent'];
+      $ID = $NetworkSegment['Parent'];
       while($ID != 0)
       {
@@ -241 +241 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('NetworkSegments', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);

trunk/finance/user_state.php

@@ -22 +22 @@
       if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
       $UserId = $this->System->Modules['User']->User['Id'];
-      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$UserId.'))');
+      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Customer FROM UserCustomerRel WHERE User='.$UserId.'))');
       $Subject = $DbResult->fetch_assoc();
     }

trunk/user.php

@@ -52 +52 @@
     if($Row['User'] != $this->AnonymousUserId) 
     {
-      $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
+      $Query = $this->Database->query('SELECT *, UserCustomerRel.Customer AS Member FROM User JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
       $this->User = $Query->fetch_assoc();
       $Result = USER_LOGGED;