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

---
 .../views/student/studentDetailsModal.html      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html
index 5d4a7e56..665d2f9e 100644
--- a/Apollo/assets/views/student/studentDetailsModal.html
+++ b/Apollo/assets/views/student/studentDetailsModal.html
@@ -234,6 +234,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>
@@ -248,7 +249,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>  <span>{{fees.RollNo}}</span></td>
@@ -308,7 +313,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>
@@ -354,7 +359,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>
@@ -373,7 +378,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>
@@ -416,7 +421,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>
@@ -431,7 +436,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>