From b00a91c4cf107892805ef7b73c929c2b56ab413a Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Tue, 5 Dec 2017 14:01:26 +0530
Subject: [PATCH] search for activity,assign to and status in call tracking and
 removing abotu us  icon in Ck-editor in announcement screen

---
 Apollo/assets/views/callTrackingDetails.html | 25 +++++++++++++-------
 Apollo/bower_components/ckeditor/config.js   |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html
index 7b3de802..df4871e7 100644
--- a/Apollo/assets/views/callTrackingDetails.html
+++ b/Apollo/assets/views/callTrackingDetails.html
@@ -65,7 +65,7 @@
                                             $("#search").focus();
                                         });
                                     </script>
-                                    <div class="col-md-3">
+                                    <div class="col-md-2">
 
 
                                         <input type="text"
@@ -88,12 +88,21 @@
                                         <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search Date" ng-hide="hideDateSearch==true" />
                                     </div>
 
-                                    <div class="col-md-3">
+                                    <div class="col-md-2">
                                         <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search Mobile/Name" />
                                     </div>
-                                    <!--<div class="col-md-3">
-                                        <input class="form-control" type="text" ng-model="search3" id="search3" autofocus tabindex="1" placeholder="Search Student Name" />
-                                    </div>-->
+									<!-- Search By Activity-->
+                                     <div class="col-md-2 col-md-offset-2">
+                                        <input class="form-control" type="text" ng-model="search3.ListName" id="search3" autofocus tabindex="1" placeholder="Search Activity" />
+                                    </div>  
+									<!-- Search By Assign To-->
+									<div class="col-md-2">
+                                        <input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="1" placeholder="Search Assigned To" />
+                                    </div> 
+									<!-- Search By Status-->
+									<div class="col-md-2">
+                                        <input class="form-control" type="text" ng-model="search5.statusListName" id="search5" autofocus tabindex="1" placeholder="Search Status" />
+                                    </div> 
                                     <br><br>
                                 </div>
 
@@ -125,14 +134,12 @@
                                             <th>Course</th>
                                             <th>Activity
                                             </th>
-                                            <th>Assigned To
-
-                                            </th>
+                                            <th>Assigned To</th> 
                                             <th>Status</th>
 
                                         </tr>
                                         </thead>
-                                        <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
+                                        <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
                                         <tr ng-click="setEditId(p);" title="Click to view tracking details">
                                             <td><a href="#"  class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td>
                                             <td>{{p.followupDetails }}</td>
diff --git a/Apollo/bower_components/ckeditor/config.js b/Apollo/bower_components/ckeditor/config.js
index 9de2f1a3..530a5d4a 100644
--- a/Apollo/bower_components/ckeditor/config.js
+++ b/Apollo/bower_components/ckeditor/config.js
@@ -23,7 +23,7 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
 		{ name: 'styles' },
 		{ name: 'colors' },
-		{ name: 'about' }
+		//{ name: 'about' }
 	];
 
 	// Remove some buttons provided by the standard plugins, which are