From f415b43600693cef8c45b79077a12b01c732544f Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 10 Mar 2018 15:48:58 +0530
Subject: [PATCH] student view changes

---
 Apollo/assets/views/student/studentView.html | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html
index 1e253e7c..2731765f 100755
--- a/Apollo/assets/views/student/studentView.html
+++ b/Apollo/assets/views/student/studentView.html
@@ -196,7 +196,7 @@
             </div>
         </div>
     </div>
-  
+
     <div class="row" ng-repeat="course in courseDetails.courseStatus">
         <div class="col-md-12">
             <div class="panel panel-white" id="panel2">
@@ -208,7 +208,7 @@
                             <h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
 -->
                             <a class="panel-title text-blue" tooltip="University">
-                              <h3>{{course.UniversityName}}</h3> 
+                              <h3>{{course.UniversityName}}</h3>
                             </a>
                         </div>
                     </div>
@@ -253,6 +253,7 @@
                                         <thead>
                                         <tr>
                                             <th>Fees Name</th>
+                                            <th>Batch</th>
                                             <th ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
                                             <th ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
                                             <th>Roll Number</th>
@@ -267,7 +268,11 @@
                                         <tbody>
                                         <tr ng-repeat="fees in course.feesDetails">
                                             <td>
-                                                <span>{{fees.FeesName}}</span></td>
+                                                <span>{{fees.FeesName}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{fees.BatchName}}</span><span ng-if="fees.BatchDate!='' && fees.BatchDate!=null">&nbsp;({{fees.BatchDate}})</span>
+                                            </td>
                                             <td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
                                             <td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
                                             <td>
@@ -382,7 +387,7 @@
                                                 <span>{{cert.CertificateName}}</span>
                                             </td>
                                             <td>
-                                                <span>{{cert.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{cert.AppDate}}</span>
+                                                <span>{{cert.ListName}} </span><span ng-if="cert.AppDate!='' && cert.AppDate!=null">&nbsp; ON &nbsp;</span> <span>{{cert.AppDate}}</span>
                                             </td>
                                             <td>
                                                 <span>{{cert.Comments}}</span>
@@ -428,7 +433,7 @@
                                                 <span>{{mark.CertificateName}}</span>
                                             </td>-->
                                             <td>
-                                                <span>{{mark.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{mark.CDate}}</span>
+                                                <span>{{mark.ListName}} </span><span ng-if="mark.CDate!='' && mark.CDate!=null"> &nbsp; ON &nbsp;</span> <span>{{mark.CDate}}</span>
                                             </td>
                                             <td>
                                                 <span>{{mark.Comments}}</span>
@@ -448,7 +453,7 @@
                                                 <span>{{mark.CertificateName}}</span>
                                             </td>-->
                                             <td>
-                                                <span>{{mark.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{mark.CDate}}</span>
+                                                <span>{{mark.ListName}} </span><span ng-if="mark.CDate!='' && mark.CDate!=null">&nbsp; ON &nbsp;&nbsp;</span> <span>{{mark.CDate}}</span>
                                             </td>
                                             <td>
                                                 <span>{{mark.Comments}}</span>
@@ -492,7 +497,7 @@
                                             <!--<td>
                                                 <span>{{study.SDate}}</span></td>-->
                                             <td>
-                                                <span>{{study.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{study.SDate}}</span>
+                                                <span>{{study.ListName}} </span><span ng-if="study.SDate!='' && study.SDate!=null">&nbsp; ON &nbsp;</span> <span>{{study.SDate}}</span>
                                             </td>
                                             <td>
                                                 <span>{{study.Comments}}</span></td>
@@ -507,7 +512,7 @@
                                             <!--<td>
                                                 <span>{{study.SDate}}</span></td>-->
                                             <td>
-                                                <span>{{study.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{study.SDate}}</span>
+                                                <span>{{study.ListName}} </span><span ng-if="study.SDate!='' && study.SDate!=null">&nbsp; ON &nbsp;&nbsp;</span> <span>{{study.SDate}}</span>
                                             </td>
                                             <td>
                                                 <span>{{study.Comments}}</span></td>