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

ui issue

Browse Source
This commit is contained in:
gayathri1990 2018-08-17 12:04:03 +05:30
commit a8e4bdcbc9
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,8 +793,9 @@ class Hallticket_model extends CI_Model
//GET Year Based Semester //GET Year Based Semester
if($ind['SemID'] == 1)//First Year if($ind['SemID'] == 1)//First Year
{ {
for($i = 1;$i <= 2; $i++) $i = 1;
{ // for($i = 1;$i <= 1; $i++)
// {
$sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child
JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID
JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1
@ -807,15 +808,16 @@ class Hallticket_model extends CI_Model
//array_push($id['FeeDetails'][$key2],$ind); //array_push($id['FeeDetails'][$key2],$ind);
} // }
array_splice($id['FeeDetails'][$key2],0,6,$in1); array_splice($id['FeeDetails'][$key2],0,6,$in1);
} }
else if($ind['SemID'] == 2)//Sec Year else if($ind['SemID'] == 2)//Sec Year
{ {
for($j = 3;$j <= 4; $j++) $j = 3;
{ // for($j = 3;$j <= 3; $j++)
// {
$sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child
JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID
JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1
@ -828,15 +830,16 @@ class Hallticket_model extends CI_Model
//array_push($id['FeeDetails'][$key2],$ind); //array_push($id['FeeDetails'][$key2],$ind);
} // }
array_splice($id['FeeDetails'][$key2],0,6,$in2); array_splice($id['FeeDetails'][$key2],0,6,$in2);
} }
else if($ind['SemID'] == 3) else if($ind['SemID'] == 3)
{ {
for($k = 5;$k <= 6; $k++) $k = 5;
{ // for($k = 5;$k <= 5; $k++)
// {
$sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child
JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID
JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1
@ -849,15 +852,16 @@ class Hallticket_model extends CI_Model
//array_push($id['FeeDetails'][$key2],$ind); //array_push($id['FeeDetails'][$key2],$ind);
} // }
array_splice($id['FeeDetails'][$key2],0,6,$in3); array_splice($id['FeeDetails'][$key2],0,6,$in3);
} }
else if($ind['SemID'] == 4) else if($ind['SemID'] == 4)
{ {
for($l = 7;$l <= 8; $l++) $l = 7;
{ // for($l = 7;$l <= 7; $l++)
// {
$sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child
JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID
JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1
@ -870,7 +874,7 @@ class Hallticket_model extends CI_Model
//array_push($id['FeeDetails'][$key2],$ind); //array_push($id['FeeDetails'][$key2],$ind);
} // }
array_splice($id['FeeDetails'][$key2],0,6,$in4); array_splice($id['FeeDetails'][$key2],0,6,$in4);
} }

8
Apollo/assets/js/controllers/examAttendanceCtrl.js
View File

@ -332,15 +332,19 @@ $scope.isLoaderTxt = "Loading...";
if(AttendanceTableID_AM != "") if(AttendanceTableID_AM != "")
{ {
console.log('AttendanceTableID_AM');
doc1.autoTable(AttendanceTableID_AM.columns, AttendanceTableID_AM.data, options1); doc1.autoTable(AttendanceTableID_AM.columns, AttendanceTableID_AM.data, options1);
}
doc1.save(fileNameAM); doc1.save(fileNameAM);
}
if(AttendanceTableID_PM != "") if(AttendanceTableID_PM != "")
{ {
console.log('AttendanceTableID_AM');
doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2); doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2);
}
doc2.save(fileNamePM); doc2.save(fileNamePM);
}

2
Apollo/assets/views/add_income_expense.html
View File

@ -38,7 +38,7 @@
</div> </div>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right"> <div class="pull-right">
<button type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in"> <button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
Add Add
</button> </button>
</div> </div>

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

@ -31,7 +31,11 @@
<div id="student_list_AM"> <div id="student_list_AM">
<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0"> <table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
<<<<<<< HEAD
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGNATURE</th> </tr></thead> <thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGNATURE</th> </tr></thead>
=======
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
>>>>>>> 145988e7a66409e847e30051cbe103b3fdcfb907
<tbody> <tbody>
<tr ng-repeat="student in dataForExamAttendanceAM" > <tr ng-repeat="student in dataForExamAttendanceAM" >
<td>{{($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.SubjectName}}</td><td></td><td></td> <td>{{($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.SubjectName}}</td><td></td><td></td>
@ -43,7 +47,7 @@
<div id="student_list_PM"> <div id="student_list_PM">
<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0"> <table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SUGNATURE</th> </tr></thead> <thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
<tbody> <tbody>
<tr ng-repeat="student in dataForExamAttendancePM" > <tr ng-repeat="student in dataForExamAttendancePM" >
<td>{{($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.SubjectName}}</td><td></td><td></td> <td>{{($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.SubjectName}}</td><td></td><td></td>