Changeset 482 for trunk

Timestamp:

Feb 7, 2013, 9:45:02 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Pozice zařízení se nyní zadává jako výběr položky ze samostatné tabulky pojmenovaných pozic. To by mělo zjednodušit zadávání pozice nových zařízení a sloučit do jedné značky více zařízení ve ze stejné pozice.
• Přidáno: Základní datová struktura pro evidenci zaměstnanců.

Location:

trunk

Files:

• Modules/Map/Map.php (modified) (3 diffs)
• finance/manage.php (modified) (2 diffs)
• form_classes.php (modified) (3 diffs)
• sql/updates/479.sql (modified) (3 diffs)
• sql/updates/482.sql (added)

trunk/Modules/Map/Map.php

@@ -61 +61 @@
     while($Link = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
-      $DbResult3 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
+      $DbResult2 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Latitude, MapPosition.Longitude FROM NetworkDevice JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
+      $DbResult3 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Latitude, MapPosition.Longitude FROM NetworkDevice JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
       if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
       {
@@ -68 +68 @@
         $Device2 = $DbResult3->fetch_assoc();
         if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
-          $Output .= 'new GPolyline([new GLatLng('.$Device1['PositionLatitude'].', '.$Device1['PositionLongitude'].'),new GLatLng('.$Device2['PositionLatitude'].', '.$Device2['PositionLongitude'].')], "#4F4FBF", 3, 0.8), ';
+          $Output .= 'new GPolyline([new GLatLng('.$Device1['Latitude'].', '.$Device1['Longitude'].'),new GLatLng('.$Device2['Latitude'].', '.$Device2['Longitude'].')], "#4F4FBF", 3, 0.8), ';
       }
     }
@@ -99 +99 @@
                     NetworkDevices = [';
 
-    $DbResult = $this->Database->query('SELECT * FROM NetworkDevice WHERE Used=1');
+    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(NetworkDevice.Name SEPARATOR ",") AS Name, '.
+      'MapPosition.Latitude AS Latitude, MapPosition.Longitude AS Longitude, MapPosition.Name AS NodeName '.
+      'FROM NetworkDevice LEFT JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
+      'WHERE (NetworkDevice.Used=1) AND (NetworkDevice.MapPosition IS NOT NULL) '.
+      'GROUP BY NetworkDevice.MapPosition');
     while($Device = $DbResult->fetch_assoc())
     {
-      $Output .= 'new GMarker(new GLatLng('.$Device['PositionLatitude'].', '.$Device['PositionLongitude'].'), {title: "'.$Device['Name'].'", icon:tinyIcon }), ';
+      $Output .= 'new GMarker(new GLatLng('.$Device['Latitude'].', '.
+      $Device['Longitude'].'), {title: "'.$Device['NodeName'].': '.$Device['Name'].'", icon:tinyIcon }), ';
     }
     $Output .= '];

trunk/finance/manage.php

@@ -301 +301 @@
       'FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member JOIN Subject '.
       'ON Subject.Id=Member.Subject LEFT JOIN FinanceBillingPeriod ON '.
-      'FinanceBillingPeriod.Id=Member.BillingPeriodNext';
+      'FinanceBillingPeriod.Id=Member.BillingPeriodNext WHERE (Member.Blocked = 0)'.
+      'AND (Member.BillingPeriodNext > 1)';
     
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
@@ -483 +484 @@
       // Restart traffic shaping
       //$this->Database->update('NetworkConfiguration', 'Id = 3', array('Changed' => 1));     
+      //flush();
+      //$this->GenerateBills();
     }
     return($Output);

trunk/form_classes.php

@@ -396 +396 @@
       'PermanentOnline' => array('Type' => 'Boolean', 'Caption' => 'Běží stále', 'Default' => '0'),
       'Interfaces' => array('Type' => 'TInterfaceList', 'Caption' => 'Rozhraní', 'Default' => ''),
+      'MapPosition' => array('Type' => 'TMapPosition', 'Caption' => 'Pozice na mapě', 'Default' => '0'),
     ),
   ),
@@ -453 +454 @@
     ),
   ),
+  'MapPosition' => array(
+    'Title' => 'Pozice na mapě',
+    'Table' => 'MapPosition',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Latitude' => array('Type' => 'Float', 'Caption' => 'Zeměpisná šířka', 'Default' => '0'),
+      'Longitude' => array('Type' => 'Float', 'Caption' => 'Zeměpisná výška', 'Default' => '0'),
+    ),
+  ),
   'NewPayment' => array(
     'Title' => 'Nová platba',
@@ -705 +715 @@
     'Filter' => '1',
   ),
+  'TMapPosition' => array(
+    'Type' => 'Reference',
+    'Table' => 'MapPosition',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
   'TUser' => array(
     'Type' => 'Reference',

trunk/sql/updates/479.sql

@@ -1 +1 @@
 ALTER TABLE SystemVersion CHANGE COLUMN Rev478 Rev479 bit;
-
-ALTER TABLE `ServiceCustomerRel` ADD `Period` INT NOT NULL 
 
 CREATE TABLE IF NOT EXISTS `ServiceCustomerRel` (
@@ -7 +5 @@
   `Service` int(11) NOT NULL,
   `Customer` int(11) NOT NULL,
+  `Period` INT NOT NULL ,
   PRIMARY KEY (`Id`),
   KEY `Service` (`Service`),
@@ -16 +15 @@
   ADD CONSTRAINT `ServiceCustomerRel_ibfk_1` FOREIGN KEY (`Service`) REFERENCES `Service` (`Id`);
 
-DROP TABLE `ServiceInternet`;
-DROP TABLE `ServiceConsumption`;
-DROP TABLE `ServiceVPS`;
+ALTER TABLE `ServiceCustomerRel` DROP FOREIGN KEY `ServiceCustomerRel_ibfk_1` ;
+
 DROP TABLE `Service`;