From 93157ccc257abfb841ac939a54e91e76a98d4b40 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 23 Aug 2018 15:32:28 +0530 Subject: [PATCH 1/3] daybook changes (nidhila) --- Apollo/assets/views/daybook/daybook.html | 62 +++++++++---------- Apollo/assets/views/daybook/daybookadmin.html | 62 +++++++++---------- .../views/daybook/daybooksuperadmin.html | 52 ++++++++-------- 3 files changed, 87 insertions(+), 89 deletions(-) diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index c82497f6..4d8a0385 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -123,52 +123,52 @@ - - - - - --> + - - - - - - - - - - @@ -178,9 +178,7 @@ - - - + diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 46e73219..84d364c5 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -123,52 +123,52 @@
Date - + Date + Income/Expense - + Income/
Expense + 		Voucher Number / Bill Number - + Voucher No / Bill No + Paid To / Received From - + Paid To / Received From + Sem - + + + University,
Course,
Sem + 		University - + Type + Type - - + Receipt No + Comments Mode of Payment - + Mode of Payment + Amount - + Amount + Balance - + Balance + Reason - + Reason + Status - + Status + Activity + Activity
{{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} {{p.FeePaymentDetails}}{{p.CourseName}} {{p.UniversityName}} {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} {{p.TypeName}} {{p.TypeName}}
- - - - - --> + - - - - - - - - - - @@ -179,9 +179,9 @@ - - - + + diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 2fef15b7..3609c614 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -15,6 +15,7 @@
+
@@ -108,50 +109,50 @@
Date + Date Income/Expense - + Income/
Expense + 		Voucher Number / Bill Number - + Voucher No / Bill No + Paid To / Received From - + Paid To / Received From + Sem - + + + University,
Course,
Sem + 		University - + Type + Type - - + Receipt No + Comments Mode of Payment - + Mode of Payment + Amount - + Amount + Balance - + Balance + Reason - + Reason + Status - + Status + Activity + Activity
{{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} {{p.FeePaymentDetails}}{{p.CourseName}}{{p.UniversityName}}{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} {{p.TypeName}} {{p.TypeName}}
- - - - - - - - - - - - - - + - @@ -162,9 +163,8 @@ - - - + + From 75aed13fefa48137c504afb8158962ee53c252f5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 15:50:26 +0530 Subject: [PATCH 2/3] 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 3/3] 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 @@
Date + Date Income/Expense + Income/
Expense 		Voucher Number / Bill Number + Voucher No / Bill No Paid To / Received From + Paid To / Received From Sem - + + + University,
Course,
Sem 		- University + Type + Type - - + Receipt No + Comments Mode of Payment - + Mode of Payment + Amount - + Amount + Balance - + Balance + ReasonStatus - + ReasonStatus + Action + Action
{{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} {{p.FeePaymentDetails}}{{p.CourseName}} {{p.UniversityName}}{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} {{p.TypeName}} {{p.TypeName}}