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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-22 16:10:39 +05:30
commit 0ed67a9b9f
16 changed files with 186 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/models/Fees_status_model.php
View File

@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model
$this->db->select('ReceiptNo');
$this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
$this->db->where('IsActive', '1');
if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
$result['paidStatus'] = false;
$result['message'] = "This receipt number is already exist!";

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

@ -297,11 +297,30 @@ $scope.isLoaderTxt = "Loading...";
var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
doc1.setFontSize(9);
doc1.setFontStyle('bold');
doc1.text(60,30,heading);
//doc1.textAlign('CENTER',50,30,heading);
//doc1.text(60,30,heading);
var heading_length = heading.length;
var heading_start_point = 0;
var heading1_start_point = 0;
if(heading_length <= 100)
{
var heading_start_point = 200;
var heading1_start_point = 225;
}
else
{
var heading_start_point = 100;
var heading1_start_point = 150;
}
// console.log(heading_length);
// console.log((doc1.internal.pageSize.width/2));
// console.log((doc1.internal.pageSize.width/2)-(heading_length));
doc1.text(heading_start_point,30,heading);
doc1.setFontSize(9);
doc1.setFontStyle('bold');
doc1.text(70,45,heading1);
//doc1.text(70,45,heading1);
doc1.text(heading1_start_point,45,heading1);
};
// ctx.textAlign = "right";
@ -312,11 +331,23 @@ $scope.isLoaderTxt = "Loading...";
var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
doc2.setFontSize(9);
doc2.setFontStyle('bold');
doc2.text(50,30,heading);
var heading_length = heading.length;
var heading_start_point = 0;
var heading1_start_point = 0;
if(heading_length <= 100)
{
var heading_start_point = 200;
var heading1_start_point = 225;
}
else
{
var heading_start_point = 100;
var heading1_start_point = 150;
}
doc2.text(heading_start_point,30,heading);
doc2.setFontSize(9);
doc2.setFontStyle('bold');
doc2.text(70,45,heading1);
doc2.text(heading1_start_point,45,heading1);
};

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

@ -357,6 +357,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
console.log('child');
$scope.localPdfUniverityDetails = pdfitems.universityDetails;
$scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName;
$scope.length_of_universityNamePDF = $scope.universityNamePDF.length/2;
console.log('$scope.length_of_universityNamePDF'+$scope.length_of_universityNamePDF);
$scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address;
$scope.universityEmailPDF = $scope.localPdfUniverityDetails[0].EmailID;
$scope.universityLogoPDF = $scope.localPdfUniverityDetails[0].ProfilePicPath;
@ -473,20 +475,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
doc.setDrawColor(0);
doc.setFillColor(245, 245, 240);
doc.rect(150, 30, 395, 60,'FD');
doc.rect(120, 30, 425, 67,'FD');
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
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 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
doc.setFontSize(10);
doc.text(150,50,$scope.universityNamePDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text(170,65,$scope.universityAddressPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text(280,80,$scope.universityEmailPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);
@ -697,20 +706,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
doc.setDrawColor(0);
doc.setFillColor(245, 245, 240);
doc.rect(150, 30, 395, 60,'FD');
doc.rect(120, 30, 425, 67,'FD');
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
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 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
doc.setFontSize(10);
doc.text(150,50,$scope.universityNamePDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text(170,65,$scope.universityAddressPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text(280,80,$scope.universityEmailPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);
@ -874,7 +890,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
doc.setDrawColor(0);
doc.setFillColor(245, 245, 240);
doc.rect(150, 30, 395, 60,'FD');
doc.rect(120, 30, 425, 67,'FD');
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
@ -882,12 +898,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 ){
uni_add_position = 110;console.log(uni_add_position);
}
else{
uni_add_position = 10;console.log(uni_add_position);
}
doc.setFontSize(10);
doc.text(150,50,$scope.universityNamePDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
doc.setFontSize(8);
doc.text(170,65,$scope.universityAddressPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
doc.setFontSize(8);
doc.text(280,80,$scope.universityEmailPDF);
doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
doc.rect(45, 100, 400, 60);
doc.rect(445, 100, 100, 60);

16
Apollo/assets/js/controllers/report_ans_bookletCtrl.js
View File

@ -82,8 +82,22 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
$scope.show = false;
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -111,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
}

14
Apollo/assets/js/controllers/report_app_pendingCtrl.js
View File

@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
//Response data
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;

16
Apollo/assets/js/controllers/report_balfeeCtrl.js
View File

@ -90,10 +90,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
// response data
$scope.show = false;
$scope.returnResultData = [];
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
$scope.returnResultData.length=0;
var firstError = null;
if (form.$invalid) {
@ -121,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
}

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

@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
});
$scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
//alert($scope.batch.name);
$scope.cert_data = '';
$scope.message = '';
@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch,
from : $scope.univModel.from_date,
to : $scope.univModel.to_date

18
Apollo/assets/js/controllers/report_doc_pendingCtrl.js
View File

@ -82,9 +82,23 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
//Response data
$scope.show = false;
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -112,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
}

13
Apollo/assets/js/controllers/report_examfeeCtrl.js
View File

@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
$scope.show = false;
$scope.onSubmit = function (form) {

6
Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
View File

@ -83,7 +83,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}
});
}
/* watch university model for bind batch objects*/
/* watch university model for bind batch objects*/
$scope.$watchCollection('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
@ -109,8 +109,8 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}
});
$scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
//alert($scope.batch.name);
$scope.mark_cert_data = '';
$scope.message = '';
@ -122,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch,
from : $scope.univModel.from_date,
to : $scope.univModel.to_date

4
Apollo/assets/js/controllers/report_markcard_statusCtrl.js
View File

@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.show = false;
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
}

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

@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.show = false;
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
},
data: {
branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
university : $scope.univModel.university.universityID,
university : $scope.filterUniv.universityID,
batch : $scope.univModel.batch
}

12
Apollo/assets/js/controllers/report_waiver_referalCtrl.js
View File

@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;

10
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -71,7 +71,7 @@
<!-- END OF SEMESTER TYPE STUDENTS-->
<!-- FOR YEAR TYPE STUDENTS-->
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<thead>
<tr>
@ -88,7 +88,7 @@
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<thead>
<tr>
@ -105,7 +105,7 @@
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<thead>
<tr>
@ -122,11 +122,11 @@
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<thead>
<tr>
<th width="5%">Sem/Year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
<th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr>
</thead>
<tbody>

14
Apollo/assets/views/newreg_report.html
View File

@ -164,13 +164,12 @@
<table id="datatable" class="table table-hover">
<thead>
<tr >
<th style="font-size: 12px;">Date Of Registration</th>
<th style="font-size: 12px;">Student Name</th>
<th style="font-size: 12px;">Father Name</th>
<th style="font-size: 12px;">Course</th>
<th style="font-size: 12px;">Batch</th>
<th style="font-size: 12px">University</th>
<th style="font-size: 12px;">Date Of Registration</th>
<th style="font-size: 12px;">Batch</th>
<th style="font-size: 12px;">Course</th>
<th style="font-size: 12px;">Mobile</th>
<!-- <th style="font-size: 12px;">Amount</th>
<th style="font-size: 12px;">Action</th> -->
@ -178,13 +177,12 @@
</thead>
<tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.DOJ}}</td>
<td>{{p.Firstname}}</td>
<td>{{p.Fathername}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.BatchName}}</td>
<td>{{p.UniversityName}}</td>
<td>{{p.DOJ}}</td>
<td>{{p.BatchName}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.MobileNumber}}</td>
</tr>

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

@ -6,10 +6,10 @@
<table style="height: 341px;background-color: white;border-collapse: collapse; color: black;" border="1" width="100%">
<tbody>
<tr>
<td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td>
<td style="width: 150px;border-bottom-style: hidden;" colspan="2">
<h3 style="color:blue; margin-left: -150px;"><strong>{{Course.UniversityName}}</strong></h3>
<p style="color:blue; margin-left: -96px; margin-top: -9px;">{{Course.Address}}</p>
<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>
</td>
</tr>
<tr>