From ddc3f265e3ff95f26add9b052156f5357c60a596 Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Sun, 29 Nov 2020 16:34:07 +0530
Subject: [PATCH 1/5] feat: adding search feature in schedule page

---
 app/controllers/public/sessions.js |  3 ++-
 app/routes/public/sessions.js      | 33 ++++++++++++++++++++++++++++++
 app/templates/public/sessions.hbs  | 19 +++++++++++++----
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/app/controllers/public/sessions.js b/app/controllers/public/sessions.js
index f67d4a8ca98..53fe16fbe7e 100644
--- a/app/controllers/public/sessions.js
+++ b/app/controllers/public/sessions.js
@@ -7,7 +7,8 @@ import $ from 'jquery';
 @classic
 export default class SessionsController extends Controller {
 
-  queryParams = ['sort'];
+  queryParams = ['sort', 'search'];
+  search = null;
   sort = 'starts-at';
   isTrackVisible = false;
   timezone = null;
diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js
index 453b3f0a965..133e384c315 100644
--- a/app/routes/public/sessions.js
+++ b/app/routes/public/sessions.js
@@ -16,6 +16,9 @@ export default class SessionsRoute extends Route {
     },
     room: {
       refreshModel: true
+    },
+    search: {
+      refreshModel: true
     }
   };
 
@@ -87,6 +90,36 @@ export default class SessionsRoute extends Route {
       });
     }
 
+    if (params.search) {
+      filterOptions.push({
+        or: [
+          {
+          name : 'title',
+          op   : 'ilike',
+          val  : `%${params.search}%`
+          },
+          {
+            name : 'track',
+            op : 'has',
+            val: {
+              name: 'name',
+              op   : 'ilike',
+              val  : `%${params.search}%`
+            } 
+          },
+          {
+            name : 'microlocation',
+            op   : 'has',
+            val  : {
+              name : 'name',
+              op   : 'ilike',
+              val  : `%${params.search}%`
+            }
+          }
+        ]
+      });
+    }
+
     const isFiltering = params.room || params.track || params.date;
 
     return {
diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index a3f982a148c..0bab27df102 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -3,7 +3,7 @@
 <div class="d-flex wrap">
   <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=null}} class="ui button mb-2">{{t 'All'}}</LinkTo>
   {{#each this.allDates as |date|}}
-    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date 'D MMM, YYYY'}}</LinkTo>
+    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{moment-format date 'D MMM, YYYY'}}</LinkTo>
   {{/each}}
 
   <Widgets::TimeZonePicker
@@ -12,6 +12,17 @@
     @eventTimezone={{this.model.event.timezone}}
     @timezone={{this.timezone}} />
 
+  <div class="item">
+    <div class="ui icon input">
+      <Input
+        @name="search"
+        @value={{this.search}}
+        @type="text"
+        @placeholder={{t "Search..."}} />
+      <i class="search icon"></i>
+    </div>
+  </div>
+
   <UiDropdown class="labeled icon button mb-2">
     <i class="sort amount down icon"></i>
     <span class="default text">{{if (eq this.sort 'title') (t 'By Title') (t 'By Time')}}</span>
@@ -27,8 +38,8 @@
   {{#each this.model.session as |session|}}
     <div class="ui grid">
       <div class="three wide column">
-        {{general-date session.startsAt 'hh:mm a' tz=session.event.timezone}} - 
-        {{general-date session.endsAt 'hh:mm a' tz=session.event.timezone}}
+        {{general-date session.startsAt session.event.timezone 'hh:mm a'}} - 
+        {{general-date session.endsAt session.event.timezone 'hh:mm a'}}
       </div>
       <div class="thirteen wide column">
         <Public::TrackItem @session={{session}} />
@@ -59,7 +70,7 @@
           <tr>
             <td class="top aligned {{unless this.device.isMobile 'centered text'}}" style="border-top: none;">
               <h4 class="ui header {{unless this.device.isMobile 'pt-4'}}" style="color: rgba(0, 0, 0, 0.7);">
-                {{general-date session.startsAt 'h:mm A (z)' tz=this.timezone}}
+                {{general-date session.startsAt this.timezone 'h:mm A (z)'}}
               </h4>
             </td>
             <td style="border-top: none; border-left: 1px solid lightgrey">

From 8b15d1fdddc4a78509fdd8ec197c5fcdd475a46c Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Sun, 29 Nov 2020 16:52:20 +0530
Subject: [PATCH 2/5] =?UTF-8?q?I=20Don=E2=80=99t=20Know=20How=20To=20Help?=
 =?UTF-8?q?=20You=20Help=20Me=20to=20tell=20You=20Something=20That=20Would?=
 =?UTF-8?q?=20Help?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/routes/public/sessions.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js
index 133e384c315..29bdd7864fd 100644
--- a/app/routes/public/sessions.js
+++ b/app/routes/public/sessions.js
@@ -94,18 +94,18 @@ export default class SessionsRoute extends Route {
       filterOptions.push({
         or: [
           {
-          name : 'title',
-          op   : 'ilike',
-          val  : `%${params.search}%`
+            name : 'title',
+            op   : 'ilike',
+            val  : `%${params.search}%`
           },
           {
             name : 'track',
-            op : 'has',
-            val: {
-              name: 'name',
+            op   : 'has',
+            val  : {
+              name : 'name',
               op   : 'ilike',
               val  : `%${params.search}%`
-            } 
+            }
           },
           {
             name : 'microlocation',

From ce645e6fb73de8b90acf2022f51187c4d783d43d Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Sun, 29 Nov 2020 16:57:47 +0530
Subject: [PATCH 3/5] f

---
 app/templates/public/sessions.hbs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index 0bab27df102..57229b707a9 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -3,7 +3,7 @@
 <div class="d-flex wrap">
   <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=null}} class="ui button mb-2">{{t 'All'}}</LinkTo>
   {{#each this.allDates as |date|}}
-    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{moment-format date 'D MMM, YYYY'}}</LinkTo>
+    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date 'D MMM, YYYY'}}</LinkTo>
   {{/each}}
 
   <Widgets::TimeZonePicker
@@ -38,8 +38,8 @@
   {{#each this.model.session as |session|}}
     <div class="ui grid">
       <div class="three wide column">
-        {{general-date session.startsAt session.event.timezone 'hh:mm a'}} - 
-        {{general-date session.endsAt session.event.timezone 'hh:mm a'}}
+        {{general-date session.startsAt 'hh:mm a' tz=session.event.timezone}} - 
+        {{general-date session.endsAt 'hh:mm a' tz=session.event.timezone}}
       </div>
       <div class="thirteen wide column">
         <Public::TrackItem @session={{session}} />
@@ -70,7 +70,7 @@
           <tr>
             <td class="top aligned {{unless this.device.isMobile 'centered text'}}" style="border-top: none;">
               <h4 class="ui header {{unless this.device.isMobile 'pt-4'}}" style="color: rgba(0, 0, 0, 0.7);">
-                {{general-date session.startsAt this.timezone 'h:mm A (z)'}}
+                {{general-date session.startsAt 'h:mm A (z)' tz=this.timezone}}
               </h4>
             </td>
             <td style="border-top: none; border-left: 1px solid lightgrey">

From a2009e1c8d67eead5e0437919a4897f5ded82e7d Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Sun, 29 Nov 2020 21:26:12 +0530
Subject: [PATCH 4/5] kph

---
 app/routes/public/sessions.js                      | 11 ++++++++++-
 .../components/tables/utilities/search-box.hbs     |  2 +-
 app/templates/public/sessions.hbs                  | 14 ++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js
index 29bdd7864fd..fb23dc0653f 100644
--- a/app/routes/public/sessions.js
+++ b/app/routes/public/sessions.js
@@ -115,12 +115,21 @@ export default class SessionsRoute extends Route {
               op   : 'ilike',
               val  : `%${params.search}%`
             }
+          },
+          {
+            name : 'speakers',
+            op   : 'any',
+            val  : {
+              name : 'name',
+              op   : 'ilike',
+              val  : `%${params.search}%`
+            }
           }
         ]
       });
     }
 
-    const isFiltering = params.room || params.track || params.date;
+    const isFiltering = params.room || params.track || params.date || params.search;
 
     return {
       event   : eventDetails,
diff --git a/app/templates/components/tables/utilities/search-box.hbs b/app/templates/components/tables/utilities/search-box.hbs
index 5841cd51960..ca9c4d29211 100644
--- a/app/templates/components/tables/utilities/search-box.hbs
+++ b/app/templates/components/tables/utilities/search-box.hbs
@@ -1,4 +1,4 @@
-<div class="ui small icon input search-box">
+<div class="ui {{if (eq @size "large") '' 'small'}} icon input search-box">
   <Input @type="text" @value={{readonly this.searchQuery}} @keyUp={{action 'setSearchQuery' value="target.value"}} placeholder="Search ..." />
   <i class="search icon"></i>
 </div>
diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index 57229b707a9..0762ae5f2ab 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -12,16 +12,10 @@
     @eventTimezone={{this.model.event.timezone}}
     @timezone={{this.timezone}} />
 
-  <div class="item">
-    <div class="ui icon input">
-      <Input
-        @name="search"
-        @value={{this.search}}
-        @type="text"
-        @placeholder={{t "Search..."}} />
-      <i class="search icon"></i>
-    </div>
-  </div>
+  <Tables::Utilities::SearchBox
+    @searchQuery={{this.search}}
+    @size="large"
+  />&nbsp;
 
   <UiDropdown class="labeled icon button mb-2">
     <i class="sort amount down icon"></i>

From dbbf1c13309ac12bcc724810f99bb1e0d994639d Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Sun, 29 Nov 2020 21:34:48 +0530
Subject: [PATCH 5/5] margin-corection

---
 app/templates/public/sessions.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index 0762ae5f2ab..2fe97762753 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -13,9 +13,10 @@
     @timezone={{this.timezone}} />
 
   <Tables::Utilities::SearchBox
+    class="mb-2 mr-2"
     @searchQuery={{this.search}}
     @size="large"
-  />&nbsp;
+  />
 
   <UiDropdown class="labeled icon button mb-2">
     <i class="sort amount down icon"></i>