From 3b53431fda9f77c09a5f9795a8c3ec6b94ee582e Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Mon, 1 Oct 2018 11:39:44 +0530
Subject: [PATCH] change the studentdetails model

---
 .../views/student/studentDetailsModal.html    | 85 ++++++++++++-------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html
index 4fccfcb1..b5e42edf 100755
--- a/Apollo/assets/views/student/studentDetailsModal.html
+++ b/Apollo/assets/views/student/studentDetailsModal.html
@@ -322,13 +322,16 @@
                                                 <th>Status</th>
                                                 <th>Date</th>
                                                 <th>Comments</th> -->
-
+                                                 <th style="text-align:center;">Date</th>
+												  <th style="text-align:center;">Batch</th>
+												  <th style="text-align:center;">SEM/YEAR</th>
+												   <th style="text-align:center;">Form Type</th>
                                                  <th  style="text-align:center;">Status</th> 
                                                 <th style="text-align:center;">Comments</th>
-                                                <th style="text-align:center;">Batch</th>
-                                                <th style="text-align:center;">Date</th>
-                                                <th style="text-align:center;">SEM/YEAR</th>
-                                                <th style="text-align:center;">Form Type</th>
+                                               
+                                                
+                                                
+                                               
                                             </tr>
                                             </thead>
                                             <tbody>
@@ -346,13 +349,16 @@
                                                     <span style="white-space:pre-wrap;">{{apps.Comments}}</span>
                                                 </td> -->
 
-
+                                            <td><span>{{apps.StatusUpdateDate}}</span></span></td>
+											<td><span>{{apps.BatchCode}}</span></span></td>
+											<td><span>{{apps.Sem_Year}}</span></td>
+											<td><span>{{apps.RegistrationType}}</span></td>
                                             <td><span>{{apps.ListName}} </span></td>
                                             <td><span>{{apps.Comments}}</span></td>
-                                            <td><span>{{apps.BatchCode}}</span></span></td>
-                                            <td><span>{{apps.StatusUpdateDate}}</span></span></td>
-                                            <td><span>{{apps.Sem_Year}}</span></td>
-                                            <td><span>{{apps.RegistrationType}}</span></td>
+                                           
+                                            
+                                           
+                                            
 
                                             </tr>
 
@@ -377,24 +383,26 @@
                                             <thead>
                                             <tr>
                                                 <!-- <th>Type</th>-->
+												 <th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <th style="text-align:center;">Status</th>
-                                                <th style="text-align:center;">Date</th>
+                                               
                                                 <th style="text-align:center;">Comments</th>
 
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'">
-                                                 <td>
+                                                <td>
+                                                    <span>{{booklet.AnsDate}}</span>
+                                                </td>                                                
+												<td>
                                                      <span>{{booklet.Sem}}</span>
                                                  </td>
                                                 <td>
                                                     <span>{{booklet.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                    <span>{{booklet.AnsDate}}</span>
-                                                </td>
+                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{booklet.Comments}}</span>
                                                 </td>
@@ -425,9 +433,10 @@
                                             <thead>
                                             <tr>
                                                 <!-- <th>Type</th>-->
+												<th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Certificate Name</th>
                                                 <th style="text-align:center;">Status</th>
-                                                <th style="text-align:center;">Date</th>
+                                                
                                                 <th style="text-align:center;">Comments</th>
 
                                             </tr>
@@ -437,15 +446,16 @@
                                                 <!-- <td>
                                                      <span>{{cert.Sem_Year}}</span>
                                                  </td>-->
+												 <td>
+                                                   <span>{{cert.AppDate}}</span>
+                                                </td>
                                                 <td>
                                                     <span>{{cert.CertificateName}}</span>
                                                 </td>
                                                 <td>
                                                     <span>{{cert.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                   <span>{{cert.AppDate}}</span>
-                                                </td>
+                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{cert.Comments}}</span>
                                                 </td>
@@ -475,10 +485,11 @@
                                         <table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.markCardDetails!=false" fixed-header>
                                             <thead>
                                             <tr>
+											   <th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <!-- <th>Name</th>-->
                                                 <th style="text-align:center;">Status</th>
-                                                <th style="text-align:center;">Date</th>
+                                                
                                                 <th style="text-align:center;">Comments</th>
 
                                             </tr>
@@ -486,6 +497,9 @@
                                             <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">
                                             <tr ng-repeat="mark in course.markCardDetails | unique:'Sem'">
                                                 <td>
+                                                   <span>{{mark.CDate}}</span>
+                                                </td>                                               
+											   <td>
                                                     <span>{{mark.Sem_Year}} ({{mark.Sem}})</span>
                                                 </td>
                                                 <!--<td>
@@ -494,9 +508,7 @@
                                                 <td>
                                                     <span>{{mark.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                   <span>{{mark.CDate}}</span>
-                                                </td>
+                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{mark.Comments}}</span>
                                                 </td>
@@ -508,6 +520,10 @@
                                             <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType!='F001'">
                                             <tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
                                                 <td>
+                                                    <span>{{mark.CDate}}</span>
+                                                </td>
+												
+												<td>
                                                     <span>{{mark.Sem_Year}}</span>
                                                 </td>
                                                 <!--<td>
@@ -516,9 +532,7 @@
                                                 <td>
                                                     <span>{{mark.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                    <span>{{mark.CDate}}</span>
-                                                </td>
+                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{mark.Comments}}</span>
                                                 </td>
@@ -546,10 +560,11 @@
                                         <table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.studyMaterialDetails!=false" fixed-header>
                                             <thead>
                                             <tr>
+											<th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <!-- <th>Date</th>-->
                                                 <th style="text-align:center;">Status</th>
-                                                <th style="text-align:center;">Date</th>
+                                                
                                                 <th style="text-align:center;">Comments</th>
 
 
@@ -557,16 +572,18 @@
                                             </thead>
                                             <tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'">
                                             <tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'">
+                                               
                                                 <td>
+                                                   <span>{{study.SDate}}</span>
+                                                </td>
+											   <td>
                                                     <span>{{study.Sem_Year}} ({{study.Sem}})</span></td>
                                                 <!--<td>
                                                     <span>{{study.SDate}}</span></td>-->
                                                 <td>
                                                     <span>{{study.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                   <span>{{study.SDate}}</span>
-                                                </td>
+                                               
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{study.Comments}}</span></td>
 
@@ -576,15 +593,17 @@
                                             <tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType!='F001'">
                                             <tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
                                                 <td>
+                                                    <span>{{study.SDate}}</span>
+                                                </td>
+												
+												<td>
                                                     <span>{{study.Sem_Year}}</span></td>
                                                 <!--<td>
                                                     <span>{{study.SDate}}</span></td>-->
                                                 <td>
                                                     <span>{{study.ListName}} </span>
                                                 </td>
-                                                <td>
-                                                    <span>{{study.SDate}}</span>
-                                                </td>
+                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{study.Comments}}</span></td>