diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 92ed8081..270f919f 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -224,7 +224,7 @@ class StatusUpdation_model extends CI_Model { $results['preStatusDetails'] = false; $results['message'] = 'No record found'; } - } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') { + } else if ($reqDetailsFor == 'APPICATION_STATUS') { $searchFor = 'A001'; $searchTableFor = APPLICATION_STATUS; $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 5e2bc1e7..46e3a8df 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -221,7 +221,7 @@ var rows1 = ''; value['VoucherBillNumber'] = element.VoucherNumber || '-'; value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['Sem'] = element.FeePaymentDetails || '-'; - value['Course'] = element.CourseName || '-'; + // value['Course'] = element.CourseName || '-'; // value['University'] = element.UniversityName || '-'; // value['Type'] = element.TypeName || '-'; // value['ReceiptNo'] = element.ReceiptNo || '-'; @@ -271,7 +271,7 @@ var headers = { col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' }, col_4:{ text: 'Paid To Received From', 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_8:{ text: 'Type', 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_4 ); row.push( header.col_5 ); - row.push( header.col_6 ); + // row.push( header.col_6 ); // row.push( header.col_7 ); // row.push( header.col_8 ); // row.push( header.col_9 ); @@ -313,7 +313,7 @@ for (var key in rows1) row.push( data.VoucherBillNumber.toString() ); row.push( data.PaidReceivedToFrom.toString() ); row.push( data.Sem.toString() ); - row.push( data.Course.toString() ); + // row.push( data.Course.toString() ); // row.push( data.University.toString() ); // row.push( data.Type.toString() ); // row.push( data.ReceiptNo.toString() ); @@ -327,15 +327,15 @@ for (var key in rows1) var docDefinition = { - pageMargins: [40,155,40,55], + pageMargins: [40,165,40,55], pageOrientation: 'landscape', header: function() { return { - margin: 40, + margin: 2, columns: [ { }, - { text:['Resumen disciplinario'], + { text:['DAYBOOK DETAILS'], 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' ], // [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ] // ] - widths: [ '*', '*', '*', '*', '*' ], + widths: [ '40', 'auto', 'auto', 'auto', 'auto'], headerRows: 2, // keepWithHeaderRows: 1, body: body @@ -387,7 +387,7 @@ var docDefinition = { } }; - alert(JSON.stringify(rows1)); + // alert(JSON.stringify(rows1)); // pdfMake.createPdf(docDefinition).download(); pdfMake.createPdf(docDefinition).print(); } diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 5516c5d0..1ad69a03 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -15,7 +15,6 @@
| Document Name | +Certificate Name | Status | Date | Comments | diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index 3f801367..b816eb9a 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -455,7 +455,7 @@ -Document Name | +Certificate Name | Status | Date | Comments |
|---|