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

batchshedule change

Browse Source
This commit is contained in:
gayathri1990 2018-08-24 18:26:08 +05:30
parent 91cc874c62
commit 88c8e47d51
5 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,17 +217,31 @@ class Hallticket_model extends CI_Model
return 1;
}
else
{
////////////////////
// $this->db->distinct();
// $this->db->select('SubjectID,SubjectCode,SubjectName');
// $this->db->from('T_SubjectMaster');
// // //$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID');
// $this->db->where('T_SubjectMaster.IsActive','1');
// // // $this->db->where('T_CourseSubject_Details.UniversityID',$universityID);
// $this->db->where_in('T_SubjectMaster.BranchCode',$branchId);
// $result = $this->db->get();
// //echo $this->db->last_query();
//return $result->result();
/////////////////////////
foreach($courseIDS as $c)
{
$this->db->distinct();
$this->db->select('SubjectID,SubjectCode,SubjectName');
$this->db->from('T_SubjectMaster');
//$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID');
$this->db->where('T_SubjectMaster.IsActive','1');
// $this->db->where('T_CourseSubject_Details.UniversityID',$universityID);
$this->db->where_in('T_SubjectMaster.BranchCode',$branchId);
$this->db->select('SM.SubjectID,SM.SubjectCode,SM.SubjectName');
$this->db->from('T_SubjectMaster SM');
$this->db->join('T_SemSubMap_Child SC','SC.SubjectID = SM.SubjectID');
$this->db->join('T_SemSubMap_Master SMM','SMM.mapID = SC.mapID');
$this->db->where('SMM.UniversityID',$universityID);
$this->db->where('SMM.CourseID',$c);
$result = $this->db->get();
//echo $this->db->last_query();
return $result->result();
return $result->result();
}
}
}

58
Apollo/assets/js/controllers/generateHallTicketCtrl.js
View File

@ -482,20 +482,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
var uni_add_position = 0;
if($scope.length_of_universityNamePDF >= 20 ){
//var uni_add_position = 0;
// if($scope.length_of_universityNamePDF >= 20 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
// uni_add_position = 110;console.log(uni_add_position);
// }
// else{
// uni_add_position = 10;console.log(uni_add_position);
// }
doc.setFontSize(10);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.text(45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.text(55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.text(93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);
@ -713,20 +713,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
var uni_add_position = 0;
if($scope.length_of_universityNamePDF >= 20 ){
// var uni_add_position = 0;
// if($scope.length_of_universityNamePDF >= 20 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
// uni_add_position = 110;console.log(uni_add_position);
// }
// else{
// uni_add_position = 10;console.log(uni_add_position);
// }
doc.setFontSize(10);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.text(45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.text(55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.text(93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);
@ -899,19 +899,19 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
var uni_add_position = 0;
if($scope.length_of_universityNamePDF >= 20 ){
// if($scope.length_of_universityNamePDF >= 20 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
// uni_add_position = 110;console.log(uni_add_position);
// }
// else{
// uni_add_position = 10;console.log(uni_add_position);
// }
doc.setFontSize(10);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.text(45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.text(55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.text(93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);

2
Apollo/assets/views/reregistration/reregistrationformpdf.html
View File

@ -9,7 +9,7 @@
<td style="width:154px;text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 40%;"></td>
<td style="border-bottom-style: hidden;" colspan="2">
<h3 style="color:blue; text-align:center;margin-left:-20%;"><strong>{{Course.UniversityName}}</strong></h3>
<p style="color:blue; margin-top: 2px;text-align:center;margin-left:-30%;">{{Course.Address}}</p>
<p style="color:blue; margin-top: 2px;text-align:center;margin-left:-22%;">{{Course.Address}}</p>
</td>
</tr>
<tr>

BIN
Apollo/images/student/Dri_XiHb16emyWwY.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

0
Apollo/images/university/sample.jpeg → Apollo/images/university/Dri_S3fkhY1VmHa6.jpeg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB