From 75aed13fefa48137c504afb8158962ee53c252f5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 15:50:26 +0530 Subject: [PATCH 1/8] Hallticket and Re-register sub manu identification changes --- Apollo/assets/views/partials/nav.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index b11642a1..4046ab1a 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -355,7 +355,7 @@
- GENERATE HALLTICKET + GENERATE HALLTICKET
@@ -391,7 +391,7 @@
- REREGISTRATION + REREGISTRATION
@@ -856,7 +856,7 @@
- REREGISTRATION + REREGISTRATION
@@ -1228,7 +1228,7 @@
- REREGISTRATION + REREGISTRATION
From 5a99ac36c79baca67cefe7b42bfb5102fa1c83f6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 23 Aug 2018 16:21:13 +0530 Subject: [PATCH 2/8] fee collected report --- .../api/application/models/Reports_model.php | 42 +++++++++---------- Apollo/assets/views/feecollected.html | 2 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 7907a74d..8cb78217 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -916,46 +916,42 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from //echo $det['university'];die() ; - $this->db->select('T_Student_CourseDetails.UniversityID,UniversityName, - SUM(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, - SUM(IF(ModeOfPayment ="CHEQUE",BillAmount, 0)) AS Cheque, - SUM(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal, - SUM(IF(ModeOfPayment ="ONLINE TRANSACTION",BillAmount, 0)) AS Onlinec, - SUM(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER, - SUM(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card, - SUM(T_Students_Fees_PaidDetails.BillAmount) AS Total'); - $this->db->from('T_Students_Fees_PaidDetails'); - $this->db->join('T_Student_CourseDetails','T_Student_CourseDetails.StudentID=T_Students_Fees_PaidDetails.StudentID'); - $this->db->join('T_UniversityMaster','T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID'); + $this->db->select('d.UniversityID,UniversityName, + sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, + sum(IF(ModeOfPayment ="CHEQUE", BillAmount, 0)) AS Cheque, + sum(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal, + sum(IF(ModeOfPayment ="ONLINE TRANSACTION", BillAmount, 0)) AS Onlinec, + sum(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER, + sum(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card, + sum(a.BillAmount) AS Total,a.CreatedOn'); + $this->db->from('T_Students_Fees_PaidDetails a'); + $this->db->join('T_Students_Fees_Status b','b.FeesId = a.FeesID','left'); + $this->db->join('T_CourseMaster c','c.CourseID = b.CourseID','left'); + $this->db->join('T_UniversityMaster d','d.UniversityID=c.UniversityID','left'); + // $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"'); - $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date))); + $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date))); - $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date))); + $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date))); - - // $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)'); - - + - $this->db->where('T_Students_Fees_PaidDetails.IsActive','1'); + $this->db->where('a.IsActive','1'); if($det['university']!='') { - $this->db->where('T_Student_CourseDetails.UniversityID',$det['university']); + $this->db->where('d.UniversityID',$det['university']); } $this->db->group_by('UniversityID'); $feeDetails = $this->db->get()->result(); - // print_r( $this->db->last_query()); - // die(); - - // print_r($feeDetails); + if($feeDetails) { diff --git a/Apollo/assets/views/feecollected.html b/Apollo/assets/views/feecollected.html index e2c12846..783e7ec4 100644 --- a/Apollo/assets/views/feecollected.html +++ b/Apollo/assets/views/feecollected.html @@ -112,7 +112,7 @@ @@ -83,7 +83,7 @@ td,th { - @@ -156,18 +156,18 @@ td,th { {{p.SL_NO}} - {{p.initialPaid}} - {{p.Enrollment_id}} + {{p.initialPaid || "-"}} + {{p.Enrollment_id || "-"}} {{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Phone_number}} {{p.University}} - {{p.balance}} + {{p.balance || "0"}} {{p.certname}} {{p.status}} - {{p.adate}} + {{p.adate || "-"}} diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 6444ce49..69b882f3 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -70,7 +70,7 @@ td,th { - @@ -83,7 +83,7 @@ td,th { - @@ -142,17 +142,17 @@ td,th { SL.No Student Name Father Name + Phone No + University Course Sem/Year - Phone No - University - Balance Fee - Certificates Name + Certificates Name Received Status Received Date Issued Status Issued Date Certificate Issued Comments + Balance Fee @@ -162,17 +162,17 @@ td,th { {{p.SL_NO}} {{p.Student_name}} {{p.Father_name}} + {{p.Phone_number}} + {{p.University}} {{p.course_name}} {{p.Sem_year}} - {{p.Phone_number}} - {{p.University}} - {{p.Balance_fee}} - {{p.Certificate_name}} + {{p.Certificate_name}} {{p.rstatus}} - {{p.rdate}} + {{p.rcvedate}} {{p.istatus}} - {{p.idate}} - {{p.cmnts}} + {{p.issuedate}} + {{p.acmts}} + {{p.Balance_fee}} diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 0937e42b..e8a1af2b 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -140,7 +140,7 @@ {{p.staffname}} {{p.Waiver_bill}} {{p.Waiver_amount}} - {{p.Referal_bill}} + {{p.Referal_bill}} {{p.Referal_amount}} {{p.Comments}} From c4f114afad0564a8d43a3a2472b6046ba88337ba Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 11:44:40 +0000 Subject: [PATCH 4/8] report_ans_bookletCtrl.js edited online with Bitbucket --- Apollo/assets/js/controllers/report_ans_bookletCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 3cd797b0..4d44014c 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -299,7 +299,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod //console.log(selectedStudents);return false; var comments = []; for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ - comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - Course:" +selectedStudents[stuid].Course_name; + comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedToStudentDate:" +selectedStudents[stuid].issuedate; } if(isNaN(myModel.date)){ From 1ae3d92b7a8e797e0d28de8102a24f64bf4864c3 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 23 Aug 2018 17:15:54 +0530 Subject: [PATCH 5/8] student view changes , daybood pdf export changes: kdk --- .../models/StatusUpdation_model.php | 2 +- .../js/controllers/daybooksuperadminCtrl.js | 18 +++++++++--------- .../views/daybook/daybooksuperadmin.html | 16 ++++++++++++++-- .../views/student/studentDetailsModal.html | 4 ++-- Apollo/assets/views/student/studentView.html | 4 ++-- 5 files changed, 28 insertions(+), 16 deletions(-) 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 @@
-
@@ -83,6 +82,20 @@ +
+ +
+ + +
+
+ + +
@@ -105,7 +118,6 @@ - diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 2a8c911e..b1b7f339 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -395,7 +395,7 @@ - +
-
+ 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 @@ - +
-
+ From 435d9e7205fcf443a39de68f117fe33afadf3ffb Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 17:18:47 +0530 Subject: [PATCH 6/8] course changes --- Apollo/assets/views/editCourseDetails.html | 281 +++++++++++---------- 1 file changed, 141 insertions(+), 140 deletions(-) diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index 319649e7..675f8cab 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -203,78 +203,87 @@
- {{myModelSemYear1.FeesName}} +
+
+ -
+ + Enter a valid amount -
-
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
- - - -
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
+ + +
+ + + + Enter a valid amount + +
+ + +
+
+ + + + Enter a valid amount + +
+
+ + + + Enter a valid amount + +
+
+ +
+
+ + + + Enter a valid amount + +
+
+ + + +
@@ -283,89 +292,81 @@
-
-
-
- - - Enter a valid amount +
+ {{myModelSemYear1.FeesName}} +
+ + +
+
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
-
- +
+
+ + + Enter a valid name +
+
+ + + + Enter a valid amount + +
-
+ - -
-
- - - - Enter a valid amount - -
-
- - - - Enter a valid amount - -
-
- -
-
- - - - Enter a valid amount - -
-
- - - - -
+
+
From c4811f4035446822831a24de33eab3add3cb4e43 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 17:18:57 +0530 Subject: [PATCH 7/8] course changes --- Apollo/assets/views/courseDetails.html | 164 +++++++++++++------------ 1 file changed, 85 insertions(+), 79 deletions(-) diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 3d135d28..c8f4810a 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -13,9 +13,9 @@

{{ mainTitle }}

- + Add/View Course Details. - +
@@ -340,83 +340,8 @@
+
- {{myModelSemYear.FeesName}} - -
- -
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
- -
-
-
-
- -
-
- - - -
-
- +
+ +
+ + + + +
+ +
+
+ {{myModelSemYear.FeesName}} + +
+ + +
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
+
+
+ + + + Enter a valid name +
+
+ + + + Enter a valid amount + +
+ +
+ +
+
+ +
+
From 5cdebb77a6abb074d15ee9bf0e71ee1d472f2854 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 23 Aug 2018 18:44:30 +0530 Subject: [PATCH 8/8] daybook table --- Apollo/assets/views/daybook/daybook.html | 2 +- Apollo/assets/views/daybook/daybookadmin.html | 2 +- Apollo/assets/views/daybook/daybooksuperadmin.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 4d8a0385..f8ce665b 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -123,7 +123,7 @@
Document NameCertificate Name Status Date CommentsDocument NameCertificate Name Status Date Comments
-
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 84d364c5..e20bc2ee 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -123,7 +123,7 @@ -
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 5dd5d61e..cdf76bc3 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -121,7 +121,7 @@ -
Date + Date Income/
Expense