From 51322b1508fdac3949846dfcdfd055f6f9a06dec Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 11 Jan 2018 18:28:11 +0530
Subject: [PATCH 1/3] student view changed

---
 Apollo/api/application/models/Studentview_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php
index 1af601d4..776172a0 100755
--- a/Apollo/api/application/models/Studentview_model.php
+++ b/Apollo/api/application/models/Studentview_model.php
@@ -205,7 +205,7 @@ class Studentview_model extends CI_Model
      * created by kms
      * */
     public function  getStudentMaterialDetails($studentID=null,$courseID=null){
-        $this->db->select('SMS.SDate,SMS.Comments,CF.Sem_Year,PLD.ListName');
+        $this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,CF.Sem_Year,PLD.ListName');
         $this->db->from(STUDY_MATERIAL_STATUS.' as SMS');
         $this->db->join(COURSE_FEES.' as CF','CF.ID = SMS.CourseID');
         $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
@@ -252,7 +252,7 @@ class Studentview_model extends CI_Model
      * */
     public function getMarkcardDetails($studentID=null,$courseID=null){
 
-        $this->db->select('CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName');
+        $this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName');
         $this->db->from(CERTIFICATION_STATUS.' as CS');
         $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID');
         $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
@@ -273,7 +273,7 @@ class Studentview_model extends CI_Model
      * get student application details
      * created by kms*/
     public function getStudentApplicationDetails($studentID=null,$courseID=null){
-        $this->db->select('AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName');
+        $this->db->select('AS.CourseID,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName');
         $this->db->from(APPLICATION_STATUS.' as AS');
         $this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID');
         $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');

From 40f69f2d63f3c04708d971fea24f7a28e8e0a6f7 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 11 Jan 2018 18:30:03 +0530
Subject: [PATCH 2/3] course details changes done

---
 .../assets/js/controllers/studentViewCtrl.js   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js
index 19b0cdf8..b2447f5e 100755
--- a/Apollo/assets/js/controllers/studentViewCtrl.js
+++ b/Apollo/assets/js/controllers/studentViewCtrl.js
@@ -95,4 +95,22 @@ app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsS
 
 
 }]);
+app.filter('unique', function() {
+    return function(collection, primaryKey, secondaryKey) { //optional secondary key
+        var output = [],
+            keys = [];
+
+        angular.forEach(collection, function(item) {
+            var key;
+            secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey];
+
+            if(keys.indexOf(key) === -1) {
+                keys.push(key);
+                output.push(item);
+            }
+        });
+
+        return output;
+    };
+});
 

From a89ca3c34feea97f968c6c23042218e3e72629d3 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 11 Jan 2018 18:30:21 +0530
Subject: [PATCH 3/3] course details changes done

---
 Apollo/assets/views/student/studentView.html | 126 ++++++++++---------
 1 file changed, 67 insertions(+), 59 deletions(-)

diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html
index 4b51344b..463c6994 100755
--- a/Apollo/assets/views/student/studentView.html
+++ b/Apollo/assets/views/student/studentView.html
@@ -173,15 +173,20 @@
     <div class="row" ng-repeat="course in courseDetails.courseStatus">
         <div class="col-md-12">
             <div class="panel panel-white" id="panel2">
-                <div class="panel-heading ">
-                    <div class="clearfix padding-5 space5">
+                <div class="panel-heading">
+                    <div class="clearfix padding-5 space5" >
 
                         <div class="col-xs-3 text-center no-padding">
 <!--
                             <h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
 -->
-                            <a class="panel-title text-blue" tooltip="University / Course Name">
-                               <i class="ti-book text-purple"></i> {{course.UniversityName}} / {{course.CourseName}}
+                            <a class="panel-title text-blue" tooltip="University">
+                               {{course.UniversityName}}
+                            </a>
+                        </div>
+                        <div class="col-xs-3 text-center no-padding">
+                            <a class="text-blue">
+                                Course &nbsp;:&nbsp;{{course.CourseName}}
                             </a>
                         </div>
                         <div class="col-xs-3 text-center no-padding">
@@ -197,7 +202,9 @@
 
 
                     </div>
-                    <ct-paneltool class="panel-tools" tool-collapse="tool-collapse"></ct-paneltool>
+                    <ct-paneltool class="panel-tools" tool-collapse="tool-collapse">
+
+                    </ct-paneltool>
                 </div>
 
 
@@ -248,57 +255,12 @@
 
                                 </div>
                             </tab>-->
-
-                            <tab heading="Document Details" id="document">
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
-                                    <div ng-if="course.applicationDetails==false">
-                                        <center>
-                                            <h5 class="text-dark">No Document Details!</h5>
-                                        </center>
-                                    </div>
-                                    <table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
-                                        <thead>
-                                        <tr>
-                                           <!-- <th>Type</th>-->
-                                            <th>Document Name</th>
-                                            <th>Status</th>
-                                            <th>Comments</th>
-
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        <tr ng-repeat="cert in course.applicationDetails">
-                                           <!-- <td>
-                                                <span>{{cert.Sem_Year}}</span>
-                                            </td>-->
-                                            <td>
-                                                <span>{{cert.CertificateName}}</span>
-                                            </td>
-                                            <td>
-                                                <span>{{cert.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{cert.AppDate}}</span>
-                                            </td>
-                                            <td>
-                                                <span>{{cert.Comments}}</span>
-                                            </td>
-
-
-                                        </tr>
-
-                                        </tbody>
-                                    </table>
-
-                                    <!--
-                                    view tab end
-                                    -->
-
-                                </div>
-                            </tab>
                             <tab heading="Fees Details" id="fees">
                                 <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.feesDetails==false">
-                                        <center>
-                                            <h5 class="text-dark">No Fees Details!</h5>
-                                        </center>
+                                        <!--  <center>
+                                              <h5 class="text-dark">No Fees Details!</h5>
+                                          </center>-->
                                     </div>
                                     <table class="table no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false">
                                         <thead>
@@ -378,12 +340,58 @@
 
                             </tab>
 
+                            <tab heading="Document Details" id="document">
+                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                    <div ng-if="course.applicationDetails==false">
+                                        <!--<center>
+                                            <h5 class="text-dark">No Document Details!</h5>
+                                        </center>-->
+                                    </div>
+                                    <table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
+                                        <thead>
+                                        <tr>
+                                           <!-- <th>Type</th>-->
+                                            <th>Document Name</th>
+                                            <th>Status</th>
+                                            <th>Comments</th>
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="cert in course.applicationDetails">
+                                           <!-- <td>
+                                                <span>{{cert.Sem_Year}}</span>
+                                            </td>-->
+                                            <td>
+                                                <span>{{cert.CertificateName}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{cert.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{cert.AppDate}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{cert.Comments}}</span>
+                                            </td>
+
+
+                                        </tr>
+
+                                        </tbody>
+                                    </table>
+
+                                    <!--
+                                    view tab end
+                                    -->
+
+                                </div>
+                            </tab>
+
+
                             <tab heading="Mark Card Details" id="mark">
                                 <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.markCardDetails==false">
-                                        <center>
+                                        <!--<center>
                                             <h5 class="text-dark">No Mark Card Details!</h5>
-                                        </center>
+                                        </center>-->
                                     </div>
                                     <table class="table no-margin ng-scope" ng-if="course.markCardDetails!=false">
                                         <thead>
@@ -396,7 +404,7 @@
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        <tr ng-repeat="mark in course.markCardDetails">
+                                        <tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
                                              <td>
                                                  <span>{{mark.Sem_Year}}</span>
                                              </td>
@@ -425,9 +433,9 @@
                             <tab heading="Study Material Details" id="material">
                                 <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.studyMaterialDetails==false">
-                                        <center>
+                                       <!-- <center>
                                             <h5 class="text-dark">No Study Material Details!</h5>
-                                        </center>
+                                        </center>-->
                                     </div>
                                     <table class="table no-margin ng-scope" ng-if="course.studyMaterialDetails!=false">
                                         <thead>
@@ -441,7 +449,7 @@
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        <tr ng-repeat="study in course.studyMaterialDetails">
+                                        <tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
                                             <td>
                                                 <span>{{study.Sem_Year}}</span></td>
                                             <!--<td>