diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html
index a364ca1a..325c3de4 100755
--- a/Apollo/assets/views/student/editStudentDetails.html
+++ b/Apollo/assets/views/student/editStudentDetails.html
@@ -113,7 +113,7 @@
                                             </label>
                                     <input type="text" name="primaryPhone" tabindex="2000" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber"
                                         ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)'
-                                         id="primaryPhone1" required/>
+                                        id="primaryPhone1" required/>
                                     <span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
                                     <span class="error text-small block" ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
                                 </div>
@@ -122,7 +122,8 @@
                                                 First Name <span class="symbol required"></span>
                                             </label>
                                     <input type="text" placeholder="Enter First Name" tabindex="2001" class="form-control" name="firstname" ng-model="p.Firstname"
-                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/>
+                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/"
+                                        required/>
                                     <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
                                     <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
                                 </div>
@@ -131,7 +132,8 @@
                                                 Last Name <span class="symbol required"></span>
                                             </label>
                                     <input type="text" placeholder="Enter Last Name" tabindex="2002" class="form-control" name="lastname" ng-model="p.Lastname"
-                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/>
+                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/"
+                                        required/>
                                     <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
                                     <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
                                 </div>
@@ -342,7 +344,8 @@
                                                 Referred By 
                                             </label>
                                     <input type="text" placeholder="Enter Refer's Name" tabindex="2022" class="form-control" name="referredby" ng-model="p.ReferredBy"
-                                       ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-pattern="/^[a-zA-Z.\s]*$/"
+                                    />
                                     <span class="error text-small block" ng-if="Form.referredby.$dirty && Form.referredby.$error.pattern">Invalid Referred By </span>
                                 </div>
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid}">
@@ -350,8 +353,8 @@
                                                 Refer's Mobile Number
                                             </label>
                                     <input type="text" name="referredmobilenumber" tabindex="2023" placeholder="Enter Refer's Mobile Number" class="form-control"
-                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-model="p.ReferersMobileNumber" ng-minlength="10"
-                                        ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
+                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-model="p.ReferersMobileNumber"
+                                        ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
                                     <span class="error text-small block" ng-if="Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid" ng-hide="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Refer's Mobile Number is required.</span>
                                     <span class="error text-small block" ng-if="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Enter a Valid Phone Number</span>
                                 </div>
@@ -369,74 +372,71 @@
                                     <label>
                                                 Active/De-Active
                                             </label>
-                                            <div ng-if="localUserType != 'R002'">
-                                    <div ng-if="p.IsActive==true" tabindex="2025">
-                                        <switch ng-model="p.IsActive" 
-                                   is-diabled="true"    ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-init="p.IsActive = true" class="green"></switch>
-                                    </div>
-                                    <div ng-if="p.IsActive==false">
-                                        <switch ng-model="p.IsActive"
-                                         ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'"
-                                          is-diabled="true"   ng-init="p.IsActive = false" class="green"></switch>
-                                    </div>
-                                            </div>
-                                            <div ng-if="localUserType == 'R002'">
-                                                <div ng-if="p.Fee_paid_exist == 1 ">
-                                                    <div ng-if="p.IsActive==true">
-<div ng-if="p.IsActive==true" tabindex="2025">
-                                        <lable> ACTIVE</lable>
+                                    <div ng-if="localUserType != 'R002'">
+                                        <div ng-if="p.IsActive==true" tabindex="2025">
+                                            <switch ng-model="p.IsActive" is-diabled="true" ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-init="p.IsActive = true"
+                                                class="green"></switch>
+                                        </div>
+                                        <div ng-if="p.IsActive==false">
+                                            <switch ng-model="p.IsActive" ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" is-diabled="true" ng-init="p.IsActive = false"
+                                                class="green"></switch>
                                         </div>
-                                    <div ng-if="p.IsActive==false">
-                                         <lable> IN-ACTIVE</lable>
-                                    </div>
-                                                    </div>
-                                                    <div ng-if="p.IsActive==false">
-                                            <switch ng-model="p.IsActive"
-                                        
-                                          is-diabled="true"   ng-init="p.IsActive = false" class="green"></switch>
-                                    
-                                                    </div>
-
-                                    
-                                                
-                                                </div>
-                                                 <div ng-if="p.Fee_paid_exist != 1 ">
-                                    <div ng-if="p.IsActive==true" tabindex="2025">
-                                        <switch ng-model="p.IsActive" 
-                                   is-diabled="true"    ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-init="p.IsActive = true" class="green"></switch>
-                                    </div>
-                                    <div ng-if="p.IsActive==false">
-                                        <switch ng-model="p.IsActive"
-                                         ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'"
-                                          is-diabled="true"   ng-init="p.IsActive = false" class="green"></switch>
                                     </div>
+                                    <div ng-if="localUserType == 'R002'">
+                                        <div ng-if="p.Fee_paid_exist == 1 ">
+                                            <div ng-if="p.IsActive==true">
+                                                <div ng-if="p.IsActive==true" tabindex="2025">
+                                                    <lable  ng-init="p.IsActive = true"> ACTIVE</lable>
                                                 </div>
+                                                <!--<div ng-if="p.IsActive==false">
+                                                    <lable> IN-ACTIVE</lable>
+                                                </div>-->
                                             </div>
+                                            <div ng-if="p.IsActive==false">
+                                                <switch ng-model="p.IsActive" is-diabled="true" ng-init="p.IsActive = false" class="green"></switch>
+
+                                            </div>
+
+
+
+                                        </div>
+                                        <div ng-if="p.Fee_paid_exist != 1 ">
+                                            <div ng-if="p.IsActive==true" tabindex="2025">
+                                                <switch ng-model="p.IsActive" is-diabled="true" ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-init="p.IsActive = true"
+                                                    class="green"></switch>
+                                            </div>
+                                            <div ng-if="p.IsActive==false">
+                                                <switch ng-model="p.IsActive" ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" is-diabled="true" ng-init="p.IsActive = false"
+                                                    class="green"></switch>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="col-md-4" ng-if="p.IsActive == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}">
                                     <label>
                                                 Reason for Deactivating <span class="symbol required"></span>
                                             </label>
                                     <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="2026" class="form-control textdsc" name="DeactiveComments"
-                                       ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'"  ng-model="p.DeactiveComments" required></textarea>
+                                        ng-disabled="p.Fee_paid_exist == 1  && localUserType == 'R002'" ng-model="p.DeactiveComments"
+                                        required></textarea>
                                     <span class="text-small block">Max 100 Characters.</span>
                                     <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
                                 </div>
                             </div>
-                              <div class="row" ng-if="localUserType == 'R004'">
+                            <div class="row" ng-if="localUserType == 'R004'">
                                 <div class="col-md-4 form-group">
-                                <label>
+                                    <label>
                                              Login Access Status
                                                 </label>
                                     <div ng-if="p.LoginAccess==1">
-                                <switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = true" class="green"></switch>
-                            </div>
-                            <div ng-if="p.LoginAccess==0">
-                                <switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = false" class="green"></switch>
-                            </div>
+                                        <switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = true" class="green"></switch>
+                                    </div>
+                                    <div ng-if="p.LoginAccess==0">
+                                        <switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = false" class="green"></switch>
+                                    </div>
                                     <!--<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>-->
                                 </div>
-                              </div>
+                            </div>
                             <!--<pre>{{ p | json}}</pre>-->
                             <input type="hidden" ng-init="hidden_DOB=p.DOB" ng-model="hidden_DOB">
                             <div class="row">
@@ -561,32 +561,24 @@
                                     <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
                                     <span class="error text-small block" ng-if="FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid" ng-hide="FormPendDoc.documentDetails.$error.maxlength || FormPendDoc.documentDetails.$error.minlength || FormPendDoc.documentDetails.$error.pattern">Pending Document Details required.</span>
                                 </div>
-								<div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
-                              <div data-ng-controller="DatepickerDemoCtrl">
-                              
-                                <label>
+                                <div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+
+                                        <label>
                                     Follow-up date<span
                                         class="symbol required"></span>
                                 </label>
-                                <input type="text" tabindex="1"
-                                       class="form-control "
-                                       ng-click="startOpen =!startOpen"
-                                       datepicker-popup="dd-MM-yyyy"
-                                       ng-model="myModelAddPendingDocDetails.documentDate"
-                                       is-open="startOpen"
-                                       ng-init="startOpen = false"
-                                       name="date"
-                                       datepicker-options="dateOptions"
-                                       placeholder="Select Date"
-                                       close-text="Close" ng-change="getDateFormat(p.SessionDate,'2');" required="required" ng-readonly="true"/>
-                                   <span class="error text-small block"
-                                      ng-if="Form.date.$dirty && Form.date.$error.required">Session date is required.</span>
-                                <!--<span class="success text-small block"-->
-                                <!--ng-if="Form.date.$valid ">Thank You</span>-->
-                            </div>
-    
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen =!startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAddPendingDocDetails.documentDate"
+                                            is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" ng-change="getDateFormat(p.SessionDate,'2');"
+                                            required="required" ng-readonly="true" />
+                                        <span class="error text-small block" ng-if="Form.date.$dirty && Form.date.$error.required">Session date is required.</span>
+                                        <!--<span class="success text-small block"-->
+                                        <!--ng-if="Form.date.$valid ">Thank You</span>-->
+                                    </div>
 
-                        </div>
+
+                                </div>
 
                                 <div class="col-md-2 form-group">
                                     <label>
@@ -642,7 +634,7 @@
                             <tbody ng-repeat="penddoc in studentPendingDocumentsDetails">
                                 <tr>
                                     <td>{{penddoc.Details}}</td>
-                                     <td>{{penddoc.DocumentDate}}</td>
+                                    <td>{{penddoc.DocumentDate}}</td>
                                     <!--<td>
                                         <span ng-if="penddoc.Status == 1">Open</span>
                                         <span ng-if="penddoc.Status == 0">Close</span>