Changeset 479 for trunk/Modules

Timestamp:

Feb 5, 2013, 9:45:44 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka pro přiřazení více služeb jednomu zákazníkovi. Původní data jsou převedena do nové struktury. Tabulka Service je společná pro všechny typy služeb a pro každou službu se zobrazí nebo vyplní pouze určité použitelné sloupce.
• Opraveno: Korekce názvů modulů na názvy začínající slovem Module.

Location:

trunk/Modules

Files:

• IS/IS.php (modified) (1 diff)
• Meteostation/Meteostation.php (modified) (3 diffs)
• Network/Network.php (modified) (1 diff)
• Portal/Portal.php (modified) (5 diffs)
• TV/TV.php (modified) (1 diff)

trunk/Modules/IS/IS.php

@@ -239 +239 @@
 }
 
-class IS extends AppModule
+class ModuleIS extends AppModule
 {
   function __construct($System)

trunk/Modules/Meteostation/Meteostation.php

@@ -11 +11 @@
   function Show()
   {
-    return('Stav meteostanice');
+    $Output = 'Stav meteostanice:<br/>';
+    $Output .= '<img src="'.$this->System->Link('/Modules/Meteostation/cache/1.png').'" alt="stav meteostanice"/>';
+    return($Output);
   }
 }
 
-class MeteoStation extends AppModule
+class MeteoStation extends Module
 {
-  var $Data;
+  var $Id;
+  var $Name;
+  var $Period;
+  var $URL;
   
-  function __construct($System)
+  function DownloadData()
   {
-    parent::__construct($System);
-    $this->Name = 'MeteoStation';
-    $this->Version = '1.0';
-    $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPLv3';
-    $this->Description = 'Gathering and presentation of data from network meteostation.';
-    $this->Dependencies = array();
-  }
-  
-  function DownloadData($Id, $URL)
-  {
-    $XmlData = simplexml_load_file($URL);
+    $XmlData = simplexml_load_file($this->URL);
 
-    $Data = array('MeteoStation' => $Id, 
+    $Data = array('MeteoStation' => $this->Id, 
       'WindSpeed' => trim($XmlData->windspeed),
       'WindDir' => trim($XmlData->winddir),
@@ -58 +52 @@
   }
   
-  function DownloadAll()
-  {
-    $DbResult = $this->Database->select('MeteoStation', '*');
-    while($DbRow = $DbResult->fetch_assoc())
-    {
-      $this->DownloadData($DbRow['Id'], $DbRow['URL']);
-      $this->CreateImage('cache/'.$DbRow['Id'].'.png');
-    }
-  }
-  
   function CreateImage($FileName)
   {
@@ -76 +60 @@
     //$Image->Font->Color = COLOR_RED;
     //$Image->Line(10, 10, 100, 100);
-    $Image->TextOut(10, 10, 'Meteo Koliba Zděchov');
+    $Image->TextOut(10, 10, 'Meteo '.$this->Name);
     $Image->TextOut(10, 30, 'Teplote: '.$this->Data['Temperature'].' °C');
     $Image->SaveToFile($FileName);
   }
+  
+  function LoadFromDb()
+  {
+    $DbResult = $this->Database->select('Meteostation', '*', 'Id = '.$this->Id);
+    $DbRow = $DbResult->fetch_assoc();
+    $this->Name = $DbRow['Name'];
+    $this->URL = $DbRow['URL'];
+    $this->Period = $DbRow['Period'];
+  }
+}
+
+class ModuleMeteoStation extends AppModule
+{
+  var $Data;
+  
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'MeteoStation';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'Gathering and presentation of data from network meteostation.';
+    $this->Dependencies = array();
+  }
+  
+  
+  function DownloadAll()
+  {
+    $DbResult = $this->Database->select('MeteoStation', '*');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $MeteoStation = new MeteoStation();
+      $MeteoStation->Id = $DbRow['Id'];
+      $MeteoStation->LoadFromDb();      
+      $MeteoStation->DownloadData();
+      $MeteoStation->CreateImage('cache/'.$DbRow['Id'].'.png');
+    }
+  }
+ 
   
   function Install()

trunk/Modules/Network/Network.php

@@ -80 +80 @@
 }
 
-class Network extends AppModule
+class ModuleNetwork extends AppModule
 {
   function __construct($System)

trunk/Modules/Portal/Portal.php

@@ -41 +41 @@
     $Output = '<img alt="" src="images/favicons/comp.png" width="16" height="16" /> '.$OnlineComputers.' / '.$TotalComputers.' &nbsp;  &nbsp; ';
 
-    $DbResult = $this->Database->select('Member', 'COUNT(*)', 'MemberState=0');
+    $DbResult = $this->Database->select('Member', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_array();
     $TotalUser = $DbRow[0];
@@ -246 +246 @@
         {
           $CustomerUserRel = $DbResult->fetch_assoc();
-          $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, '.
+          $DbResult = $this->Database->query('SELECT Member.Id, '.
             'Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, '.
             'Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
@@ -268 +268 @@
           $UserOptions->Values['BillingPeriodNext'] = 2;
           
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], array('InternetTariffNextMonth' => $UserOptions->Values['InternetTariffNextMonth'], 'FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
+           array('FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 
+           'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
         $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->User['Member']);
         $Member = $DbResult->fetch_assoc();
@@ -278 +280 @@
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
         $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($UserOptions->Definition['Items'] as $Index => $Item)
@@ -324 +326 @@
 }
 
-class Portal extends AppModule
+class ModulePortal extends AppModule
 {
   function __construct($System)

trunk/Modules/TV/TV.php

@@ -104 +104 @@
 }
 
-class TV extends AppModule
+class ModuleTV extends AppModule
 {
   function __construct($System)