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

issue no:1684

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-26 11:42:57 +05:30
parent e19c600022
commit 8ad1f7e11a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1614,7 +1614,7 @@ 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 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
@ -1630,7 +1630,8 @@ 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_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')";

12
Apollo/assets/views/hallticket/examAttendancePDF.html
View File

@ -48,6 +48,7 @@
<th width="30%"><center>COURSE</center></th>
<th width="5%"><center>SEM/YEAR</center></th>
<th width="10%"><center>ENROLLMENT NO</center></th>
<th width="10"><center>Roll NO</center></th>
<th width="5%"><center>SUBJECT CODE</center></th>
<th width="15%"><center>SUBJECT NAME</center></th>
<th width="10%"><center>BOOKLET NO</center></th>
@ -59,8 +60,11 @@
<tr ng-repeat="student in dataForExamAttendanceAM" >
<td height="50">{{($index+1)}}</td>
<td>{{student.Firstname}} {{student.Lastname}} </td>
<td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td>
<td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td>
<td>{{student.CourseName}}</td>
<td>{{student.Sem_Year}}</td>
<td>{{student.EnrollmentID}}</td>
<td>{{student.RollNo}}</td>
<td>{{student.SubjectCode}}</td>
<td>{{student.SubjectName}}</td>
<td></td>
<td></td>
@ -93,7 +97,8 @@
<th width="10%"><center>STUDENT NAME</center></th>
<th width="30%"><center>COURSE</center></th>
<th width="5%"><center>SEM/YEAR</center></th>
<th width="10%"><center>ENROLLMENT NO</center></th>
<th width="7%"><center>ENROLLMENT NO</center></th>
<th width="13"><center>Roll NO</center></th>
<th width="5%"><center>SUBJECT CODE</center></th>
<th width="15%"><center>SUBJECT NAME</center></th>
<th width="10%"><center>BOOKLET NO</center></th>
@ -107,6 +112,7 @@
<td>{{student.CourseName}}</td>
<td>{{student.Sem_Year}}</td>
<td>{{student.EnrollmentID}}</td>
<td>{{student.RollNo}}</td>
<td>{{student.SubjectCode}}</td>
<td>{{student.SubjectName}}</td>
<td></td>