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

student view changes , daybood pdf export changes: kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-23 17:15:54 +05:30
parent 7c63172811
commit 1ae3d92b7a
5 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -224,7 +224,7 @@ class StatusUpdation_model extends CI_Model {
$results['preStatusDetails'] = false; $results['preStatusDetails'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
} }
} else if ($reqDetailsFor == 'CERTIFICATE_STATUS') { } else if ($reqDetailsFor == 'APPICATION_STATUS') {
$searchFor = 'A001'; $searchFor = 'A001';
$searchTableFor = APPLICATION_STATUS; $searchTableFor = APPLICATION_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');

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

@ -221,7 +221,7 @@ var rows1 = '';
value['VoucherBillNumber'] = element.VoucherNumber || '-'; value['VoucherBillNumber'] = element.VoucherNumber || '-';
value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['PaidReceivedToFrom'] = element.PaidTo || '-';
value['Sem'] = element.FeePaymentDetails || '-'; value['Sem'] = element.FeePaymentDetails || '-';
value['Course'] = element.CourseName || '-'; // value['Course'] = element.CourseName || '-';
// value['University'] = element.UniversityName || '-'; // value['University'] = element.UniversityName || '-';
// value['Type'] = element.TypeName || '-'; // value['Type'] = element.TypeName || '-';
// value['ReceiptNo'] = element.ReceiptNo || '-'; // value['ReceiptNo'] = element.ReceiptNo || '-';
@ -271,7 +271,7 @@ var headers = {
col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' }, col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' },
col_4:{ text: 'Paid To Received From', style: 'tableHeader', alignment: 'center' }, col_4:{ text: 'Paid To Received From', style: 'tableHeader', alignment: 'center' },
col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'}, col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'},
col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'}, // col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'},
// col_7:{ text: 'University', style: 'tableHeader', alignment: 'center'}, // col_7:{ text: 'University', style: 'tableHeader', alignment: 'center'},
// col_8:{ text: 'Type', style: 'tableHeader', alignment: 'center'}, // col_8:{ text: 'Type', style: 'tableHeader', alignment: 'center'},
// col_9:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center'}, // col_9:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center'},
@ -291,7 +291,7 @@ for (var key in headers){
row.push( header.col_3 ); row.push( header.col_3 );
row.push( header.col_4 ); row.push( header.col_4 );
row.push( header.col_5 ); row.push( header.col_5 );
row.push( header.col_6 ); // row.push( header.col_6 );
// row.push( header.col_7 ); // row.push( header.col_7 );
// row.push( header.col_8 ); // row.push( header.col_8 );
// row.push( header.col_9 ); // row.push( header.col_9 );
@ -313,7 +313,7 @@ for (var key in rows1)
row.push( data.VoucherBillNumber.toString() ); row.push( data.VoucherBillNumber.toString() );
row.push( data.PaidReceivedToFrom.toString() ); row.push( data.PaidReceivedToFrom.toString() );
row.push( data.Sem.toString() ); row.push( data.Sem.toString() );
row.push( data.Course.toString() ); // row.push( data.Course.toString() );
// row.push( data.University.toString() ); // row.push( data.University.toString() );
// row.push( data.Type.toString() ); // row.push( data.Type.toString() );
// row.push( data.ReceiptNo.toString() ); // row.push( data.ReceiptNo.toString() );
@ -327,15 +327,15 @@ for (var key in rows1)
var docDefinition = { var docDefinition = {
pageMargins: [40,155,40,55], pageMargins: [40,165,40,55],
pageOrientation: 'landscape', pageOrientation: 'landscape',
header: function() { header: function() {
return { return {
margin: 40, margin: 2,
columns: [ columns: [
{ {
}, },
{ text:['Resumen disciplinario'], { text:['DAYBOOK DETAILS'],
alignment: 'left',bold:true,margin:[-405,80,0,0],fontSize: 24} alignment: 'left',bold:true,margin:[-405,80,0,0],fontSize: 24}
] ]
} }
@ -357,7 +357,7 @@ var docDefinition = {
// [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ], // [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ],
// [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ] // [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ]
// ] // ]
widths: [ '*', '*', '*', '*', '*' ], widths: [ '40', 'auto', 'auto', 'auto', 'auto'],
headerRows: 2, headerRows: 2,
// keepWithHeaderRows: 1, // keepWithHeaderRows: 1,
body: body body: body
@ -387,7 +387,7 @@ var docDefinition = {
} }
}; };
alert(JSON.stringify(rows1)); // alert(JSON.stringify(rows1));
// pdfMake.createPdf(docDefinition).download(); // pdfMake.createPdf(docDefinition).download();
pdfMake.createPdf(docDefinition).print(); pdfMake.createPdf(docDefinition).print();
} }

16
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -15,7 +15,6 @@
<div> <div>
<tabset class="tabbable"> <tabset class="tabbable">
<tab heading="View" id="viewDayBook"> <tab heading="View" id="viewDayBook">
<!--<button ng-click="generatePFD()">generatePFD</button>-->
<div class="container-fluid container-fullw"> <div class="container-fluid container-fullw">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -83,6 +82,20 @@
</style> </style>
<div class="row">
<!--<button ng-click="exportData()">export</button>-->
<div class="pull-right" ng-if="data">
<button ng-click="exportData()" class="btn btn-sm btn-default">
Export As Excel
</button>
<!--<button ng-click="generatePFD()" class="btn btn-sm btn-default">
Export As PDF
</button>-->
</div>
</div>
<div class="row"> <div class="row">
<div class="pull-right"> <div class="pull-right">
@ -105,7 +118,6 @@
</style> </style>
<button ng-click="exportData()">export</button>
<table class="table table-bordered export-table"> <table class="table table-bordered export-table">
<thead> <thead>
<tr> <tr>

4
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -395,7 +395,7 @@
</tab> </tab>
<tab heading="Document Details" id="document"> <tab heading="Certificate Details" id="document">
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468"> <div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
<div ng-if="course.certificateDetails==false"> <div ng-if="course.certificateDetails==false">
<!--<center> <!--<center>
@ -406,7 +406,7 @@
<thead> <thead>
<tr> <tr>
<!-- <th>Type</th>--> <!-- <th>Type</th>-->
<th>Document Name</th> <th>Certificate Name</th>
<th>Status</th> <th>Status</th>
<th>Date</th> <th>Date</th>
<th>Comments</th> <th>Comments</th>

4
Apollo/assets/views/student/studentView.html
View File

@ -455,7 +455,7 @@
</tab> </tab>
<tab heading="Document Details" id="document"> <tab heading="Certificate Details" id="document">
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468"> <div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
<div ng-if="course.certificateDetails==false"> <div ng-if="course.certificateDetails==false">
<!--<center> <!--<center>
@ -466,7 +466,7 @@
<thead> <thead>
<tr> <tr>
<!-- <th>Type</th>--> <!-- <th>Type</th>-->
<th>Document Name</th> <th>Certificate Name</th>
<th>Status</th> <th>Status</th>
<th>Date</th> <th>Date</th>
<th>Comments</th> <th>Comments</th>