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

1692

Browse Source
This commit is contained in:
rajasekar 2019-03-11 14:44:04 +05:30
parent 25c74661a1
commit f40e5aacb0
5 changed files with 86 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
{

60
Apollo/api/application/models/Hallticket_model.php
View File

@ -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;

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

@ -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;
}

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

@ -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("-");

41
Apollo/assets/views/report_expense.html
View File

@ -29,7 +29,7 @@
<div class="row">
<div class="col-md-3">
<!--<pre>{{searchData.date}}</pre>-->
<!-- <pre>{{searchData.date}}</pre> -->
<div data-ng-controller="DatepickerDemoCtrl">
<label>
From Date
@ -43,7 +43,7 @@
</div>
</div>
<div class="col-md-3">
<!--<pre>{{searchData.date}}</pre>-->
<!-- <pre>{{searchData.date}}</pre> -->
<div data-ng-controller="DatepickerDemoCtrl">
<label>
To Date
@ -56,6 +56,19 @@
</div>
</div>
<!-- <div class="col-md-3"> -->
<!-- <label> -->
<!-- Year -->
<!-- </label><br> -->
<!-- <select style="width: 250px;" ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="univ" ng-model="filters.fout_year" required> -->
<!-- <option value="" selected>Select Year</option> -->
<!-- <option ng-repeat="" value="{{}}">{{}}</option> -->
<!-- </select> -->
<!-- </div> -->
<div class="col-md-2" style="padding-top: 2.3%;">
@ -99,18 +112,18 @@
<tr>
<th>SL.No</th>
<th>Description</th>
<th>1/{{date| date:'yyyy'}}</th>
<th>2/{{date| date:'yyyy'}}</th>
<th>3/{{date| date:'yyyy'}}</th>
<th>4/{{date| date:'yyyy'}}</th>
<th>5/{{date| date:'yyyy'}}</th>
<th>6/{{date| date:'yyyy'}}</th>
<th>7/{{date| date:'yyyy'}}</th>
<th>8/{{date| date:'yyyy'}}</th>
<th>9/{{date| date:'yyyy'}}</th>
<th>10/{{date| date:'yyyy'}}</th>
<th>11/{{date| date:'yyyy'}}</th>
<th>12/{{date| date:'yyyy'}}</th>
<th>January</th>
<th>February</th>
<th>March</th>
<th>April</th>
<th>May</th>
<th>June</th>
<th>July</th>
<th>August</th>
<th>September</th>
<th>October</th>
<th>November</th>
<th>December</th>
<th>Total Amount</th>