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

changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-22 18:34:42 +05:30
parent 883b38ce6a
commit 6ba505ed90
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/controllers/Report.php
View File

@ -474,6 +474,9 @@ class Report extends REST_Controller {
$det['from'] = $this->post('from'); $det['from'] = $this->post('from');
$det['to'] = $this->post('to'); $det['to'] = $this->post('to');
$det['university'] = $this->post('university'); $det['university'] = $this->post('university');
$det['branch'] = $this->post('branch');
// print_r($det); // print_r($det);
$newlist = $this->report_model->GetNewRegList($det); $newlist = $this->report_model->GetNewRegList($det);

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

@ -1166,6 +1166,8 @@ $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as mont
//echo $up_details['ID']; //echo $up_details['ID'];
//UpdatedOn //UpdatedOn
// print_r($up_details);die();
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
$dateTime = $time; $dateTime = $time;
@ -1179,7 +1181,7 @@ $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as mont
$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';
} }

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

@ -1093,6 +1093,7 @@ from T_Lead_Tracking_Followup as ltf
$tod=date("Y-m-d",strtotime($tdate)); $tod=date("Y-m-d",strtotime($tdate));
$university = $det['university']; $university = $det['university'];
$regconst='New Registration'; $regconst='New Registration';
$branch=$det['branch'];
// echo 'f'.$fromd.'t'.$tod; // echo 'f'.$fromd.'t'.$tod;
// die(); // die();
@ -1105,7 +1106,8 @@ left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_
left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy
left JOIN T_Course_Fees_Details on T_Course_Fees_Details.ID=T_Registration_Details.FeeType and T_Course_Fees_Details.CourseID=T_Registration_Details.CourseID left JOIN T_Course_Fees_Details on T_Course_Fees_Details.ID=T_Registration_Details.FeeType and T_Course_Fees_Details.CourseID=T_Registration_Details.CourseID
WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='".'1'."'"; WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='".'1'."' and
T_Registration_Details.BranchCode= '".$branch."'";
if ($fromd != ''){ if ($fromd != ''){
// $fromd= date("Y-m-d",strtotime($from)); // $fromd= date("Y-m-d",strtotime($from));

3
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -150,7 +150,8 @@ $scope.tod = to_dt;
data: { data: {
university: university, university: university,
from : $scope.filters.from_date, from : $scope.filters.from_date,
to : $scope.filters.to_date to : $scope.filters.to_date,
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID
} }
} }