Changeset 46 for trunk/Modules/Meet

Timestamp:

Nov 10, 2019, 1:42:40 AM (5 years ago)

Author:

chronos

Message:

• Modified: Table filter made more general.
• Added: Filter for movies table.

Location:

trunk/Modules/Meet

Files:

• Meet.php (modified) (1 diff)
• MeetPage.php (modified) (5 diffs)

trunk/Modules/Meet/Meet.php

@@ -273 +273 @@
   'sokolov' => 'Sokolov',
   'mikulov' => 'Mikulov',
+  'havířov' => 'Havířov',
+  'kolín' => 'Kolín',
+  'kroměříž' => 'Kroměříž',
 );
 

trunk/Modules/Meet/MeetPage.php

@@ -17 +17 @@
   function Start()
   {
-    $this->System->RegisterPage('seznamka', 'PageMeetList');    
+    $this->System->RegisterPage('seznamka', 'PageMeetList');
     $this->System->RegisterPage(array('seznamka', 'inzerat'), 'PageMeetItem');
     $this->System->RegisterPage(array('seznamka', 'aktualizace'), 'PageMeetUpdate');
     $this->System->RegisterPage(array('seznamka', 'rss'), 'PageMeetRss');
     $this->System->RegisterMenuItem('/seznamka', 'Seznamka');
-  }  
+  }
 }
 
@@ -36 +36 @@
   function Show()
   {
-    $FilterItems = array(
-      array('Name' => 'name', 'Type' => 'String', 'DbName' => 'Name'),
-      array('Name' => 'location', 'Type' => 'String', 'DbName' => 'Location'),
-      array('Name' => 'message', 'Type' => 'String', 'DbName' => 'Message'), 
-      array('Name' => 'vekod', 'Type' => 'Integer', 'DbName' => 'Age', 'Operation' => '>='), 
-      array('Name' => 'vekdo', 'Type' => 'Integer', 'DbName' => 'Age', 'Operation' => '<='), 
-      array('Name' => 'vyskaod', 'Type' => 'Integer', 'DbName' => 'Height', 'Operation' => '>='), 
-      array('Name' => 'vyskado', 'Type' => 'Integer', 'DbName' => 'Height', 'Operation' => '<='), 
-      array('Name' => 'vahaod', 'Type' => 'Integer', 'DbName' => 'Weight', 'Operation' => '>='), 
-      array('Name' => 'vahado', 'Type' => 'Integer', 'DbName' => 'Weight', 'Operation' => '<='), 
-      array('Name' => 'pohlavi', 'Type' => 'Integer', 'DbName' => 'Gender', 'Operation' => '=='),
+    $Filter = new Filter();
+    $Filter->Items = array(
+      array('Name' => 'pohlavi', 'Type' => 'Enumeration', 'DbName' => 'Gender', 'Title' => 'Pohlaví',
+        'States' => array(0 => 'Obě', 1 => 'Muži', 2 => 'Ženy')),
+      array('Name' => 'name', 'Type' => 'String', 'DbName' => 'Name', 'Title' => 'Jméno'),
+      array('Name' => 'vek', 'Type' => 'Integer', 'DbName' => 'Age', 'Title' => 'Věk', 'Units' => 'let'),
+      array('Name' => 'vyska', 'Type' => 'Integer', 'DbName' => 'Height', 'Title' => 'Výška', 'Units' => 'cm'),
+      array('Name' => 'vaha', 'Type' => 'Integer', 'DbName' => 'Weight', 'Title' => 'Váha', 'Units' => 'Kg'),
+      array('Name' => 'message', 'Type' => 'String', 'DbName' => 'Message', 'Title' => 'Zpráva'),
+      array('Name' => 'location', 'Type' => 'String', 'DbName' => 'Location', 'Title' => 'Umístění'),
+      array('Name' => 'source', 'Type' => 'String', 'DbName' => 'SourceName', 'Title' => 'Import'),
     );
 
-    foreach ($FilterItems as $Item)
-    {
-      if (!array_key_exists($Item['Name'], $_SESSION)) $_SESSION[$Item['Name']] = '';
-    }
-
+    $Output = '';
     $this->Title = 'Seznamka - '.$this->Title;
-    $Output = '';
     if (array_key_exists('lvm', $_GET) and ($_GET['lvm'] == 'seznam'))
-    {
       $this->ClearPage = true;
-      foreach ($FilterItems as $Item)
-      {
-        if (array_key_exists($Item['Name'], $_GET) ) $_SESSION[$Item['Name']] = $_GET[$Item['Name']];
-        if (($Item['Type'] == 'Integer') and ($_SESSION[$Item['Name']] == '0')) $_SESSION[$Item['Name']] = '';
-      }
-    } else {
-    $Output .= '<script type="text/javascript">function reloadlist(){ $(\'#meetlist\').load(document.URL + \' #meetlist\');}'.
-      ' var load_timer = 100;
-   var ltimer = null;
-
-   function checkOut(kc,obj){
-      if(kc==13) $(obj).blur();
-   }
-   function initLTimer(tm){
-      if(ltimer) clearTimeout(ltimer);
-      ltimer = setTimeout("freloader()",tm);
-   }
-   function stopLTimer(){
-      if(ltimer) clearTimeout(ltimer);
-      ltimer = null;
-   }
-
-   var cf = {};
-
-   function setupc(key,val){
-      //console.log(\'setup-control-\'+key+\' = \'+val);
-      if(key==\'vekod\' || key==\'vekdo\' || key==\'vyskaod\' || key==\'vyskado\' || key==\'vahaod\' || key==\'vahado\') {
-         var ccv = $(\'#\'+key).val();
-         if(ccv!=val) $(\'#\'+key).val(val==0?\'\':val);
-      }
-      if(key==\'pohlavi\') {
-         $(\'.c\'+key).removeClass(\'active\');
-         $(\'#\'+key+val).addClass(\'active\');
-      }
-   }
-
-   function upf(key,val,lonreload){
-      if(key!=\'first\') cf[\'first\']=0; else st();
-      setupc(key,val);
-      cf[key]=val;
-      if(lonreload) initLTimer(1000); else initLTimer(100);
-   }
-
-   function freloader(){
-      ltimer = null;
-      var qp = jQuery.param( cf );
-      $(\'#list_content\').html(\'\'); $(\'#list_loading\').show();
-      $.get(\''.$this->System->Link('/seznamka/').'?lvm=seznam&\'+qp,function(data){$(\'#list_loading\').hide();$(\'#list_content\').html(data);htip()})
-   }'.
-      '</script>';
-    $Output .= '<div class="title">Inzeráty</div>';
-    $Output .= '<div class="btn-group ma3">'.
-      '<div class="label-box">Pohlaví</div>'.
-      '<button class="btn btn-filter cpohlavi btn-ico" onclick="upf(\'pohlavi\',0)" id="pohlavi0" data-toggle="tooltip" '.
-      'data-placement="top" title="Obě"><span class="icon-both"></span></button>'.
-      '<button class="btn btn-filter cpohlavi btn-ico" onclick="upf(\'pohlavi\',1)" id="pohlavi1" data-toggle="tooltip" '.
-      'data-placement="top" title="Muži"><span class="icon-man"></span></button>'.
-      '<button class="btn btn-filter cpohlavi btn-ico" onclick="upf(\'pohlavi\',2)" id="pohlavi2" data-toggle="tooltip" '.
-      'data-placement="top" title="Ženy"><span class="icon-woman"></span></button>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Jméno</div>'.
-      '<input value="'.$_SESSION['name'].'" onkeyup="if(event.keyCode!=9) upf(\'name\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="name" autocomplete="off" type="text"/>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Věk</div>'.
-      '<input value="'.$_SESSION['vekod'].'" onkeyup="if(event.keyCode!=9) upf(\'vekod\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="vekod" autocomplete="off" type="text"/>'.
-      '<div class="label-box">-</div>'.
-      '<input value="'.$_SESSION['vekdo'].'" onkeyup="'.
-      'if(event.keyCode!=9) upf(\'vekdo\',$(this).val(),(event.keyCode==13?0:1));" '.
-      'id="vekdo" autocomplete="off" type="text"/>'.
-      '<div class="label-box">let</div>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Výška</div>'.
-      '<input value="'.$_SESSION['vyskaod'].'" onkeyup="if(event.keyCode!=9) upf(\'vyskaod\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="vyskaod" autocomplete="off" type="text"/>'.
-      '<div class="label-box">-</div>'.
-      '<input value="'.$_SESSION['vyskado'].'" onkeyup="'.
-      'if(event.keyCode!=9) upf(\'vyskado\',$(this).val(),(event.keyCode==13?0:1));" '.
-      'id="vyskado" autocomplete="off" type="text"/>'.
-      '<div class="label-box">cm</div>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Váha</div>'.
-      '<input value="'.$_SESSION['vahaod'].'" onkeyup="if(event.keyCode!=9) upf(\'vahaod\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="vahaod" autocomplete="off" type="text"/>'.
-      '<div class="label-box">-</div>'.
-      '<input value="'.$_SESSION['vahado'].'" onkeyup="'.
-      'if(event.keyCode!=9) upf(\'vahado\',$(this).val(),(event.keyCode==13?0:1));" '.
-      'id="vahado" autocomplete="off" type="text"/>'.
-      '<div class="label-box">Kg</div>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Umístění</div>'.
-      '<input value="'.$_SESSION['location'].'" onkeyup="if(event.keyCode!=9) upf(\'location\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="location" autocomplete="off" type="text"/>'.
-      '</div> ';
-    $Output .= '<div class="filter-num-box">'.
-      '<div class="label-box">Zpráva</div>'.
-      '<input value="'.$_SESSION['message'].'" onkeyup="if(event.keyCode!=9) upf(\'message\',$(this).val(),(event.keyCode==13?0:1)); '.
-      '" id="message" autocomplete="off" type="text"/>'.
-      '</div> ';
-    }
-
-    $Where = '';
-    foreach($FilterItems as $Item)
-    {
-      if ($Item['Type'] == 'String') {
-        if ($_SESSION[$Item['Name']] != '') $Where .= ' AND ('.$Item['DbName'].' LIKE "%'.$this->Database->real_escape_string($_SESSION[$Item['Name']]).'%")';
-      } else
-      if ($Item['Type'] == 'Integer') {
-        if ($_SESSION[$Item['Name']] != '') {
-          if ($Item['Operation'] == '>=') $Where .= ' AND ('.$Item['DbName'].' >= '.$this->Database->real_escape_string($_SESSION[$Item['Name']]).')';
-          else if ($Item['Operation'] == '<=') $Where .= ' AND ('.$Item['DbName'].' <= '.$this->Database->real_escape_string($_SESSION[$Item['Name']]).')';
-          else if ($Item['Operation'] == '==') $Where .= ' AND ('.$Item['DbName'].' = '.$this->Database->real_escape_string($_SESSION[$Item['Name']]).')';
-        }
-      }
-    }
-    if (substr($Where, 0, 4) == ' AND') 
-      $Where = substr($Where, 4);
-    if ($Where == '') $Where = '1';
-
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `MeetItem` WHERE '.$Where);
+      else $Output .= '<div class="title">Inzeráty</div>';
+
+    $Output .= $Filter->GetOutput($this->System->Link('/seznamka/'));
+    $Where = $Filter->GetWhere($this->Database);
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM (SELECT *, '.
+      '(SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName FROM `MeetItem`) AS T WHERE '.$Where);
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
@@ -206 +81 @@
     $Output .= '<table class="WideTable">';
     $Output .= $Order['Output'];
-    $DbResult = $this->Database->select('MeetItem', '*, (SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName, '.
-      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL', $Where.$Order['SQL'].$PageList['SQLLimit']);
+    $DbResult = $this->Database->query('SELECT * FROM (SELECT *, (SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName, '.
+      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL FROM MeetItem) AS T WHERE '.
+      $Where.$Order['SQL'].$PageList['SQLLimit']);
     while($MeetItem = $DbResult->fetch_assoc())
     {
@@ -217 +93 @@
         '<td>'.$MeetItem['Weight'].'</td>'.
         '<td>'.$MeetItem['Location'].'</td>'.
-        //'<td>'.$MeetItem['Email'].'</td>'.
-        //'<td>'.$MeetItem['Phone'].'</td>'.
         '<td>'.$Gender[$MeetItem['Gender']].'</td>'.
         '<td>'.$MeetItem['Message'].'</td>'.
@@ -249 +123 @@
 
   function Show()
-  {    
+  {
     $MeetSources = new MeetSources();
     $MeetSources->Database = $this->Database;