Changeset 52 for trunk/Modules

Timestamp:

Jan 4, 2020, 11:59:33 AM (4 years ago)

Author:

chronos

Message:

• Added: New filter data type Boolean for representing on/off switches.
• Added: Show only upcoming events. Allow to show also past events.

Location:

trunk/Modules/Event

Files:

• Event.php (modified) (1 diff)
• EventPage.php (modified) (3 diffs)
• Import/JoeClub.php (modified) (2 diffs)

trunk/Modules/Event/Event.php

@@ -58 +58 @@
   public $Id;
   public $Database;
+  public $AddedCount;
+
+  function ImportInternal()
+  {
+  }
 
   function Import()
   {
     $this->AddedCount = 0;
-    $Output = 'Parsing '.$this->Name.' ('.$this->Id.')...</br>';
+    $Output = 'Parsing '.$this->Name.' ('.$this->Id.')...';
+    $this->ImportInternal();
+    $Output .= 'done.';
+    if ($this->AddedCount > 0) $Output .= ' '.$this->AddedCount.' new.';
+    $Output .= '</br>'."\n";
     return $Output;
   }

trunk/Modules/Event/EventPage.php

@@ -38 +38 @@
     $Filter = new Filter();
     $Filter->Items = array(
+      array('Name' => 'past', 'Type' => 'Boolean', 'DbName' => '', 'Title' => 'Proběhlé'),
       array('Name' => 'title', 'Type' => 'String', 'DbName' => 'Title', 'Title' => 'Titulek'),
       array('Name' => 'description', 'Type' => 'String', 'DbName' => 'Description', 'Title' => 'Popis'),
-      array('Name' => 'price', 'Type' => 'String', 'DbName' => 'Price', 'Title' => 'Cena'),
+      array('Name' => 'price', 'Type' => 'Integer', 'DbName' => 'Price', 'Title' => 'Cena'),
       array('Name' => 'location', 'Type' => 'String', 'DbName' => 'Location', 'Title' => 'Umístění'),
       array('Name' => 'source', 'Type' => 'String', 'DbName' => 'SourceName', 'Title' => 'Import'),
@@ -53 +54 @@
     $Output .= $Filter->GetOutput($this->System->Link('/udalosti/'));
     $Where = $Filter->GetWhere($this->Database);
+    if ($_SESSION['past'] != 1) $Where .= ' AND (TimeFrom > NOW())';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM (SELECT *, '.
@@ -71 +73 @@
       array('Name' => '', 'Title' => 'Detail'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'TimeFrom', 1);
+    $Order = GetOrderTableHeader($TableColumns, 'TimeFrom', 0);
     $Output .= '<table class="WideTable">';
     $Output .= $Order['Output'];

trunk/Modules/Event/Import/JoeClub.php

@@ -3 +3 @@
 class EventSourceJoeClub extends EventSource
 {
-  function Import()
+  function ImportInternal()
   {
-    $Output = parent::Import();
+    $Output = '';
     $Content = file_get_contents($this->URL);
 
@@ -62 +62 @@
     $Event->Price = trim(str_replace('Kč', '', $Event->Price));
     if ($Event->Price == 'Zdarma') $Event->Price = 0;
+    if ($Event->Price == '') $Event->Price = 0;
     return $Output;
   }