From ddd88204f2a5e24a6344e662fb887f45da5e7a41 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 11:06:59 +0530 Subject: [PATCH 01/12] call track changes --- Apollo/assets/js/controllers/callTrackingCtrl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index f7ce1930..81040070 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -1545,7 +1545,9 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $rootScope.currentDate1=new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2); } - + if($rootScope.currentDate1>new Date()){ + $rootScope.currentDate1=new Date(); + } $rootScope.myModel1.date=$rootScope.followupDetails.followupDetails[0].FollowupOn; // get 30 plus date for follwup details $rootScope.modifyDate1 = moment(); From fd495720ccc5cb9d30a2d1d8cfdf2a2d031e681c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 12:27:23 +0530 Subject: [PATCH 02/12] comments changes done --- Apollo/assets/views/daybook/daybookadmin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 666474df..c154b88e 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -183,7 +183,7 @@ {{p.TypeName}} {{p.ReceiptNo}} -
{{p.ReceiptNoComments}}
+
{{p.ReceiptNoComments}}
{{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}} From 001496b9f151fde55d37b7d099e408a1b5dd52ff Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 12:27:43 +0530 Subject: [PATCH 03/12] comments changes done --- Apollo/assets/views/daybook/dayBookApproval.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index d4538c47..8f41032c 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -272,7 +272,7 @@
- {{p.PaidDescription}} / {{p.Description}} + {{p.PaidDescription}} / {{p.Description}}
From 3da307aee218f93c902eac93f4ba7ed2f4781237 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 12:28:02 +0530 Subject: [PATCH 04/12] comments changes done --- Apollo/assets/views/daybook/daybooksuperAdminApproval.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index 2ecd7cd1..362ea1d1 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -251,7 +251,7 @@
- {{p.PaidDescription}} / {{p.Description}} + {{p.PaidDescription}} / {{p.Description}}
From cec1074b50cb0d979b5003224e4740382f43cb60 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 12:30:02 +0530 Subject: [PATCH 05/12] comments changes --- Apollo/assets/views/daybook/daybooksuperadmin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index f027927c..1f6be532 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -160,7 +160,7 @@ {{p.TypeName}} {{p.ReceiptNo}} -
{{p.ReceiptNoComments}}
+
{{p.ReceiptNoComments}}
{{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}} From f5da68dea47a64960b0b8429d5c75372c3601b81 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 16:05:38 +0530 Subject: [PATCH 06/12] call track changes --- Apollo/assets/views/callTrackingDetails.html | 25 +++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 89917d86..a0e539a5 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -15,6 +15,17 @@ } + .listCoutShow { + margin: 12px; + padding: 4px; + padding-left: 10px; + padding-right: 10px; + border: 1px solid #46b8da; + border-radius: 7px; + color: #FFF; + background-color: #46b8da; + text-align: center; + } @@ -103,9 +114,21 @@

- + +
+
+
+
+ Total Count: {{ data.length }} +
+
+
+
+ +
From c8be67a41cccc972dc61410331da57641698ffb1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 16:05:57 +0530 Subject: [PATCH 07/12] call track changes --- .../views/callTrackingPendingDetails.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index e8a25540..6ab5bf24 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -15,6 +15,17 @@ } + .listCoutShow { + margin: 12px; + padding: 4px; + padding-left: 10px; + padding-right: 10px; + border: 1px solid #eea236; + border-radius: 7px; + color: #FFF; + background-color: #eea236; + text-align: center; + } @@ -62,6 +73,16 @@
+
+
+
+
+ Total Count: {{ data.length }} +
+
+
+
From b389afbf97cc565552bbcc779e4a4268604e8bbe Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 16:06:13 +0530 Subject: [PATCH 08/12] call track changes --- .../assets/views/callTrackingLeadDetails.html | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html index 84f87ff2..c3df064e 100755 --- a/Apollo/assets/views/callTrackingLeadDetails.html +++ b/Apollo/assets/views/callTrackingLeadDetails.html @@ -15,6 +15,17 @@ } + .listCoutShow { + margin: 12px; + padding: 4px; + padding-left: 10px; + padding-right: 10px; + border: 1px solid #46b8da; + border-radius: 7px; + color: #FFF; + background-color: #46b8da; + text-align: center; + } @@ -62,6 +73,17 @@
+
+
+
+
+ Total Count: {{ data.length }} +
+
+
+
+
From b45ec70ebc2e0994b9b22a5b6cbc063e34662bab Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 16:06:31 +0530 Subject: [PATCH 09/12] call track changes --- .../views/callTrackingCloseDetails.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index 29d0299a..56802c87 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -15,6 +15,17 @@ } + .listCoutShow { + margin: 12px; + padding: 4px; + padding-left: 10px; + padding-right: 10px; + border: 1px solid #59b176; + border-radius: 7px; + color: #FFF; + background-color: #5fba7d; + text-align: center; + } @@ -61,6 +72,16 @@
+
+
+
+
+ Total Count: {{ data.length }} +
+
+
+
From caa4d5f164804c25ee1c3abc02d5d130de1ae96a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 17:37:49 +0530 Subject: [PATCH 10/12] student view fees status changes for balance amt --- Apollo/api/application/models/Studentview_model.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index bae4d182..1aa31e92 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -184,7 +184,9 @@ class Studentview_model extends CI_Model $paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result(); $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + // $storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } else{ @@ -291,7 +293,8 @@ class Studentview_model extends CI_Model $paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result(); $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + // $storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; } else{ From 149d4cf854585609068dfbaea2e3fc23759b8b10 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 17:56:39 +0530 Subject: [PATCH 11/12] fees status changes --- .../views/status-update/updateFeesStatus.html | 166 ++++-------------- 1 file changed, 38 insertions(+), 128 deletions(-) diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 93e9c042..f43f03ed 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -180,22 +180,7 @@ ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount
-
+
+ + + +
@@ -219,98 +212,25 @@ -
Bill Details
+
+ + + Sem/Year is required +
@@ -346,7 +266,7 @@ @@ -360,7 +280,7 @@ -
+
+
-
-
- Bill Amount Receipt NO Mode of Payment + Comments For Student + Comments For Internal Print @@ -510,6 +418,8 @@ {{v.BillAmount}} {{v.ReceiptNo}} {{v.ModeOfPayment}} + {{v.CommentsForStudent}} + {{v.InternalComments}} @@ -614,11 +524,11 @@
- - From b7d182b65790e85d989be0a6390b8b91c79a9b02 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 31 May 2018 17:56:52 +0530 Subject: [PATCH 12/12] fees status changes --- .../api/application/models/Fees_status_model.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index d55c5cdd..f161e616 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -91,6 +91,7 @@ class Fees_status_model extends CI_Model $this->db->where('SFS.CourseID',$student['CourseID']); $this->db->where('SFS.StudentID',$student['StudentID']); $this->db->where('BA.BranchCode',$student['BranchCode']); + $this->db->order_by('SFS.FeesID','DESC'); $enrolledFeesDetails = $this->db->get(); if($enrolledFeesDetails->result()){ $result_array['feesStatus']=true; @@ -139,7 +140,7 @@ class Fees_status_model extends CI_Model $getDefaultCourseFees = $this->getDefaultCourseFees($student); if($getDefaultCourseFees!=false){ - $result_array['feesDetails']=array_merge($CourseFeesArray,$getDefaultCourseFees); + $result_array['feesDetails']=array_merge($getDefaultCourseFees,$CourseFeesArray); } else{ $result_array['feesDetails']=$CourseFeesArray; @@ -190,6 +191,7 @@ class Fees_status_model extends CI_Model $this->db->where('SFS.CourseID', $student['CourseID']); $this->db->where('SFS.StudentID', $student['StudentID']); $this->db->where_in('SFS.FeesType', $serachArray); + $this->db->order_by('SFS.FeesID','DESC'); $enrolledFeesDetails = $this->db->get(); if ($enrolledFeesDetails->result()) { @@ -303,7 +305,9 @@ class Fees_status_model extends CI_Model $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + //$storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } else{ @@ -329,7 +333,7 @@ class Fees_status_model extends CI_Model $storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount; // for get paid bill details - $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy'); + $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy,SFP.CommentsForStudent,SFP.InternalComments'); $this->db->from(STUDENTS_FEES_PAID.' as SFP'); $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left'); $this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy'); @@ -344,7 +348,7 @@ class Fees_status_model extends CI_Model } $existDefaultFees = $this->existStudentCourseDefaultFees($student); if($existDefaultFees != false){ - return array_merge($mergeResult,$existDefaultFees); + return array_merge($existDefaultFees,$mergeResult); } else{ return $mergeResult; @@ -410,7 +414,9 @@ class Fees_status_model extends CI_Model $paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result(); $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + //$storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } else{