Changeset 20 for trunk

Timestamp:

Dec 26, 2018, 11:55:16 AM (6 years ago)

Author:

chronos

Message:

• Added: Meet list filtering by name, location and message text.
• Fixed: Amblar meet source date parsing.

Location:

trunk

Files:

• Import/Amblar.php (modified) (1 diff)
• Import/Csts.php (modified) (1 diff)
• index.php (modified) (5 diffs)
• style.css (modified) (2 diffs)

trunk/Import/Amblar.php

@@ -53 +53 @@
         else $MeetItem->Gender = Gender::Male;
       $MeetItem->Name = trim(GetTextBetween($Item, '<span class="dwqa-author">', '</span>'));
+      $Type = trim(GetTextBetween($Item, ' ', ' '));
+      if ($Type == 'odpovězeno') continue;
       $MeetItem->Date = trim(GetTextBetween($Item, '<span class="dwqa-date">', '</span>'));
-      if ($MeetItem->Date == 'před 1 dní') $MeetItem->Date = strtotime("-1 days");
-        else if ($MeetItem->Date == 'před 2 dny') $MeetItem->Date = strtotime("-2 days");
-        else $MeetItem->Date = HumanDateToTime($MeetItem->Date);
+      if (mb_substr($MeetItem->Date, 0, 4) == 'před') 
+      {            
+        $Parts = explode(' ', $MeetItem->Date);
+        if ($Parts[2] == 'hours') $MeetItem->Date = strtotime("-".$Parts[1]." hours");
+        else if ($Parts[2] == 'dní') $MeetItem->Date = strtotime("-".$Parts[1]." days");
+        else if ($Parts[2] == 'dny') $MeetItem->Date = strtotime("-".$Parts[1]." days");
+      } else $MeetItem->Date = HumanDateToTime($MeetItem->Date);
       $MeetItem->Email = '';
       $MeetItem->Message = '';

trunk/Import/Csts.php

@@ -41 +41 @@
       if ($MeetItem->Phone == 'neuveden') $MeetItem->Phone = '';
       $MeetItem->Link = '';
-      print_r($MeetItem);
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;

trunk/index.php

@@ -127 +127 @@
     {
       $this->NoFullPage = true;
+      if (array_key_exists('name', $_GET) ) $_SESSION['name'] = $_GET['name'];
+      if (array_key_exists('location', $_GET) ) $_SESSION['location'] = $_GET['location'];
+      if (array_key_exists('message', $_GET) ) $_SESSION['message'] = $_GET['message'];
       if (array_key_exists('vekod', $_GET) ) $_SESSION['vekod'] = $_GET['vekod'];
       if (array_key_exists('vekdo', $_GET) ) $_SESSION['vekdo'] = $_GET['vekdo'];
@@ -184 +187 @@
     $Output .= '<h4 style="text-align: center;">Inzeráty:</h4>';
     $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ě pohlaví"><span class="icon-both"></span></button>'.
+      '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="Jen muži"><span class="icon-man"></span></button>'.
+      '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="Jen ženy"><span class="icon-woman"></span></button>'.
-      '</div>';
+      '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>'.
@@ -198 +207 @@
       '<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>'.
+      'id="vekdo" autocomplete="off" type="text">'.
+      '<div class="label-box">let</div>'.
       '</div> ';
     $Output .= '<div class="filter-num-box">'.
@@ -207 +217 @@
       '<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>'.
+      'id="vyskado" autocomplete="off" type="text">'.
+      '<div class="label-box">cm</div>'.
       '</div> ';
     $Output .= '<div class="filter-num-box">'.
@@ -216 +227 @@
       '<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">cm</div></div>'.
-      '</div>';
+      '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 = '';
+    if (array_key_exists('name', $_SESSION) and ($_SESSION['name'] != '')) $Where .= ' AND (Name LIKE "%'.$_SESSION['name'].'%")';
+    if (array_key_exists('location', $_SESSION) and ($_SESSION['location'] != '')) $Where .= ' AND (Location LIKE "%'.$_SESSION['location'].'%")';
+    if (array_key_exists('message', $_SESSION) and ($_SESSION['message'] != '')) $Where .= ' AND (Message LIKE "%'.$_SESSION['message'].'%")';
     if (array_key_exists('vekod', $_SESSION) and ($_SESSION['vekod'] != '')) $Where .= ' AND (Age >= '.$_SESSION['vekod'].')';
     if (array_key_exists('vekdo', $_SESSION) and ($_SESSION['vekdo'] != '')) $Where .= ' AND (Age <= '.$_SESSION['vekdo'].')';

trunk/style.css

@@ -39 +39 @@
 .btn-group .btn-filter{border-left:1px solid #e6e6e6}
 .btn-group .btn-filter:first-child{border-left:none}
+.btn-group div.label-box{display:inline-block;line-height:28px;font-size:13px;margin:0 4px;vertical-align:middle}
+.btn-group{display:inline-block;background-color:#e0e0e0;padding:4px 4px;vertical-align:middle}
 
 .filter-num-box{display:inline-block;background-color:#e0e0e0;padding:4px 4px;vertical-align:middle}
@@ -46 +48 @@
 .filter-num-box input{width:40px;margin:0;border:0;text-align:center;padding:0 4px;line-height:25px;font-size:13px;vertical-align:middle}
 
-.filter-num-box div.dropdown{display:inline-block;margin:0 4px;paddig:0}
+.filter-num-box div.dropdown{display:inline-block;margin:0 4px;padding:0}
 .filter-num-box div.dropdown.invi{display:none}
 .filter-num-box div.dropdown .btn{background:#fff;margin:0;border:0;padding:0 8px;line-height:28px;font-size:13px;border-radius: 0}
 .filter-num-box div.dropdown-menu a.dropdown-item{line-height:20px;font-size:13px}
+
+.ma3{margin:3px}
 
 .icon-both:before {