diff --git a/Apollo/api/application/models/Status_model.php b/Apollo/api/application/models/Status_model.php
index e46c4da8..c94c023e 100755
--- a/Apollo/api/application/models/Status_model.php
+++ b/Apollo/api/application/models/Status_model.php
@@ -90,7 +90,7 @@ class Status_model extends CI_Model {
             $this->db->update(PICK_LIST_DETAILS, $arrayDetails);
              if($this->db->affected_rows() == '1'){
                 $result['Status'] = true;
-                $result['message'] = "Successfully status name is updated";
+                $result['message'] = "Successfully status detail is updated";
             }
             else {
                 $result['Status'] = false;
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 1533ac1f..f96eedfa 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -482,6 +482,12 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
     $scope.resetImage = function () {
         $scope.files.length = 0;
         $scope.stepsModel.length = 0;
+    }
+	
+	$scope.getChangeDate = function() {
+      var formate = "dd-MM-yyyy";
+     $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
+               
     }
 
     // add student
@@ -506,7 +512,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
                 $scope.disableButton = true;
                 var formate = "dd-MM-yyyy";
                 $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0;
-                $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
+                //$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
                 $scope.myModelCourseAdd.dateofjoining = $filter('date')(new Date($scope.myModelCourseAdd.dateofjoining), formate);    
                 var idStuProof = $scope.files[0];
                
diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html
index 1676a71b..dbe0dea6 100755
--- a/Apollo/assets/views/activity.html
+++ b/Apollo/assets/views/activity.html
@@ -72,7 +72,7 @@
                                ng-model="companies.status"
                                required>
                         <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.status.$dirty && Form.status.$error.required && myModel.status.length!=0">Status is required.</span>
                         <!--<span class="success text-small block"-->
                         <!--ng-if="Form.subjects.$valid && myModel.subjects.length!=0">Thank You</span>-->
                     </div>
@@ -126,6 +126,7 @@
                     </th>
                     <th>Description
                     </th>
+					<th>Status</th>
                     <th></th>
                    
 
@@ -136,7 +137,7 @@
                     <td>{{p.ActivityID}}</td>
                     <td>{{p.ActivityName}}</td>
                     <td>{{p.Description}}</td>
-
+					<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                     <td> 
                         <a class="text-azure" id="editRowBtn{{p.ActivityID}}" ng-click="setEditId(p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                             </a>
diff --git a/Apollo/assets/views/announcement/Announcement.html b/Apollo/assets/views/announcement/Announcement.html
index b8ac9755..2d402cd2 100755
--- a/Apollo/assets/views/announcement/Announcement.html
+++ b/Apollo/assets/views/announcement/Announcement.html
@@ -75,7 +75,7 @@
                                         <tr>
                                             <td>{{p.Heading}}</td>
                                             <!--<td>{{p.description}}</td>--> 
-                                            <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">InActive</span></td>        
+                                            <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>        
                                                    <td>            
                                                 <a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                                                 </a></td>
diff --git a/Apollo/assets/views/batch.html b/Apollo/assets/views/batch.html
index c41e388e..dbf4de72 100755
--- a/Apollo/assets/views/batch.html
+++ b/Apollo/assets/views/batch.html
@@ -71,6 +71,7 @@
                                         <th ng-click="sort('UniversityName')">University Name
                                             <span class="glyphicon sort-icon" ng-show="sortKey=='UniversityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                         </th>
+										<th>Status</th>
                                         <th> Action</th>
 
                                     </tr>
@@ -81,7 +82,7 @@
                                         <td>{{p.BatchCode}}</td>
                                         <td>{{p.BatchName}}</td>
                                         <td>{{p.UniversityName}}</td>
-
+										<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                                         <td> 
                                             
                                             <a class="text-azure" id="editRowBtn{{p.BatchCode}}" ng-click="setEditId(p.BatchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
diff --git a/Apollo/assets/views/branchDetails.html b/Apollo/assets/views/branchDetails.html
index affc222c..96b59912 100755
--- a/Apollo/assets/views/branchDetails.html
+++ b/Apollo/assets/views/branchDetails.html
@@ -69,21 +69,22 @@
                                                 <th ng-click="sort('BranchName')">Branch Name
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                 </th>
-                                                <th ng-click="sort('Address')">Address
+                                               <!-- <th ng-click="sort('Address')">Address
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='Address'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
-                                                </th>
+                                                </th> -->
                                                 <th ng-click="sort('EmailID')">Email Id
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                 </th>
                                                 <th ng-click="sort('MobileNumber')">Mobile Number
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                 </th>
-                                                <th ng-click="sort('AlternateNumber')">Alternate Mobile
+                                                <!--<th ng-click="sort('AlternateNumber')">Alternate Mobile
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='AlternateNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
-                                                </th>
+                                                </th> -->
                                                 <th ng-click="sort('LandlineNumber')">Landline Number
                                                     <span class="glyphicon sort-icon" ng-show="sortKey=='LandlineNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                 </th>
+												<th>Status</th>
                                                 <th>
                                                 </th>
                                             </tr>
@@ -92,11 +93,12 @@
                                             <tr>
                                                 <td>{{p.BranchCode}}</td>
                                                 <td>{{p.BranchName}}</td>
-                                                <td>{{p.Address}}</td>
+                                               <!-- <td>{{p.Address}}</td> -->
                                                 <td>{{p.EmailID}}</td>
                                                 <td>{{p.MobileNumber}}</td>
-                                                <td>{{p.AlternateNumber}}</td>
+                                              <!--  <td>{{p.AlternateNumber}}</td>-->
                                                 <td>{{p.LandlineNumber}}</td>
+												<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                                                 <td>
                                                     <a class="text-azure" id="editRowBtn{{p.BranchCode}}" ng-click="setEditId(p.BranchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                                                 </a></td>
diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html
index e62cc75d..9998faeb 100755
--- a/Apollo/assets/views/callTrackingDetails.html
+++ b/Apollo/assets/views/callTrackingDetails.html
@@ -88,19 +88,19 @@
                                     </div>
 
                                     <div class="col-md-2">
-                                        <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search Mobile/Name" />
+                                        <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search " />
                                     </div>
 									<!-- Search By Activity-->
                                      <div class="col-md-2 col-md-offset-2">
-                                        <input class="form-control" type="text" ng-model="search3" id="search3" autofocus tabindex="3" placeholder="Search Activity" />
+                                        <input class="form-control" type="text" ng-model="search3.ActivityName" 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" id="search4" autofocus tabindex="4" placeholder="Search Assigned To" />
+                                        <input class="form-control" type="text" ng-model="search4.Firstname" 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" id="search5" autofocus tabindex="5" placeholder="Search Status" />
+                                        <input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Search Status" />
                                     </div> 
                                     <br><br>
                                 </div>
@@ -139,8 +139,8 @@
                                         </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,search,search2,search3,search4,search5);">
-                                            <td><a class="text-orange" ng-click="setEditId(p,search,search2,search3,search4,search5);">{{p.TrackingID}}</a></td>
+                                        <tr ng-click="setEditId(p,search,search2,search3.Activity,search4.Assign,search5.status);">
+                                            <td><a class="text-orange" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName);">{{p.TrackingID}}</a></td>
                                             <td>{{p.followupDetails }}</td>
                                             <td>{{p.LeadName}}</td>
                                             <td>{{p.MobileNumber}}</td>
diff --git a/Apollo/assets/views/certificate/certificate.html b/Apollo/assets/views/certificate/certificate.html
index feb6e03c..cf70fe51 100755
--- a/Apollo/assets/views/certificate/certificate.html
+++ b/Apollo/assets/views/certificate/certificate.html
@@ -113,14 +113,16 @@
                     </th>
                     <th ng-click="sort('CertificateName')">Certificate Nmae
                         <span class="glyphicon sort-icon" ng-show="sortKey=='CertificateName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
-                    </th>                   
+                    </th>
+					<th>Status</th>					
                     <th></th>
                 </tr>
             </thead>
             <tbody dir-paginate="p in statusInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
                 <tr>
                     <td>{{p.CertificationID}}</td> 
-                    <td>{{p.CertificateName}}</td>                                    
+                    <td>{{p.CertificateName}}</td>
+					<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>					
                     <td> 
                         <a class="text-azure" id="editRowBtn{{p.CertificationID}}" ng-click="setEditId(p.CertificationID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                             </a>
diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html
index 27a3e3c1..bff82cb8 100755
--- a/Apollo/assets/views/courseDetails.html
+++ b/Apollo/assets/views/courseDetails.html
@@ -71,6 +71,7 @@
                                         <th ng-click="sort('UniversityName')">University
                                             <span class="glyphicon sort-icon" ng-show="sortKey=='UniversityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                         </th>
+										<th>Status</th>
                                         <th></th>
 
                                     </tr>
@@ -80,7 +81,7 @@
                                         <td>{{p.CourseID}}</td>
                                         <td>{{p.CourseName}}</td>
                                         <td>{{p.UniversityName}}</td>
-
+										<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                                         <td>
                                             <a class="text-azure" id="editRowBtn{{p.CourseID}}" ng-click="setEditId(p.CourseID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                                             </a>
diff --git a/Apollo/assets/views/employeeDetails.html b/Apollo/assets/views/employeeDetails.html
index 78203fc7..4a8db68e 100755
--- a/Apollo/assets/views/employeeDetails.html
+++ b/Apollo/assets/views/employeeDetails.html
@@ -92,6 +92,7 @@
                                             <th ng-click="sort('EmailID')">Email ID
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
+											<th>Status</th>
                                             <th style="text-align: center;"> Details
                                             </th>
                                         </tr>
@@ -103,6 +104,7 @@
                                             <td>{{p.Lastname}}</td>
                                             <td>{{p.MobileNumber}}</td>
                                             <td>{{p.EmailID}}</td>
+											<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                                             <td style="text-align: center;">
                                                 <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StaffID}}" value="Personal Details"
                                                     ng-click="setEditId(p.StaffID);">
diff --git a/Apollo/assets/views/status.html b/Apollo/assets/views/status.html
index 707d26bd..2619a3b5 100755
--- a/Apollo/assets/views/status.html
+++ b/Apollo/assets/views/status.html
@@ -124,13 +124,15 @@
                         <span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
 
                     </th>
+					<th>Status</th>
                     <th></th>
                 </tr>
             </thead>
             <tbody dir-paginate="p in statusInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
                 <tr>
                     <td>{{p.ListCode}}</td>
-                    <td>{{p.ListName}}</td>                  
+                    <td>{{p.ListName}}</td> 
+					<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>					
                         <td> 
                         <a class="text-azure" id="editRowBtn{{p.ListCode}}" ng-click="setEditId(p.ListCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                             </a>
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 1b5c7dda..bf816771 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -198,7 +198,7 @@
                                                 <input type="text" tabindex="8" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateofbirth"
                                                     is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
                                                     placeholder="Select Date of Birth" close-text="Close" required="required"
-                                                    ng-change="getMaxEndDate(myModel.startDate)" show-button-bar="false" max-date="currentDate"
+                                                    ng-change="getChangeDate()" show-button-bar="false" max-date="currentDate"
                                                 />
 
 
diff --git a/Apollo/assets/views/university.html b/Apollo/assets/views/university.html
index d5209543..3bbc5c45 100755
--- a/Apollo/assets/views/university.html
+++ b/Apollo/assets/views/university.html
@@ -56,6 +56,7 @@
                                             <th ng-click="sort('EmailID')">Email ID
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
+											<th>Status</th>
                                             <th style="text-align: center;"> Details
                                             </th>
                                         </tr>
@@ -66,6 +67,7 @@
                                             <td>{{p.UniversityShortName}}</td>
                                             <td>{{p.UniversityName}}</td>
                                             <td>{{p.EmailID}}</td>
+											<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
                                             <td style="text-align: center;">
                                                 <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.UniversityID}}" value="Modify"
                                                     ng-click="setEditId(p.UniversityID);">