Changeset 237

Timestamp:

Jul 29, 2009, 11:07:21 AM (15 years ago)

Author:

george

Message:

• Přidáno: Třída file pro obsluhu ukládání načtených souborů. Seznam uchovaných souborů je v tabulce File.
• Opraveno: Zobrazení otvíracích dob včetně zbývajícího času do otevření/zavření.
• Přidáno: Přímá editace otvíracích dob na webu.
• Přidáno: Možnost načíst obrázek s otvírací dobou.

Location:

trunk

Files:

• FileDownload.php (added)
• Readme.txt (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• file.php (added)
• files (added)
• global.php (modified) (1 diff)
• otevreno.php (modified) (3 diffs)
• sql/updates/237.sql (added)

trunk/Readme.txt

@@ -20 +20 @@
   aktuality/uploads - přílohy aktualit
   galerie - fotogalerie obrázků
-
+  files - načtené soubory přes web
 
 4) Práva složek
 
   webcam - vlastníka nastavit na apache
+  files - vlastníka nastavit na apache
   finance/doklady - vlastníka nastavit na apache
   aktuality/uploads - vlastníka nastavit na apache
 
   
-5) Generování PDF dokumentů
+5) Požadované balíky
+  Možnost instalovat na Fedoře přes yum install
+  
+  htmldoc - Pro generování PDF z HTML
+  php-pecl-Fileinfo - pro zjištění MIME type ze souboru
 
-  Nutno nainstalovat balík htmldoc. Na Fedoře pomocí yum install htmldoc.
 

trunk/config.sample.php

@@ -30 +30 @@
     'WebcamRefresh' => 5,
     'UserSupport' => 1,
+    'UploadFileFolder' => 'files',
     'News' => array
     (

trunk/global.php

@@ -18 +18 @@
 include_once('forms.php');
 include_once('page.php');
+include_once('file.php');
 
 $PrefixMultipliers = array

trunk/otevreno.php

@@ -7 +7 @@
   var $ShortTitle = 'Otvírací doby';
   var $DaysOfWeek = array('Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota', 'Neděle');
-  var $DayShift = 3;
-
-  function Show()
+  var $EventType = array('Žádný', 'Otevřeno', 'Zavřeno');
+
+  function ToHumanTime($Time)
+  {
+    $Hours = floor($Time / 60);
+    $Minutes = $Time - $Hours * 60;
+    if($Minutes < 10) $Minutes = '0'.$Minutes;    
+    $Hours = $Hours % 24;
+    return($Hours.':'.$Minutes);
+  } 
+
+  function ToHumanTime2($Time)
+  {
+    $Days = floor($Time / 24 / 60);
+    $Time = $Time - $Days * 24 * 60;
+    $Hours = floor($Time / 60);
+    $Time = $Time - $Hours * 60;
+    $Minutes = $Time;
+    $Output = '';
+    if($Days > 0) $Output .= $Days.' dnů, ';
+    if($Hours > 0) $Output .= $Hours.' hodin, ';
+    if($Minutes > 0) $Output .= $Minutes.' minut';
+    return($Output);
+  }
+  
+  function EditSubject($Id)
+  {
+    if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+    {
+      $Output = '<div class="Centred">';
+      $DbResult = $this->Database->select('Subject', 'Name', 'Id='.$Id);
+      $DbRow = $DbResult->fetch_assoc();
+      $Output .= '<form method="post" action="?Action=Save&amp;Subject='.$Id.'" enctype="multipart/form-data">'.
+      '<strong>'.$DbRow['Name'].'</strong>'.
+      '<table class="WideTable"><tr><th>Den</th><th>Od</th><th>Do</th><th>Od</th><th>Do</th></tr>';
+      $Day = array();
+      $DbResult = $this->Database->query('SELECT * FROM SubjectOpenTimeDay WHERE Subject = '.$Id);
+      while($DbRow = $DbResult->fetch_assoc())
+        $Day[$DbRow['Day']] = $DbRow;
+      foreach($this->DaysOfWeek as $Index => $Name)
+      {
+        if(!array_key_exists($Index, $Day)) $Day[$Index] = array('Open1' => 0, 'Close1' => 0, 'Open2' => 0, 'Close2' => 0);
+        $Output .= '<tr><td>'.$Name.'</td>'.
+          '<td><input type="text" name="day'.$Index.'_open1_h" value="'.floor($Day[$Index]['Open1'] / 60).'" size="2" />'.
+          ':<input type="text" name="day'.$Index.'_open1_m" value="'.($Day[$Index]['Open1'] - floor($Day[$Index]['Open1'] / 60) * 60).'" size="2" /></td>'.
+          '<td><input type="text" name="day'.$Index.'_close1_h" value="'.floor($Day[$Index]['Close1'] / 60).'" size="2" />'.
+          ':<input type="text" name="day'.$Index.'_close1_m" value="'.($Day[$Index]['Close1'] - floor($Day[$Index]['Close1'] / 60) * 60).'" size="2" /></td>'.
+          '<td><input type="text" name="day'.$Index.'_open2_h" value="'.floor($Day[$Index]['Open2'] / 60).'" size="2" />'.
+          ':<input type="text" name="day'.$Index.'_open2_m" value="'.($Day[$Index]['Open2'] - floor($Day[$Index]['Open2'] / 60) * 60).'" size="2" /></td>'.
+          '<td><input type="text" name="day'.$Index.'_close2_h" value="'.floor($Day[$Index]['Close2'] / 60).'" size="2" />'.
+          ':<input type="text" name="day'.$Index.'_close2_m" value="'.($Day[$Index]['Close2'] - floor($Day[$Index]['Close2'] / 60) * 60).'" size="2" /></td>'.
+          '</tr>';
+      }
+      $DbResult = $this->Database->select('SubjectOpenTime', 'Notice', 'Subject='.$Id);
+      $DbRow = $DbResult->fetch_assoc();
+      $Output .= '</table>'.
+      'Poznámka: <input type="text" name="notice" value="'.$DbRow['Notice'].'" size="50" /><br />'.
+      'Fotka: <input type="file" name="photo" size="38" /><br />'.
+      '<input type="submit" value="Uložit" />'.
+      '</form></div>';
+    } else $Output = 'Nemáte oprávnění';
+    return($Output);
+  }
+  
+  function SaveSubject($Id)
+  {
+    global $Config;
+    
+    $Output = '';
+    if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+    {
+      $this->Database->delete('SubjectOpenTimeDay', 'Subject='.$Id);
+      foreach($this->DaysOfWeek as $Index => $Name)
+      {
+        if($_POST['day'.$Index.'_open1_h'] > 24) $_POST['day'.$Index.'_open1_h'] = 24;
+        if($_POST['day'.$Index.'_close1_h'] > 24) $_POST['day'.$Index.'_close1_h'] = 24;
+        if($_POST['day'.$Index.'_open2_h'] > 24) $_POST['day'.$Index.'_open2_h'] = 24;
+        if($_POST['day'.$Index.'_close2_h'] > 24) $_POST['day'.$Index.'_close2_h'] = 24;
+        if($_POST['day'.$Index.'_open1_m'] > 59) $_POST['day'.$Index.'_open1_m'] = 59;
+        if($_POST['day'.$Index.'_close1_m'] > 59) $_POST['day'.$Index.'_close1_m'] = 59;
+        if($_POST['day'.$Index.'_open2_m'] > 59) $_POST['day'.$Index.'_open2_m'] = 59;
+        if($_POST['day'.$Index.'_close2_m'] > 59) $_POST['day'.$Index.'_close2_m'] = 59;
+        $Day = array('Subject' => $Id, 'Day' => $Index);
+        $Day['Open1'] = $_POST['day'.$Index.'_open1_m'] + $_POST['day'.$Index.'_open1_h'] * 60;
+        $Day['Close1'] = $_POST['day'.$Index.'_close1_m'] + $_POST['day'.$Index.'_close1_h'] * 60;
+        $Day['Open2'] = $_POST['day'.$Index.'_open2_m'] + $_POST['day'.$Index.'_open2_h'] * 60;
+        $Day['Close2'] = $_POST['day'.$Index.'_close2_m'] + $_POST['day'.$Index.'_close2_h'] * 60;
+        $this->Database->insert('SubjectOpenTimeDay', $Day);
+      }    
+      $Output .= 'Uloženo';  
+      
+      $File = new File($this->Database);
+
+      // Delete old file
+      $DbResult = $this->Database->select('SubjectOpenTime', 'Photo', 'Subject='.$Id);
+      $DbRow = $DbResult->fetch_assoc();
+      $File->Delete($DbRow['Photo']);
+
+      // Create new file
+      $FileId = $File->CreateFromUpload('photo');
+      $this->Database->update('SubjectOpenTime', 'Subject='.$Id, array('UpdateTime' => 'NOW()', 'Notice' => $_POST['notice'], 'Photo' => $FileId));
+    } else $Output = 'Nemáte oprávnění';
+    return($Output);
+  }  
+  
+  function ShowAll()
   {
     $Output = '<div class="Centred">';
-    $DbResult = $this->Database->query('SELECT SubjectOpenTime.*, DATE_FORMAT(SubjectOpenTime.UpdateTime, "%e.%c.%Y") as UpdateTime, Subject.Name as Name FROM SubjectOpenTime JOIN Subject ON Subject.Id = SubjectOpenTime.Subject ORDER BY Name');
+    $DbResult = $this->Database->query('SELECT SubjectOpenTime.*, DATE_FORMAT(SubjectOpenTime.UpdateTime, "%e.%c.%Y") as UpdateTime, Subject.Id, Subject.Name as Name FROM SubjectOpenTime JOIN Subject ON Subject.Id = SubjectOpenTime.Subject ORDER BY Name');
     while($Subject = $DbResult->fetch_assoc())
     {
       $Output .= '<strong>'.$Subject['Name'].':</strong><br />';
-          
-      $DbResult2 = $this->Database->query('SELECT Subject, OpenTime, CloseTime, TIMEDIFF(DATE_FORMAT(CloseTime, "0000-01-%w %T"), DATE_FORMAT(NOW(), "0000-01-%w %T")) as RemainTime FROM `SubjectOpenTimeInterval` WHERE DATE_FORMAT(NOW(), "0000-01-%w %T") > OpenTime AND DATE_FORMAT(NOW(), "0000-01-%w %T") < CloseTime AND Subject='.$Subject['Subject']);
-      if($DbResult2->num_rows > 0)
-      {
-        $DbRow = $DbResult2->fetch_assoc();
-        $Output .= 'Zavírá za '.$DbRow['RemainTime'];
-      } else
-      {
-        $DbResult2 = $this->Database->query('SELECT Subject, OpenTime, CloseTime, TIMEDIFF(OpenTime, DATE_FORMAT(NOW(), "0000-01-%w %T")) as RemainTime FROM `SubjectOpenTimeInterval` WHERE DATE_FORMAT(NOW(), "0000-01-%w %T") < OpenTime AND Subject='.$Subject['Subject'].' ORDER BY OpenTime LIMIT 1');
-        $DbRow = $DbResult2->fetch_assoc();
-        $Output .= 'Otevírá za '.$DbRow['RemainTime'];
-      }
-
-            $Output .= '<table class="WideTable">
-<tr><th>Den</th><th>Čas</th></tr>';
+    
+      // Load time event list
+      $Events = array();
+      $DbResult2 = $this->Database->query('SELECT * FROM `SubjectOpenTimeDay` WHERE Subject='.$Subject['Subject'].' ORDER BY Day ASC');
+      while($DbRow = $DbResult2->fetch_assoc())
+      {
+        if(($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
+        {
+          $Events[] = array('Time' => $DbRow['Open1'] + $DbRow['Day'] * 24 * 60, 'Type' => 1);
+          $Events[] = array('Time' => $DbRow['Close1'] + $DbRow['Day'] * 24 * 60, 'Type' => 2);
+        }
+        if(($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+        {
+          $Events[] = array('Time' => $DbRow['Open2'] + $DbRow['Day'] * 24 * 60, 'Type' => 1);
+          $Events[] = array('Time' => $DbRow['Close2'] + $DbRow['Day'] * 24 * 60, 'Type' => 2);
+        }
+      }
+      //print_r($Events);
+      
+      // Calculate time to next event
+      if(count($Events) > 0)
+      {
+        $CurrentTime = ((date('w') + 6) % 7) * 24 * 60 + date('G') * 60 + date('i');
+      
+        $I = 0;
+        while(($I < count($Events)) and ($Events[$I]['Time'] < $CurrentTime)) 
+          $I++;
+        if($I < count($Events))
+        {
+          $NextTime = $Events[$I]['Time'];
+          $NextEventType = $Events[$I]['Type'];
+        } else 
+        {
+          $NextTime = $Events[0]['Time'] + 7 * 24 * 60;
+          $NextEventType = $Events[0]['Type'];
+        }
+      
+        $TimeDelta = $NextTime - $CurrentTime;
+        //$Output .= $CurrentTime.' '.$NextTime;
+        if($NextEventType == 2) $Output .= 'Zavírá za '.$this->ToHumanTime2($TimeDelta);
+          else $Output .= 'Otevírá za '.$this->ToHumanTime2($TimeDelta);
+      }
+      
+      // Show time inteval table  
+      $Output .= '<table class="WideTable"><tr><th>Den</th><th>Čas</th></tr>';
       foreach($this->DaysOfWeek as $DayIndex => $DayOfWeek)
       {
-        $DbResult2 = $this->Database->query('SELECT *, DATE_FORMAT(OpenTime, "%k:%i") as OpenTime2, DATE_FORMAT(CloseTime, "%k:%i") as CloseTime2, DAYOFWEEK(OpenTime) as Week FROM SubjectOpenTimeInterval WHERE SubjectOpenTimeInterval.Subject = '.$Subject['Subject'].' AND ((DAYOFWEEK(OpenTime) + 7) MOD 7)='.$DayIndex);
+        $DbResult2 = $this->Database->query('SELECT * FROM SubjectOpenTimeDay WHERE Subject = '.$Subject['Subject'].' AND Day='.$DayIndex);
         $Output .= '<tr><td>'.$DayOfWeek.'</td><td align="center">';
         if($DbResult2->num_rows)
         {
-          while($TimeInterval = $DbResult2->fetch_assoc())
+          $DbRow = $DbResult2->fetch_assoc();
+          if(($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
           {
-            $Output .= $TimeInterval['OpenTime2'].' - '.$TimeInterval['CloseTime2'].' &nbsp;&nbsp; ';
+            $Output .= $this->ToHumanTime($DbRow['Open1']).' - '.$this->ToHumanTime($DbRow['Close1']).' &nbsp;&nbsp; ';
+          }
+          if(($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+          {
+            $Output .= $this->ToHumanTime($DbRow['Open2']).' - '.$this->ToHumanTime($DbRow['Close2']).'';
           }
         } else
@@ -47 +185 @@
       $Output .= '</table>Aktualizováno: '.$Subject['UpdateTime'].'<br />';
       if($Subject['Notice'] != '') $Output .= 'Poznámka: '.$Subject['Notice'].'<br />';
+      
+      if($Subject['Photo'] != 0) $Output .= '<a href="FileDownload.php?Id='.$Subject['Photo'].'">Fotka</a> ';
+      
+      if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+        $Output .= '<a href="?Action=Edit&amp;Subject='.$Subject['Id'].'">Editovat</a><br />';
       $Output .= '<br />';
     }
@@ -52 +195 @@
     return($Output);
   }
+  
+  function Show()
+  {
+    if(array_key_exists('Action', $_GET))
+    {
+      if($_GET['Action'] == 'Edit') $Output = $this->EditSubject($_GET['Subject']);
+      else if($_GET['Action'] == 'Save') 
+      {
+        $Output = $this->SaveSubject($_GET['Subject']);
+        $Output .= $this->ShowAll();
+      }
+      else $Output = $this->ShowAll();
+    } else $Output = $this->ShowAll();
+    return($Output);
+  }
 }