Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
resicovenba
commit
36b2144fe7
@ -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');
|
||||
|
||||
@ -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;
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -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 : {{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> ON </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> ON </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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user