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');
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;
+ };
+});
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 @@
-
-
+
+
+
@@ -197,7 +202,9 @@
-
+
+
+
@@ -248,57 +255,12 @@
-->
-
-
-
-