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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gandhimathi 2018-09-08 11:54:18 +05:30
commit c599643ac2
3 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollo/api/application/models/Data_correction.php
View File

@ -136,7 +136,12 @@ group by Student_id,cid";
$coursearr['IsActive'] = $search['IsActive']; $coursearr['IsActive'] = $search['IsActive'];
$coursearr['DeactiveComments'] =$search['Reason']; $coursearr['DeactiveComments'] =$search['Reason'];
if( $search['IsActive'] ==0)
{
$coursearr['Deactive'] = '0'; $coursearr['Deactive'] = '0';
}
$this->db->where('StudentID', $search['studentId']); $this->db->where('StudentID', $search['studentId']);
$this->db->where('UniversityID', $search['University']); $this->db->where('UniversityID', $search['University']);
$this->db->where('CourseID', $search['courseId']); $this->db->where('CourseID', $search['courseId']);

37
Apollo/api/application/models/DayBook_model.php
View File

@ -760,7 +760,7 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
{ {
//if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='') //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='')
//{ //{
$this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo'); $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments as Reason,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
$this->db->from('T_Students_Fees_PaidDetails'); $this->db->from('T_Students_Fees_PaidDetails');
$this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left'); $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left');
@ -814,30 +814,33 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
$dateTime = $time; $dateTime = $time;
// echo $dateTime; // echo $dateTime;
// die(); //die();
//$daybookarr['ID'] = $up_details['ID']; //$daybookarr['ID'] = $up_details['ID'];
// $daybookarr['IsActive'] = $up_details['IsActive']; $daybookarr['IsActive'] = $up_details['IsActive'];
// $daybookarr['Reason'] = $up_details['Reason']; $daybookarr['Reason'] = $up_details['Reason'];
// $daybookarr['UpdatedOn'] = $dateTime; $daybookarr['UpdatedOn'] = $dateTime;
// $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
// if($up_details['IsActive'] == 0) if($up_details['IsActive'] == 0)
// { {
// $daybookarr['Status'] = 'Cancel'; $daybookarr['Status'] = 'Cancel';
// } }
// else else
// { {
// $daybookarr['Status'] = 'Approved'; $daybookarr['Status'] = 'Approved';
// } }
//print_r($daybookarr);
//die();
// $this->db->where('ID', $daybookarr['ID']);
// $this->db->update('T_DayBookMaster', $daybookarr); $this->db->where('FeesPaymentID', $up_details['ID']);
$this->db->update('T_DayBookMaster', $daybookarr);
//$feearr['ID'] = $up_details['FeesPaymentID']; //$feearr['ID'] = $up_details['FeesPaymentID'];

43
Apollo/assets/js/controllers/entrycorrectionCtrl.js
View File

@ -76,6 +76,8 @@ $scope.universitySearchData = '';
$scope.studentInfo=""; $scope.studentInfo="";
$scope.mobileNo='';
$scope.student_Name='';
$scope.getStudentDetails = function (form,myModel) $scope.getStudentDetails = function (form,myModel)
{ {
@ -85,6 +87,8 @@ $scope.universitySearchData = '';
var studentName = myModel.studentName; var studentName = myModel.studentName;
var receipt = myModel.receipt; var receipt = myModel.receipt;
$scope.universityId = myModel.myUnivSearch; $scope.universityId = myModel.myUnivSearch;
$scope.mobileNo=myModel.mobileNumber;
$scope.student_Name=myModel.studentName;
// console.log($scope.universityId); // console.log($scope.universityId);
// return false; // return false;
@ -249,7 +253,44 @@ $scope.universitySearchData = '';
$http(updatecourse).then(function (response) { $http(updatecourse).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success"); swal('Change Saved Successfully', response.data.message, "success");
$scope.close(); $scope.close();
$scope.getStudentDetails(form,myModel); // $scope.getStudentDetails(form,myModel);
$scope.isLoaderShow= false
var getdetail = {
method: 'POST',
url: apiPoint.url + 'getAllstudentcoursedetail/',
headers: {
'Content-Type': 'application/json'
},
data :{
studentName: $scope.student_Name,
mobileNumber: $scope.mobileNo,
receipt: myModel.receipt,
University:$scope.universityId,
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
}
};
$http(getdetail).then(function (response) {
//console.log(response)
if (response.data.status==200 && response.data.studentStatus) {
$scope.studentInfo=response.data.details;
console.log($scope.studentInfo);
} else {
$scope.studentInfo="";
$scope.isLoaderShow = true;
$scope.load = "No Records Found";
}
});
}); });