diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html
index 1ad62305..e96482ff 100755
--- a/Apollo/assets/views/callTrackingDetails.html
+++ b/Apollo/assets/views/callTrackingDetails.html
@@ -85,23 +85,23 @@
 
 
 
-                                        <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search Date" ng-hide="hideDateSearch==true" />
+                                        <input class="form-control" type="text" ng-model="search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
                                     </div>
 
                                     <div class="col-md-2">
-                                        <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search Mobile/Name" />
+                                        <input class="form-control" type="text" ng-model="myModel.mobile" id="search2" autofocus tabindex="2" placeholder="Search Mobile/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" />
+                                        <input class="form-control" type="text" ng-model="myModel.currentActivity" id="search3" autofocus tabindex="3" 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" />
+                                        <input class="form-control" type="text" ng-model="myModel.employee" id="search4" autofocus tabindex="4" 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" />
+                                        <input class="form-control" type="text" ng-model="myModel.trackStatus" id="search5" autofocus tabindex="5" placeholder="Search Status" />
                                     </div> 
                                     <br><br>
                                 </div>
@@ -140,14 +140,14 @@
                                         </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">
-                                        <tr ng-click="setEditId(p);" title="Click to view tracking details">
-                                            <td><a class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td>
+                                        <tr ng-click="setEditId(p,myModel);" title="Click to view tracking details">
+                                            <td><a class="text-orange" ng-click="setEditId(p,myModel);">{{p.TrackingID}}</a></td>
                                             <td>{{p.followupDetails }}</td>
                                             <td>{{p.LeadName}}</td>
                                             <td>{{p.MobileNumber}}</td>
                                             <td>{{p.UniversityName}}</td>
                                             <td>{{p.CourseName }}</td>
-                                            <td>{{p.ListName}}</td>
+                                            <td>{{p.ActivityName}}</td>
                                             <td>{{p.Firstname}}</td>
                                             <!--<td ng-if="p.StatusCode=='S001'"><a href="#"  class="text-orange" ng-click="setEditId(p);" title="Open"><b class="fa fa-hover fa-phone " aria-hidden="true"></b>
                                             </a></td>
@@ -157,8 +157,8 @@
                                                 padding: 0.5em 0.6em;" aria-hidden="true"></b>
                                             </a></td>-->
 
-                                            <td class="hidden-xs" ng-if="p.StatusCode=='S001'"><span class="label label-sm label-warning">{{p.statusListName}}</span></td>
-                                            <td class="hidden-xs" ng-if="p.StatusCode!='S001'"><span class="label label-sm label-success">{{p.statusListName}}</span></td>
+                                            <td class="hidden-xs" ng-if="p.statusName!='CLOSE'"><span class="label label-sm label-warning">{{p.statusName}}</span></td>
+                                            <td class="hidden-xs" ng-if="p.statusName=='CLOSE'"><span class="label label-sm label-success">{{p.statusName}}</span></td>
 
 
                                         </tr>
@@ -346,7 +346,7 @@
                                             </label>
                                             <select class="form-control" name="activity" id="Box1" tabindex="6"
                                                     ng-model="myModel.activity"
-                                                    ng-options="source.ListCode as source.ListName for source in activity"
+                                                    ng-options="source.activityName for source in activity"
                                                     required>
 
                                                 <option value=""> Select Activity</option>
@@ -369,25 +369,32 @@
 
                                         </div>
                                         <div class="col-md-3 form-group" ng-if="loading==false"
-                                             ng-class="{'has-error':Form.assigned.$dirty && Form.assigned.$invalid, 'has-success':Form.assigned.$valid}">
+                                             ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
                                             <label >
-                                                Assigned To <span
+                                                Status <span
                                                     class="symbol required"></span>
                                             </label>
-
-                                            <select class="form-control" name="assigned" id="Box2" tabindex="7"
-                                                    ng-model="myModel.assignedTo"
-                                                    ng-options="emp.loginId as emp.staffName for emp in staffDetails"
+                                            <select class="form-control" name="status" id="Box3" tabindex="7"
+                                                    ng-model="myModel.status"
+                                                    ng-options="checkStatus.ListCode as checkStatus.ListName for checkStatus in myModel.activity.activityStatus"
                                                     required>
 
-                                                <option value=""> Select Assigned To</option>
+                                                <option value="">Select Status</option>
 
                                             </select>
                                             <span class="error text-small block"
-                                                  ng-if="Form.assigned.$dirty && Form.assigned.$error.required && myModel.assignedTo.length==0">Assigned to is required</span>
+                                                  ng-if="Form.status.$dirty && Form.status.$error.required && myModel.status.length==0">Status is required</span>
                                             <!--<span class="success text-small block"-->
                                             <!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
                                         </div>
+
+
+
+
+
+
+
+
                                         <div class="col-md-3" ng-if="loading==true">
                                             <spinner name="html5spinner">
                                                 <div class="overlay"></div>
@@ -400,24 +407,26 @@
 
                                         </div>
                                         <div class="col-md-3 form-group" ng-if="loading==false"
-                                             ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                                             ng-class="{'has-error':Form.assigned.$dirty && Form.assigned.$invalid, 'has-success':Form.assigned.$valid}">
                                             <label >
-                                                Status <span
+                                                Assigned To <span
                                                     class="symbol required"></span>
                                             </label>
-                                            <select class="form-control" name="status" id="Box3" tabindex="8"
-                                                    ng-model="myModel.status"
-                                                    ng-options="checkStatus.ListCode as checkStatus.ListName for checkStatus in status"
+
+                                            <select class="form-control" name="assigned" id="Box2" tabindex="8"
+                                                    ng-model="myModel.assignedTo"
+                                                    ng-options="emp.loginId as emp.staffName for emp in staffDetails"
                                                     required>
 
-                                                <option value="">Select Status</option>
+                                                <option value=""> Select Assigned To</option>
 
                                             </select>
                                             <span class="error text-small block"
-                                                  ng-if="Form.status.$dirty && Form.status.$error.required && myModel.status.length==0">Status is required</span>
+                                                  ng-if="Form.assigned.$dirty && Form.assigned.$error.required && myModel.assignedTo.length==0">Assigned to is required</span>
                                             <!--<span class="success text-small block"-->
                                             <!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
                                         </div>
+
                                     </div>
                                     <div class="row">
                                         <div class="col-md-3 form-group"