Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc tto ppc change

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-16 11:01:42 +05:30
parent 7b22a619b6
commit 165745a297
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Fees_status_model.php
View File

@ -1041,7 +1041,7 @@ class Fees_status_model extends CI_Model
$myArray = array(); $myArray = array();
if($endFeesDetails->result()){ if($endFeesDetails->result()){
foreach ($endFeesDetails->result() as $value ){ foreach ($endFeesDetails->result() as $value ){
$pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PC', 'ActualFees'=>$value->PC); $pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PPC', 'ActualFees'=>$value->PC);
$tc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'TC', 'ActualFees'=>$value->TC); $tc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'TC', 'ActualFees'=>$value->TC);
$dc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'DC', 'ActualFees'=>$value->DC); $dc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'DC', 'ActualFees'=>$value->DC);
$mc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'MC', 'ActualFees'=>$value->MC); $mc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'MC', 'ActualFees'=>$value->MC);
@ -1264,7 +1264,7 @@ class Fees_status_model extends CI_Model
$fromd= date("d-m-Y",strtotime($details['CreatedOn'])); $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
if(($details['FeesType']=='PC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC') if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
|| ($details['FeesType'] == 'DC')) || ($details['FeesType'] == 'DC'))
{ {

2
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -1279,7 +1279,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$scope.changeInstallemt = function (model,form) { $scope.changeInstallemt = function (model,form) {
//alert('in') //alert('in')
if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ if(model.Sem_Year!='TC' && model.Sem_Year!='PPC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
$scope.BatchDetails=[]; $scope.BatchDetails=[];
$rootScope.updateMoreItems=[]; $rootScope.updateMoreItems=[];
angular.forEach(model.batchDetails,function (values,key) { angular.forEach(model.batchDetails,function (values,key) {

8
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -39,7 +39,7 @@
<!-- {{readonlycheck}} --> <!-- {{readonlycheck}} -->
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'"> ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
<label> <label>
Batch <span class="symbol required"></span> Batch <span class="symbol required"></span>
</label> </label>
@ -52,7 +52,7 @@
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span> ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>
</div> </div>
<div class="col-md-3 form-group" ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'"> <div class="col-md-3 form-group" ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PPC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
<label> <label>
Batch Batch
</label> </label>
@ -71,7 +71,7 @@
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'"> ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
<!-- <label ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"> <!-- <label ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'">
Session From <span class="symbol required"></span> Session From <span class="symbol required"></span>
</label> </label>
@ -112,7 +112,7 @@
ng-if="Form.settosessionname.$dirty && Form.settosessionname.$invalid">Session is required</span> ng-if="Form.settosessionname.$dirty && Form.settosessionname.$invalid">Session is required</span>
</div> </div>
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'"> ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PPC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
<label> <label>
Session Session
</label> </label>