From 21b1f67b62772a065e761a196b55c3d354b3b229 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 31 Jan 2018 11:35:38 +0530
Subject: [PATCH] course details changes done

---
 .../assets/views/student/student_details.html | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 1f130b98..c01cb702 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -50,15 +50,15 @@
             <tab heading="View Student" id="studentbranch">
                 <div class="container-fluid container-fullw">
                     <div class="row">
-                     
 
-                    
+
+
                         <div class="container">
                             <div class="row">
                                 <!--<pre>{{searchData | json }}</pre> -->
                                    <div class="col-md-3">
                                     <!--<label for="form-field-select-2">
-                                               Batch 
+                                               Batch
                         </label>
 
                                     <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
@@ -71,14 +71,14 @@
                                         });
                                     </script>-->
                                      <label for="form-field-select-2">
-                                               Search 
+                                               Search
                         </label>
                                     <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
-                                
+
                                 </div>
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               University 
+                                               University
                         </label>
 
                                     <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
@@ -91,7 +91,7 @@
 
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               Course 
+                                               Course
                         </label>
 
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
@@ -102,7 +102,7 @@
 
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               Status 
+                                               Status
                         </label>
 
                                     <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Status" ng-change="getValueChange()">
@@ -111,7 +111,7 @@
                           <option  value="0">Deactive</option>
                         </select>
                                      <!--<label for="form-field-select-2">
-                                               Search 
+                                               Search
                         </label>
                                     <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
                                 -->
@@ -162,7 +162,7 @@
                             </div>
                             <!--<pre>{{results.length}}</pre>-->
                             <div class="table-responsive">
-                                <table class="table table-hover">
+                                <table class="table table-hover" ng-controller="studentModalDemoCtrl">
                                     <thead>
                                         <tr>
                                             <th ng-click="sort('MobileNumber')">MobileNumber
@@ -187,14 +187,14 @@
                                     <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
                                         <tr>
                                             <td>
-                                                <a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
+                                                <a tooltip="View Student" ng-click="open(p);" class="text-dark">
                                                     {{p.MobileNumber}}
                                                 </a>
                                             </td>
 
                                             <td>
 
-                                                <a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
+                                                <a tooltip="View Student" ng-click="open(p);" class="text-dark">
                                                     {{p.Firstname}} {{p.Lastname}}
                                                 </a>
 
@@ -216,9 +216,6 @@
                                         <tr ng-show="editCourseId === p.StudentID" ng-if="editCourseId === p.StudentID">
                                             <td colspan="6" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
                                         </tr>
-                                        <tr ng-show="studentViewPage === p.StudentID" ng-if="studentViewPage === p.StudentID">
-                                            <td colspan="6" ng-include src="'assets/views/student/studentViewInManagement.html'"></td>
-                                        </tr>
                                     </tbody>
                                 </table>
                                 <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
@@ -472,7 +469,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.caste.$dirty && Form.caste.$invalid}">
                                             <label>
-                                                Caste 
+                                                Caste
                                             </label>
 
                                             <input type="text" placeholder="Enter Caste" tabindex="15" class="form-control" name="caste" ng-model="myModel.caste" ng-pattern="/^[a-zA-Z.\s]*$/"
@@ -481,7 +478,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.category.$dirty && Form.category.$invalid}">
                                             <label>
-                                                Category 
+                                                Category
                                             </label>
 
                                             <input type="text" placeholder="Enter Category" tabindex="16" class="form-control" name="category" ng-model="myModel.category"
@@ -493,7 +490,7 @@
 
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.religion.$dirty && Form.religion.$invalid}">
                                             <label>
-                                                Religion 
+                                                Religion
                                             </label>
 
                                             <input type="text" placeholder="Enter Religion" tabindex="17" class="form-control" name="religion" ng-model="myModel.religion"
@@ -502,7 +499,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.nationality.$dirty && Form.nationality.$invalid}">
                                             <label>
-                                                Nationality 
+                                                Nationality
                                             </label>
 
                                             <input type="text" placeholder="Enter Nationality" tabindex="18" class="form-control" name="nationality" ng-model="myModel.nationality"
@@ -511,7 +508,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.qualificaion.$dirty && Form.qualificaion.$invalid}">
                                             <label>
-                                               Pre Qualification 
+                                               Pre Qualification
                                             </label>
 
                                             <input type="text" placeholder="Enter Qualification" tabindex="19" class="form-control" name="qualificaion" ng-model="myModel.prequalification"
@@ -523,7 +520,7 @@
 
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.occupation.$dirty && Form.occupation.$invalid}">
                                             <label>
-                                                Occupation 
+                                                Occupation
                                             </label>
 
                                             <input type="text" placeholder="Enter Occupation" tabindex="20" class="form-control" name="occupation" ng-model="myModel.occupation"
@@ -532,7 +529,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.designation.$dirty && Form.designation.$invalid}">
                                             <label>
-                                                Designation 
+                                                Designation
                                             </label>
 
                                             <input type="text" placeholder="Enter Designation" tabindex="21" class="form-control" name="designation" ng-model="myModel.designation"
@@ -541,7 +538,7 @@
                                         </div>
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.companyname.$dirty && Form.companyname.$invalid}">
                                             <label>
-                                                Company Name 
+                                                Company Name
                                             </label>
 
                                             <input type="text" placeholder="Enter Company Name" tabindex="22" class="form-control" name="companyname" ng-model="myModel.companyname"
@@ -552,7 +549,7 @@
                                     <div class="row">
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.referredby.$dirty && Form.referredby.$invalid}">
                                             <label>
-                                                Referred By 
+                                                Referred By
                                             </label>
 
                                             <input type="text" placeholder="Enter Refer's Name" tabindex="23" class="form-control" name="referredby" ng-model="myModel.referredby"
@@ -677,7 +674,7 @@
                                     <div class="row">
                                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.enrollmentid.$dirty && Form.enrollmentid.$invalid}">
                                             <label>
-                                                Enrollment ID 
+                                                Enrollment ID
                                             </label>
                                             <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid"
                                             />