diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index e22bc187..1bd825fc 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -474,6 +474,9 @@ class Report extends REST_Controller { $det['from'] = $this->post('from'); $det['to'] = $this->post('to'); $det['university'] = $this->post('university'); + $det['branch'] = $this->post('branch'); + + // print_r($det); $newlist = $this->report_model->GetNewRegList($det); diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index bc727a60..f5fbcd73 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -1166,6 +1166,8 @@ $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as mont //echo $up_details['ID']; //UpdatedOn + // print_r($up_details);die(); + $time = date('Y-m-d H:i:s'); $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']; - if($up_details['IsActive'] == 0) + if($up_details['IsActive'] == '0') { $daybookarr['Status'] = 'Cancel'; } diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 2ad01d9e..c7249d96 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -1093,6 +1093,7 @@ from T_Lead_Tracking_Followup as ltf $tod=date("Y-m-d",strtotime($tdate)); $university = $det['university']; $regconst='New Registration'; + $branch=$det['branch']; // echo 'f'.$fromd.'t'.$tod; // 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_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 -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 != ''){ // $fromd= date("Y-m-d",strtotime($from)); diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 4e66e3c0..c7aed6bd 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -150,7 +150,8 @@ $scope.tod = to_dt; data: { university: university, from : $scope.filters.from_date, - to : $scope.filters.to_date + to : $scope.filters.to_date, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID } }