From 3a1e3533e0a506f740fa3b76450097ce978f4082 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 09:50:05 +0530
Subject: [PATCH 1/6] call track changes in fees status

---
 Apollo/api/application/models/Fees_status_model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index b5159f81..d55c5cdd 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -560,6 +560,9 @@ class Fees_status_model extends CI_Model
                     $insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments'];
                     $insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
                     $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
+                    $insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
+                    $insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
+
                     $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
                     // this if for insert follow up details
 

From 1df5d0ba3c7ea8fa440deef97bad6cd1786bcc46 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 09:50:55 +0530
Subject: [PATCH 2/6] call track changes in student pending document updates

---
 Apollo/api/application/models/Student_model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 04090f39..131b131d 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -1090,6 +1090,9 @@ class Student_model extends CI_Model {
                         $insertfollowup_Details['FollowupComments'] = $arrayDetails['FollowupComments'];
                         $insertfollowup_Details['CreatedBy'] = $fromDetails['CreatedBy'];
                         $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
+                        $insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
+                        $insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
+
                         $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
                         // this if for insert follow up details
                         

From 2e1c10954771601ecd0505d78c38c68adb79819b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 10:02:47 +0530
Subject: [PATCH 3/6] student pending document comments changes

---
 Apollo/assets/views/student/editStudentDetails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html
index 325c3de4..5fce2f43 100755
--- a/Apollo/assets/views/student/editStudentDetails.html
+++ b/Apollo/assets/views/student/editStudentDetails.html
@@ -633,7 +633,7 @@
                             </thead>
                             <tbody ng-repeat="penddoc in studentPendingDocumentsDetails">
                                 <tr>
-                                    <td>{{penddoc.Details}}</td>
+                                    <td><span style="white-space:pre-wrap;">{{penddoc.Details}}</span></td>
                                     <td>{{penddoc.DocumentDate}}</td>
                                     <!--<td>
                                         <span ng-if="penddoc.Status == 1">Open</span>

From fb53000680464f68252b89e1a4e3034900f0c20c Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 10:25:43 +0530
Subject: [PATCH 4/6] universal search changes in call track

---
 Apollo/assets/views/callTrackingCloseDetails.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html
index d55a1178..29d0299a 100755
--- a/Apollo/assets/views/callTrackingCloseDetails.html
+++ b/Apollo/assets/views/callTrackingCloseDetails.html
@@ -53,10 +53,12 @@
                            close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
                     <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
                 </div>
-
-
-
-
+            </div>
+            <div class="col-md-2">
+                <label>
+                    Search
+                </label>
+                <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
             </div>
         </div>
         <div class="table-responsive">
@@ -92,7 +94,7 @@
 
                     </tr>
                     </thead>
-                    <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">
+                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
                     <tr>
 
                         <td ng-if="p.Flag==false">

From a11e5fc707bd98acf7cf870ae131e5bd3a0892a6 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 10:25:54 +0530
Subject: [PATCH 5/6] universal search changes in call track

---
 Apollo/assets/views/callTrackingPendingDetails.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html
index a3999f06..e8a25540 100755
--- a/Apollo/assets/views/callTrackingPendingDetails.html
+++ b/Apollo/assets/views/callTrackingPendingDetails.html
@@ -54,10 +54,12 @@
                            close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
                     <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
                 </div>
-
-
-
-
+            </div>
+            <div class="col-md-2">
+                <label>
+                    Search
+                </label>
+                <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
             </div>
         </div>
         <div class="table-responsive">
@@ -93,7 +95,7 @@
 
                     </tr>
                     </thead>
-                    <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">
+                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
                     <tr>
                         <td ng-if="p.Flag==false">
                             <a class="glyphicon ng-scope fa margin-right-5  fa-flag text-grey text-extra-large"  tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>

From e4c71ccf2846b89351b41a6ce0f3cd3373f153b0 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 31 May 2018 10:26:04 +0530
Subject: [PATCH 6/6] universal search changes in call track

---
 Apollo/assets/views/callTrackingLeadDetails.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html
index 38989084..84f87ff2 100755
--- a/Apollo/assets/views/callTrackingLeadDetails.html
+++ b/Apollo/assets/views/callTrackingLeadDetails.html
@@ -54,10 +54,12 @@
                            close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
                     <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
                 </div>
-
-
-
-
+            </div>
+            <div class="col-md-2">
+                <label>
+                   Search
+                </label>
+                <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
             </div>
         </div>
         <div class="table-responsive">
@@ -93,7 +95,7 @@
 
                     </tr>
                     </thead>
-                    <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">
+                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
                     <tr>
                         <td ng-if="p.Flag==false">
                             <a class="glyphicon ng-scope fa margin-right-5  fa-flag text-grey text-extra-large"  tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>