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

set fee

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-11 10:35:27 +05:30
parent 0fdc3d06d7
commit 019d463010
3 changed files with 114 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -915,6 +915,7 @@ class Fees_status_model extends CI_Model
} }
$result_array['sessionDetails'] = $this->getSession($student); $result_array['sessionDetails'] = $this->getSession($student);
$result_array['feesetDetails'] = $this->GetFeeSetDetails($student);
return $result_array; return $result_array;
@ -1808,7 +1809,7 @@ $REGID='';
$this->db->join(COURSE.' as CU', 'CU.UniversityID = US.UniversityID'); $this->db->join(COURSE.' as CU', 'CU.UniversityID = US.UniversityID');
// $this->db->where('SD.IsActive','1'); // $this->db->where('SD.IsActive','1');
// $this->db->order_by('CU.CreatedOn','DESC'); // $this->db->order_by('CU.CreatedOn','DESC');
$this->db->order_by('SM.SessionID','DESC'); $this->db->order_by('SM.SessionID','ASC');
$this->db->where('CU.CourseID',$details['CourseID']); $this->db->where('CU.CourseID',$details['CourseID']);
$this->db->where('US.BranchCode',$details['BranchCode']); $this->db->where('US.BranchCode',$details['BranchCode']);
$this->db->where('SM.BranchCode',$details['BranchCode']); $this->db->where('SM.BranchCode',$details['BranchCode']);
@ -2174,4 +2175,30 @@ $REGID='';
} }
public function GetFeeSetDetails($student)
{
//print_r($student);
$this->db->select('FeesID,BatchCode,StudentID,SM.CourseID,SM.FeesType,Sem_Year');
$this->db->from(STUDENTS_FEES_STATUS.' as SM');
$this->db->join('T_Course_Fees_Details','T_Course_Fees_Details.ID=SM.FeesType');
$this->db->where('SM.CourseID',$student['CourseID']);
$this->db->where('SM.StudentID',$student['StudentID']);
$this->db->where('SM.BranchCode',$student['BranchCode']);
$setDetails = $this->db->get();
if($setDetails->result())
{
return $setDetails->result();
}
else
{
//return false;
return $setDetails->result();
}
}
} }

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

@ -237,6 +237,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* */ * */
$scope.viewId=-1; $scope.viewId=-1;
$scope.setFees = function (p) { $scope.setFees = function (p) {
$scope.BatchDate =''; $scope.BatchDate ='';
$scope.editId=-1; $scope.editId=-1;
@ -401,9 +402,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
} }
else{ else{
alert("function else");
if(details.ProgramType=='Y001' && details.SNo!='1'){ if(details.ProgramType=='Y001' && details.SNo!='1'){
alert("else if");
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.sessionDetailsTo=[]; $scope.sessionDetailsTo=[];
if(type==1){ if(type==1){
@ -430,6 +431,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
} }
else{ else{
@ -452,6 +455,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
else{ else{
alert("else else");
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.sessionDetailsTo=[]; $scope.sessionDetailsTo=[];
@ -846,6 +850,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$scope.BatchDetails=[]; $scope.BatchDetails=[];
$scope.masterSessionDetails=""; $scope.masterSessionDetails="";
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.setfeedetails='';
$scope.readonlycheck ="";
$scope.getStudentSetFees = function (ID,courseID,studeID) { $scope.getStudentSetFees = function (ID,courseID,studeID) {
$scope.BatchDetails=[]; $scope.BatchDetails=[];
$scope.sessionDetails=[]; $scope.sessionDetails=[];
@ -857,6 +863,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$scope.myModelInstallemt.date=""; $scope.myModelInstallemt.date="";
$rootScope.lastInstallemtDate=""; $rootScope.lastInstallemtDate="";
$rootScope.updateMoreItems=[]; $rootScope.updateMoreItems=[];
var setFees = { var setFees = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getStudentFeesAssign/', url: apiPoint.url + 'getStudentFeesAssign/',
@ -873,17 +880,38 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}; };
$http(setFees).then(function (response) { $http(setFees).then(function (response) {
if (response.data.status==200 && response.data.feesStatus) { if (response.data.status==200 && response.data.feesStatus) {
// console.log(response.data.sessionDetails);
$scope.setfeedetails=response.data.feesetDetails;
//console.log($scope.setfeedetails);return false;
$scope.masterSessionDetails =response.data.sessionDetails;
//console.log($scope.masterSessionDetails);
if($scope.setfeedetails.length != 0)
{
$scope.readonlycheck =true;
}
else
{
$scope.readonlycheck =false;
}
$scope.masterSessionDetails = response.data.sessionDetails; // $scope.masterSessionDetails = response.data.sessionDetails;
//console.log($scope.masterSessionDetails);
// service call for session master list in desc order based on date // service call for session master list in desc order based on date
angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) { angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) {
var parts = fvalue.SessionDate.split("-"); var parts = fvalue.SessionDate.split("-");
fvalue.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); fvalue.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
}); });
$scope.masterSessionDetails=dateListDescService.getOrderByList($scope.masterSessionDetails); // $scope.masterSessionDetails=dateListDescService.getOrderByList($scope.masterSessionDetails);
// end for service call // end for service call
$scope.feesStructureInfo=response.data.feesDetails; $scope.feesStructureInfo=response.data.feesDetails;
$scope.setModel = { $scope.setModel = {
"feesType": $scope.feesStructureInfo[0], "feesType": $scope.feesStructureInfo[0],
@ -905,6 +933,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
if($scope.feesStructureInfo[0].InstallmentDetails == '') { if($scope.feesStructureInfo[0].InstallmentDetails == '') {
// console.log('in')
$scope.obj = $scope.feesStructureInfo[0].batchDetails.find(x => x.IsDefault == true); $scope.obj = $scope.feesStructureInfo[0].batchDetails.find(x => x.IsDefault == true);
if($scope.obj==undefined || $scope.obj=='' || $scope.obj==null){ if($scope.obj==undefined || $scope.obj=='' || $scope.obj==null){
$scope.setModel.feesType.BatchCode = $scope.feesStructureInfo[0].batchDetails[0].BatchCode; $scope.setModel.feesType.BatchCode = $scope.feesStructureInfo[0].batchDetails[0].BatchCode;
@ -933,12 +963,15 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
//console.log($scope.sessionDetails)
} }
else { else {
//console.log('in else')
/* $scope.myModelInstallemt.ID=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].ID; /* $scope.myModelInstallemt.ID=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].ID;
$scope.myModelInstallemt.name=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].Name; $scope.myModelInstallemt.name=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].Name;
@ -961,7 +994,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
// get session details // get session details
var found = $filter('getById')($scope.masterSessionDetails, $scope.feesStructureInfo[0].SessionName); var found = $filter('getById')($scope.masterSessionDetails, $scope.feesStructureInfo[0].SessionName);
$scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2)); $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2));
//console.log($scope.ExistSessionDate);
angular.forEach($scope.masterSessionDetails,function (svalues,skey) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID || $scope.feesStructureInfo[0].ToSessionName==svalues.SessionID){ if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID || $scope.feesStructureInfo[0].ToSessionName==svalues.SessionID){
@ -982,10 +1015,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
// console.log($scope.sessionDetails)
$scope.setModel.feesType.SessionName=$scope.feesStructureInfo[0].SessionName; $scope.setModel.feesType.SessionName=$scope.feesStructureInfo[0].SessionName;
$scope.setModel.feesType.ToSessionName=$scope.feesStructureInfo[0].ToSessionName; $scope.setModel.feesType.ToSessionName=$scope.feesStructureInfo[0].ToSessionName;
$scope.dateValidations(); $scope.dateValidations();
console.log($scope.setModel.feesType.SessionName);
} }
} else { } else {
$scope.feesStructureInfo=""; $scope.feesStructureInfo="";
@ -1120,6 +1156,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* change installment values * change installment values
* */ * */
$scope.changeInstallemt = function (model,form) { $scope.changeInstallemt = function (model,form) {
//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!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
$scope.BatchDetails=[]; $scope.BatchDetails=[];
$rootScope.updateMoreItems=[]; $rootScope.updateMoreItems=[];
@ -1194,6 +1232,33 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
// form.$setPristine(true); // form.$setPristine(true);
// console.log($scope.setfeedetails)
//console.log('im');
var loopcheck = true;
angular.forEach($scope.setfeedetails,function (setfeedetails,skey)
{
if(loopcheck)
{
if(setfeedetails.Sem_Year == model.Sem_Year )
{
$scope.readonlycheck =true;
loopcheck = false;
}
else
{
$scope.readonlycheck =false;
}
}
});
} }
$scope.setTotalAmount=''; $scope.setTotalAmount='';
/* /*

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

@ -27,7 +27,7 @@
<label> <label>
Sem/Year <span class="symbol required"></span> Sem/Year <span class="symbol required"></span>
</label> </label>
<select class="form-control" name="setfeesType" tabindex="7" id="setfeesType" ng-change="changeInstallemt(setModel.feesType,Form);changeSessions(setModel.feesType,'0');" <select class="form-control" name="setfeesType" tabindex="7" id="setfeesType" ng-change="changeInstallemt(setModel.feesType,Form);changeSessions(setModel.feesType,'0');"
ng-model="setModel.feesType" ng-model="setModel.feesType"
ng-options="fees.Sem_Year for fees in feesStructureInfo" ng-options="fees.Sem_Year for fees in feesStructureInfo"
required> required>
@ -36,16 +36,18 @@
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span> ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span>
</div> </div>
{{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!='PC' && 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>
<select class="form-control" name="batchCode" tabindex="8" id="batchCode" <select class="form-control" ng-disabled="readonlycheck !== false" name="batchCode" tabindex="8" id="batchCode"
ng-model="setModel.feesType.BatchCode" ng-model="setModel.feesType.BatchCode"
ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-blur="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-blur="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
required> required>
<!-- <option value=""> Select Batch</option>--> <option value=""> Select Batch</option>
</select> </select>
<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>
@ -76,12 +78,16 @@
<label ng-if="setModel.feesType.ProgramType=='Y001'"> <label ng-if="setModel.feesType.ProgramType=='Y001'">
Session <span class="symbol required"></span> Session <span class="symbol required"></span>
</label> </label>
<select class="form-control" name="setsessionname" tabindex="9" id="setsessionname"
<select class="form-control" ng-disabled="readonlycheck !== false" name="setsessionname" tabindex="9" id="setsessionname"
ng-model="setModel.feesType.SessionName" ng-model="setModel.feesType.SessionName"
ng-options="sess.SessionID as sess.SessionName for sess in sessionDetails" ng-change="changeSessions(setModel.feesType,'1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-options="sess.SessionID as sess.SessionName for sess in sessionDetails" ng-change="changeSessions(setModel.feesType,'1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
required> required>
<option value=""> Select Session</option> <option value=""> Select Session</option>
</select> </select>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.setsessionname.$dirty && Form.setsessionname.$invalid">Session is required</span> ng-if="Form.setsessionname.$dirty && Form.setsessionname.$invalid">Session is required</span>
</div> </div>
@ -90,7 +96,7 @@
<label> <label>
Session To <span class="symbol required"></span> Session To <span class="symbol required"></span>
</label> </label>
<select class="form-control" name="settosessionname" tabindex="9" id="settosessionname" <select class="form-control" ng-disabled="readonlycheck !== false" name="settosessionname" tabindex="9" id="settosessionname"
ng-model="setModel.feesType.ToSessionName" ng-model="setModel.feesType.ToSessionName"
ng-options="sess.SessionID as sess.SessionName for sess in sessionDetailsTo" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-options="sess.SessionID as sess.SessionName for sess in sessionDetailsTo" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
required> required>
@ -122,7 +128,7 @@
Roll Number Roll Number
</label> </label>
<input type="text" placeholder="Enter Roll No" <input type="text" ng-readonly="readonlycheck" placeholder="Enter Roll No"
tabindex="10" class="form-control" name="setrollNo" tabindex="10" class="form-control" name="setrollNo"
ng-model="setModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/> ng-model="setModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<span class="error text-small block" <span class="error text-small block"
@ -156,7 +162,7 @@
<input type="text" placeholder="Enter Fees Amount" <input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9" autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required/> ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required ng-readonly="readonlycheck"/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid" ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span> ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>
@ -173,7 +179,7 @@
<input type="text" placeholder="Enter STF/WR Amount" <input type="text" placeholder="Enter STF/WR Amount"
autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9" autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/> ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="readonlycheck"/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.STF.$dirty && Form.STF.$invalid" ng-if="Form.STF.$dirty && Form.STF.$invalid"
@ -190,7 +196,7 @@
<input type="text" placeholder="Enter Other Amount" <input type="text" placeholder="Enter Other Amount"
autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9" autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/> ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="readonlycheck"/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.others.$dirty && Form.others.$invalid" ng-if="Form.others.$dirty && Form.others.$invalid"
ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span> ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>