fixes: ps
This commit is contained in:
parent
41128b726f
commit
8eaaf839ab
@ -1249,22 +1249,34 @@ class Fees_status_model extends CI_Model
|
||||
$this->db->where('FeesType', $details['FeesType']);
|
||||
$checkExist=$this->db->get(STUDENTS_FEES_STATUS);
|
||||
|
||||
$this->db->select('SFS.FeesType,CF.Sem_Year,CF.ProgramType');
|
||||
$this->db->from(STUDENTS_FEES_STATUS.' as SFS');
|
||||
$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
|
||||
$this->db->where('SFS.CourseID',$details['CourseID']);
|
||||
$this->db->where('SFS.StudentID',$details['StudentID']);
|
||||
$result = $this->db->get()->result_array();
|
||||
// $this->db->select('SFS.FeesType,CF.Sem_Year,CF.ProgramType');
|
||||
// $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
|
||||
// $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
|
||||
// $this->db->where('SFS.CourseID',$details['CourseID']);
|
||||
// $this->db->where('SFS.StudentID',$details['StudentID']);
|
||||
// $result = $this->db->get()->result_array();
|
||||
|
||||
$this->db->select('ID')->from(COURSE_FEES)->where('CourseID',$details['CourseID']);
|
||||
$result2 = $this->db->get()->first_row();
|
||||
$CF_FeeID = $result2->ID;
|
||||
|
||||
$check = 0;// id has value means Sem1 Already Exist so NewReg Set t0 0 no value in ID(which means Empty) newreg value 1;
|
||||
// echo count($result);
|
||||
for($j=0;$j<count($result);$j++)
|
||||
{
|
||||
$a = $result[$j]['Sem_Year'];
|
||||
$b = $result[$j]['ProgramType'];
|
||||
$c = strtoupper(str_replace(' ','',$a));
|
||||
if(($c == 'SEM1' || $c == '1SEM' || $c == 'YEAR1' || $c == '1YEAR') && ($b == REGULARFEES || $b == SEMYEARFEES)){$check++;}
|
||||
if(($c == 'SEM3' || $c == '3SEM' || $c == 'YEAR2' || $c == '2YEAR') && ($b == LATERALFEES || $b == SEMYEARFEES)){$check++;}
|
||||
if($CF_FeeID == $details['FeesType']){
|
||||
$check = 0;
|
||||
}else{
|
||||
$check++;
|
||||
}
|
||||
// echo count($result);
|
||||
// for($j=0;$j<count($result);$j++)
|
||||
// {
|
||||
// $a = $result[$j]['Sem_Year'];
|
||||
// $b = $result[$j]['ProgramType'];
|
||||
// $c = strtoupper(str_replace(' ','',$a));
|
||||
// // if(($c == 'SEM1' || $c == '1SEM' || $c == 'YEAR1' || $c == '1YEAR') && ($b == REGULARFEES || $b == SEMYEARFEES)){$check++;}
|
||||
// // if(($c == 'SEM3' || $c == '3SEM' || $c == 'YEAR2' || $c == '2YEAR') && ($b == LATERALFEES || $b == SEMYEARFEES)){$check++;}
|
||||
// $d = strtoupper(str_replace(' ','',$sem_year));
|
||||
// if($c == $d){$check++;}
|
||||
// }
|
||||
// select cf.Sem_Year
|
||||
// from T_Students_Fees_Status sfs
|
||||
// left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
|
||||
|
||||
@ -210,8 +210,7 @@ class Studentview_model extends CI_Model
|
||||
$fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID);
|
||||
// get application details
|
||||
if($requestFrom!='2'){
|
||||
//$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
|
||||
|
||||
// $fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
|
||||
$fetchData['applicationDetails']=$this->getStudentLatestAppStatus($studentId,$row->CourseID);
|
||||
$fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID);
|
||||
|
||||
@ -564,7 +563,7 @@ class Studentview_model extends CI_Model
|
||||
$this->db->where('CM.CertificateName', APPLICATION_CONST);
|
||||
$this->db->order_by('AS.ID', 'DESC');
|
||||
$getCertDetails = $this->db->get();
|
||||
|
||||
print_r($this->db->last_query());die();
|
||||
if($getCertDetails->result()){
|
||||
return $getCertDetails->result();
|
||||
}
|
||||
@ -613,6 +612,7 @@ class Studentview_model extends CI_Model
|
||||
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode');
|
||||
$this->db->where('CU.CourseID', $courseID);
|
||||
$this->db->where('ABT.StudentID', $studentID);
|
||||
|
||||
// $this->db->group_by('ABT.ID');
|
||||
$this->db->order_by('ABT.ID', 'DESC');
|
||||
$getBookletDetails = $this->db->get();
|
||||
@ -678,7 +678,8 @@ class Studentview_model extends CI_Model
|
||||
|
||||
|
||||
|
||||
$subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
|
||||
$subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
|
||||
$subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
|
||||
|
||||
$query = $this->db->query($subquery,array($studentid,$courseid));
|
||||
|
||||
|
||||
@ -625,6 +625,30 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
$log.info('Modal dismissed at: ' + new Date());
|
||||
});
|
||||
};
|
||||
$scope.open2 = function (values,type) {
|
||||
|
||||
var modalInstance1 = $modal.open({
|
||||
templateUrl: 'assets/views/student/studentPaymentModal.html',
|
||||
controller: 'ModalInstanceCtrl1',
|
||||
// size: size,
|
||||
resolve: {
|
||||
items1: function () {
|
||||
var myvalues =
|
||||
{
|
||||
"values":values,
|
||||
"type":type
|
||||
};
|
||||
return myvalues;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
modalInstance1.result.then(function (selectedItem) {
|
||||
$scope.selected = selectedItem;
|
||||
}, function () {
|
||||
$log.info('Modal dismissed at: ' + new Date());
|
||||
});
|
||||
};
|
||||
$scope.printStudentDetails = function (details) {
|
||||
$rootScope.pdfItems = details;
|
||||
|
||||
|
||||
@ -291,7 +291,8 @@
|
||||
<tbody>
|
||||
<tr ng-repeat="fees in course.feesDetails">
|
||||
<td><span>{{fees.FeesName}}</span></td>
|
||||
<td><span>{{fees.BatchName}}</span></td>
|
||||
<td ng-if="fees.BatchName=='Not Applicable'"><span>{{fees.BatchName}}</span></td>
|
||||
<td ng-if="fees.BatchName!='Not Applicable'"><span><a tooltip="View Batch History" class="text-dark" ng-click="open1(course.batchHistory,'3');">{{fees.BatchName}}</a></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>
|
||||
@ -417,7 +418,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- <tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'"> -->
|
||||
<tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'">
|
||||
<tr ng-repeat="booklet in course.answerbookletDetails">
|
||||
<td>
|
||||
<span>{{booklet.AnsDate}}</span>
|
||||
</td>
|
||||
@ -467,7 +468,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'">
|
||||
<tr ng-repeat="cert in course.certificateDetails">
|
||||
<!-- <tr ng-repeat="cert in course.certificateDetails'"> -->
|
||||
<!-- <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
@ -507,76 +508,33 @@
|
||||
<h5 class="text-dark">No Mark Card Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
|
||||
<!--previous table class ="table no-margin height-200 ng-scope" -->
|
||||
|
||||
<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;">Comments</th>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="text-align:center;">Date</th>
|
||||
<th style="text-align:center;">Sem/Year</th>
|
||||
<!-- <th style="text-align:center;">Name</th> -->
|
||||
<th style="text-align:center;">Status</th>
|
||||
<th style="text-align:center;">Comments</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<!-- <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">-->
|
||||
<!-- <tr ng-repeat="mark in course.markCardDetails | unique:'Sem'"> -->
|
||||
<!-- <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">
|
||||
<tr ng-repeat="mark in course.markCardDetails | unique:'Sem'"> -->
|
||||
<tbody ng-if="course.markCardDetails.length!=0">
|
||||
<tr ng-repeat="mark in course.markCardDetails'">
|
||||
<td>
|
||||
<span>{{mark.CDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{mark.Sem_Year}} ({{mark.Sem}})</span>
|
||||
</td>
|
||||
<!--<td>
|
||||
<span>{{mark.CertificateName}}</span>
|
||||
</td>-->
|
||||
<td>
|
||||
<span>{{mark.ListName}} </span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span style="white-space:pre-wrap;">{{mark.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
<tr ng-repeat="mark in course.markCardDetails">
|
||||
<td><span>{{mark.CDate}}</span></td>
|
||||
<td><span>{{mark.Sem_Year}} ({{mark.Sem}})</span></td>
|
||||
<!-- <td><span>{{mark.CertificateName}}</span></td> -->
|
||||
<td><span>{{mark.ListName}} </span></td>
|
||||
<td><span style="white-space:pre-wrap;">{{mark.Comments}}</span></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<!-- <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>
|
||||
<span>{{mark.CertificateName}}</span>
|
||||
</td>->
|
||||
<td>
|
||||
<span>{{mark.ListName}} </span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span style="white-space:pre-wrap;">{{mark.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>-->
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
</tab>
|
||||
<tab heading="Study Material Details" id="material">
|
||||
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.studyMaterialDetails==false">
|
||||
@ -647,23 +605,7 @@
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
<tab heading="Batch Details" id="batch">
|
||||
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.batchHistory==false">
|
||||
<!-- <center>
|
||||
<h5 class="text-dark">No Mark Card Details!</h5>
|
||||
</center> -->
|
||||
</div>
|
||||
<ul ng-if="course.batchHistory!=false" >
|
||||
<li ng-repeat="bh in course.batchHistory">
|
||||
<div> <b>{{bh.UpdatedBy}}</b> Updated The Batch On {{bh.UpdatedOn}} <i>{{bh.ExistValue}}</i> into <i>{{bh.NewValue}}</i> </div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -48,7 +48,12 @@
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
<ul ng-if="selectedtype=='3' && items1!=false" >
|
||||
<li ng-repeat="bh in items1">
|
||||
<div> <b>{{bh.UpdatedBy}}</b> Updated The Batch On {{bh.UpdatedOn}} <i>{{bh.ExistValue}}</i> into <i>{{bh.NewValue}}</i> </div>
|
||||
</li>
|
||||
</ul>
|
||||
<center ng-if="selectedtype=='3' && items1==false" > Batch History Not Found </center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user