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

set fee for year

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-13 18:09:55 +05:30
parent b2c5743406
commit cba4708dcd
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/Student_model.php
View File

@ -1799,7 +1799,7 @@ class Student_model extends CI_Model {
$result_array['maildetails'] = 'No Records Found'; $result_array['maildetails'] = 'No Records Found';
} }
///print_r($this->db->last_query());die();
$this->db->select('StudentID'); $this->db->select('StudentID');
$this->db->from('T_StudentDetails'); $this->db->from('T_StudentDetails');

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

@ -337,19 +337,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
if(details.SessionName!=undefined && details.SessionName!=''){ if(details.SessionName!=undefined && details.SessionName!='')
{
//console.log('if'); console.log('if');
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.sessionDetailsTo=[]; $scope.sessionDetailsTo=[];
if(type==1){ if(type==1)
{
$scope.setModel.feesType.ToSessionName=""; $scope.setModel.feesType.ToSessionName="";
} }
else{ else
{
$scope.setModel.feesType.ToSessionName=details.ToSessionName; $scope.setModel.feesType.ToSessionName=details.ToSessionName;
} }
if(details.ProgramType=='Y001' && details.SNo=='1'){ if(details.ProgramType=='Y001' && details.SNo=='1')
{
//console.log('if1') //console.log('if1')
// get session details // get session details
@ -371,11 +375,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
} }
else if(details.ProgramType=='Y001' && details.SNo!='1'){ else if(details.ProgramType=='Y001' && details.SNo!='1')
{
// console.log('if else1') // console.log('if else1')
if($scope.feesStructureInfo[0].SessionName!=''){ if($scope.feesStructureInfo[0].SessionName!='')
{
// console.log('else if if') // console.log('else if if')
// get session details // get session details
@ -403,7 +409,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
// after branch changes // after branch changes
else{ else
{
// console.log('else if else') // console.log('else if else')
angular.forEach($scope.masterSessionDetails,function (svalues,skey) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
@ -424,7 +431,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
else{ else
{
// console.log('else') // console.log('else')
// get session details // get session details
@ -453,12 +461,16 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
} }
} }
else{
else
{
// console.log('function else') // console.log('function else')
// alert("function else"); // alert("function else");
if(details.ProgramType=='Y001' && details.SNo!='1'){ if(details.ProgramType=='Y001' && details.SNo!='1')
{
// console.log('else if')
// alert("else if"); // alert("else if");
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.sessionDetailsTo=[]; $scope.sessionDetailsTo=[];
@ -487,7 +499,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
} }
else{ else{
@ -509,13 +521,17 @@ $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
} }
else{ else
{
// console.log('else else')
//alert("else else"); //alert("else else");
$scope.sessionDetails=[]; $scope.sessionDetails=[];
$scope.sessionDetailsTo=[]; $scope.sessionDetailsTo=[];
if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined){ if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined)
{
//console.log('else else if')
angular.forEach($scope.masterSessionDetails,function (svalues,skey) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
if(svalues.IsActive=='1' ){ if(svalues.IsActive=='1' ){
@ -528,8 +544,13 @@ $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
}); });
$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
} }
else{ else
{
//console.log('else else else')
// get session details // get session details
var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); var found = $filter('getById')($scope.masterSessionDetails, details.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));

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

@ -832,7 +832,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.StudentIDDet = response.data.StudentID; $scope.StudentIDDet = response.data.StudentID;
$scope.msgdetID = $scope.StudentIDDet[0].StudentID; $scope.msgdetID = $scope.StudentIDDet[0].StudentID;
//console.log($scope.msgdetID); // console.log($scope.MailDetails);
} }