diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 1bd825fc..2724752d 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -370,7 +370,7 @@ class Report extends REST_Controller { public function filters_post() { $br = $this->post('branch'); - $getStatus = $this->report_model->getUniversity($br); + $getStatus = $this->report_model->getUniversity($br); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 79ea14a4..e079c629 100644 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -1688,11 +1688,55 @@ return true; { //echo $UID;die(); - $sql = "SELECT DISTINCT T_Hallticket_Master.UniversityID,T_UniversityMaster.UniversityName,T_Hallticket_Master.CourseID,T_CourseMaster.CourseName,T_CourseMaster.CourseCode,T_Hallticket_Master.BatchCode,T_BatchMaster.BatchName,T_Hallticket_Master.BranchCode,T_Hallticket_Master.CenterID,T_CenterMaster.CenterName,T_Hallticket_Student_Details.StudentID,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_Hallticket_Student_Details.EnrollmentID,T_Hallticket_Student_Details.Sem_Year,T_Hallticket_Subject_Details.SubjectCode,T_SubjectMaster.SubjectName,T_SubjectMaster.SubjectCode,T_Hallticket_Subject_Details.ExamDate,T_Hallticket_Subject_Details.FromTime,T_Hallticket_Subject_Details.EndTime,RollNo FROM T_Hallticket_Master + // $sql = "SELECT DISTINCT T_Hallticket_Master.UniversityID,T_UniversityMaster.UniversityName,T_Hallticket_Master.CourseID,T_CourseMaster.CourseName,T_CourseMaster.CourseCode,T_Hallticket_Master.BatchCode,T_BatchMaster.BatchName,T_Hallticket_Master.BranchCode,T_Hallticket_Master.CenterID,T_CenterMaster.CenterName,T_Hallticket_Student_Details.StudentID,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_Hallticket_Student_Details.EnrollmentID,T_Hallticket_Student_Details.Sem_Year,T_Hallticket_Subject_Details.SubjectCode,T_SubjectMaster.SubjectName,T_SubjectMaster.SubjectCode,T_Hallticket_Subject_Details.ExamDate,T_Hallticket_Subject_Details.FromTime,T_Hallticket_Subject_Details.EndTime,RollNo FROM T_Hallticket_Master - JOIN T_Hallticket_Student_Details ON T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID + // JOIN T_Hallticket_Student_Details ON T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID - JOIN T_Hallticket_Subject_Details ON T_Hallticket_Student_Details.HallTicket_Student_ID = T_Hallticket_Subject_Details.HallTicket_Student_ID + // JOIN T_Hallticket_Subject_Details ON T_Hallticket_Student_Details.HallTicket_Student_ID = T_Hallticket_Subject_Details.HallTicket_Student_ID + + // JOIN T_UniversityMaster ON T_Hallticket_Master.UniversityID = T_UniversityMaster.UniversityID AND T_UniversityMaster.BranchCode = T_Hallticket_Master.BranchCode + + // JOIN T_CourseMaster ON T_Hallticket_Master.CourseID = T_CourseMaster.CourseID + + // JOIN T_BatchMaster ON T_Hallticket_Master.BatchCode = T_BatchMaster.BatchCode AND T_BatchMaster.BranchCode = T_Hallticket_Master.BranchCode + + // JOIN T_CenterMaster ON T_Hallticket_Master.CenterID = T_CenterMaster.CenterID AND T_CenterMaster.BranchCode = T_Hallticket_Master.BranchCode + + // JOIN T_SubjectMaster ON T_Hallticket_Subject_Details.SubjectCode = T_SubjectMaster.SubjectID AND T_SubjectMaster.BranchCode = T_Hallticket_Master.BranchCode + + // JOIN T_StudentDetails ON T_Hallticket_Student_Details.StudentID = T_StudentDetails.StudentID AND T_StudentDetails.BranchCode = T_Hallticket_Master.BranchCode + // Join T_Students_Fees_Status on T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID and T_Students_Fees_Status.BatchCode='".$batch."' + + // WHERE T_Hallticket_Master.UniversityID = ? AND T_Hallticket_Master.BatchCode = ? AND T_Hallticket_Master.BranchCode = ? AND T_Hallticket_Master.CenterID = ? AND STR_TO_DATE(T_Hallticket_Subject_Details.ExamDate,'%Y-%m-%d') = STR_TO_DATE(?,'%Y-%m-%d')"; + + $sql ="SELECT DISTINCT T_Hallticket_Master.UniversityID, +T_UniversityMaster.UniversityName, +T_Hallticket_Master.CourseID, +T_CourseMaster.CourseName, +T_CourseMaster.CourseCode, +T_Hallticket_Master.BatchCode, +T_BatchMaster.BatchName, +T_Hallticket_Master.BranchCode, +T_Hallticket_Master.CenterID, +T_CenterMaster.CenterName, +T_Hallticket_Student_Details.StudentID, +T_StudentDetails.Firstname, +T_StudentDetails.Lastname, +T_Hallticket_Student_Details.EnrollmentID, +T_Hallticket_Student_Details.Sem_Year, +T_Hallticket_Subject_Details.SubjectCode, +T_SubjectMaster.SubjectName, +T_SubjectMaster.SubjectCode, +T_Hallticket_Subject_Details.ExamDate, +T_Hallticket_Subject_Details.FromTime, +T_Hallticket_Subject_Details.EndTime, +T_Hallticket_Subject_Details.HallTicket_Subject_ID, +RollNo +FROM T_Hallticket_Subject_Details + + JOIN T_Hallticket_Student_Details ON T_Hallticket_Student_Details.HallTicket_Student_ID = T_Hallticket_Subject_Details.HallTicket_Student_ID + + JOIN T_Hallticket_Master ON T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID JOIN T_UniversityMaster ON T_Hallticket_Master.UniversityID = T_UniversityMaster.UniversityID AND T_UniversityMaster.BranchCode = T_Hallticket_Master.BranchCode @@ -1705,9 +1749,12 @@ return true; JOIN T_SubjectMaster ON T_Hallticket_Subject_Details.SubjectCode = T_SubjectMaster.SubjectID AND T_SubjectMaster.BranchCode = T_Hallticket_Master.BranchCode JOIN T_StudentDetails ON T_Hallticket_Student_Details.StudentID = T_StudentDetails.StudentID AND T_StudentDetails.BranchCode = T_Hallticket_Master.BranchCode - Join T_Students_Fees_Status on T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID and T_Students_Fees_Status.BatchCode='".$batch."' - WHERE T_Hallticket_Master.UniversityID = ? AND T_Hallticket_Master.BatchCode = ? AND T_Hallticket_Master.BranchCode = ? AND T_Hallticket_Master.CenterID = ? AND STR_TO_DATE(T_Hallticket_Subject_Details.ExamDate,'%Y-%m-%d') = STR_TO_DATE(?,'%Y-%m-%d')"; + JOIN T_Course_Fees_Details ON T_Hallticket_Master.`CourseID` = T_Course_Fees_Details.`CourseID` AND UPPER(T_Course_Fees_Details.Sem_Year) = UPPER(T_Hallticket_Student_Details.Sem_Year) + + JOIN T_Students_Fees_Status ON T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID AND T_Students_Fees_Status.BatchCode='".$batch."' AND T_Students_Fees_Status.FeesType = T_Course_Fees_Details.ID + + WHERE T_Hallticket_Master.UniversityID = ? AND T_Hallticket_Master.BatchCode = ? AND T_Hallticket_Master.BranchCode = ? AND T_Hallticket_Master.CenterID = ? AND STR_TO_DATE(T_Hallticket_Subject_Details.ExamDate,'%Y-%m-%d') = STR_TO_DATE(?,'%Y-%m-%d')"; if ($exam_attendance == 'Morning') @@ -1725,10 +1772,11 @@ return true; } + $sql.="order by T_CourseMaster.CourseName,T_Hallticket_Student_Details.Sem_Year"; $res = $this->db->query($sql,array($UID,$batch,$branchId,$centerName['CenterID'],$examDate)); $result = $res->result(); - //print_r($this->db->last_query());die(); + // print_r($this->db->last_query());die(); //echo "MODEL";print_r($result);die(); return $result; diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 7edb7d11..7b0005c4 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -225,7 +225,7 @@ console.log($scope.paymentOptions); $scope.getStudentFeesStructure(p.ID,p.CourseID,p.StudentID); $scope.editId=p.ID; var localUserType = JSON.parse(sessionStorage.getItem('localObj')).localType; - if(localUserType === 'R004' || localUserType === 'R003' ) + if(localUserType === 'R004' || localUserType === 'R003' ) { $scope.show = true; } diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index 9696b9bc..489ba138 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -10,10 +10,12 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle "from_date": "", "to_date": "", + // "fout_year": "", }; $scope.date = new Date(); + // $scope.fyear = ""; var localDetail = JSON.parse(sessionStorage.getItem('localObj')); @@ -58,6 +60,7 @@ $scope.generateButtonStatus = false; $scope.batch = []; $scope.batchlist = response.data.batch; $scope.university = response.data.university; + // $scope.fyear = response.data.fyear; //Desc order Batchlist angular.forEach($scope.batchlist, function (values, key) { var parts = values.BatchDate.split("-"); diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index e820c86f..def284e6 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -29,7 +29,7 @@
- +
- +
+ + + + + + + + + + + + +
@@ -99,18 +112,18 @@ SL.No Description - 1/{{date| date:'yyyy'}} - 2/{{date| date:'yyyy'}} - 3/{{date| date:'yyyy'}} - 4/{{date| date:'yyyy'}} - 5/{{date| date:'yyyy'}} - 6/{{date| date:'yyyy'}} - 7/{{date| date:'yyyy'}} - 8/{{date| date:'yyyy'}} - 9/{{date| date:'yyyy'}} - 10/{{date| date:'yyyy'}} - 11/{{date| date:'yyyy'}} - 12/{{date| date:'yyyy'}} + January + February + March + April + May + June + July + August + September + October + November + December Total Amount