From 9a0bd5b0a28655f66b9eb3553c700abcc1b6d0b0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 09:45:42 +0530 Subject: [PATCH 1/9] course details changes done --- .../application/models/Fees_status_model.php | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index b5662782..0e4a37b4 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1035,35 +1035,6 @@ class Fees_status_model extends CI_Model * created by kms * */ public function insertDayBookMaster($data=null,$paymentID){ - if($data['ModeOfPayment']=='CASH'){ - $insertArray['Date'] = $data['BillDate']; - $insertArray['CreatedBy'] = $data['CreatedBy']; - $insertArray['CreatedOn'] = $data['CreatedOn']; - $insertArray['Description'] = $data['InternalComments']; - $insertArray['Amount'] = $data['BillAmount']; - $insertArray['Status'] = 'Approved'; - $insertArray['PaymentStatus'] = false; - $insertArray['FeesPaymentID'] = $paymentID; - - $insertArray['BranchCode'] = $data['UpdatedBy']; - - $this->db->select('ID,TypeID'); - $this->db->where('TypeID', 'I002'); - $this->db->where('TypeName', 'FEES'); - $getIncome=$this->db->get(INCOMEOUTCOMEMASTER)->last_row(); - - if($getIncome){ - $insertArray['Name'] = $getIncome->TypeID; - $insertArray['Type'] = $getIncome->ID; - $this->db->insert(DAYBOOKMASTER, $insertArray); - return true; - } - else{ - return true; - } - - } - else{ // this is for income entry $insertArray['Date'] = $data['BillDate']; $insertArray['CreatedBy'] = $data['CreatedBy']; @@ -1113,11 +1084,8 @@ class Fees_status_model extends CI_Model $this->db->insert(DAYBOOKMASTER, $expenseArray); } - - return true; - } } From 794300910673426aee10274b70650f687a197a2a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 10:48:30 +0530 Subject: [PATCH 2/9] course details changes done --- .../assets/js/controllers/feesStatusCtrl.js | 123 +++++++++++++----- 1 file changed, 93 insertions(+), 30 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 19b0a4a2..79e598fe 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -887,16 +887,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n var dayDiff = moment().diff(bDate, 'days'); var todatlFineAmt = 0; var fineAmt1 = 0; - var fineAmt2 = 0; - var fineAmt3 = 0; - var fineAmt4 = 0; - var fineAmt5 = 0; - var fineAmt6 = 0; - var fineAmt7 = 0; - var fineAmt8 = 0; - var fineAmt9 = 0; - var fineAmt10 = 0; + // var fineAmt2 = 0; + // var fineAmt3 = 0; + // var fineAmt4 = 0; + // var fineAmt5 = 0; + // var fineAmt6 = 0; + // var fineAmt7 = 0; + // var fineAmt8 = 0; + // var fineAmt9 = 0; + // var fineAmt10 = 0; var fineAmt11 = 0; + var countDays = 0; for (var k = 1; k <= dayDiff; k++) { if (k <= 90) { @@ -913,7 +914,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } } - else if (k > 90) { + else { + countDays = countDays+1; + + if (countDays<30) { + if(countDays==1){ + fineAmt11 = parseInt(fineAmt11)+300; + } + + + // foo++; + } + else{ + countDays=0; + + } + } + /*else if (k > 90) { if (k > 90 && k <= 120) { fineAmt2 = 300; @@ -956,10 +973,12 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } - } + }*/ } - todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); + // todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); + todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt11); + if(type=='1'){ $scope.setTotalAmount = Math.round(parseInt(totAmt) + parseInt(todatlFineAmt)-parseInt(other)); $scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt)); @@ -1089,20 +1108,25 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n var dayDiff = exDatenew1.diff(exBatchDate, 'days'); dayDiff = dayDiff+1; + alert(dayDiff); var todatlFineAmt = 0; var fineAmt1 = 0; - var fineAmt2 = 0; - var fineAmt3 = 0; - var fineAmt4 = 0; - var fineAmt5 = 0; - var fineAmt6 = 0; - var fineAmt7 = 0; - var fineAmt8 = 0; - var fineAmt9 = 0; - var fineAmt10 = 0; + // var fineAmt2 = 0; + // var fineAmt3 = 0; + // var fineAmt4 = 0; + // var fineAmt5 = 0; + // var fineAmt6 = 0; + // var fineAmt7 = 0; + // var fineAmt8 = 0; + // var fineAmt9 = 0; + // var fineAmt10 = 0; var fineAmt11 = 0; + var countDays = 0; + for (var k = 1; k <= dayDiff; k++) { + + if (k <= 90) { if (exitPayAmt <= 10000) { @@ -1117,7 +1141,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } } - else if (k > 90) { + else { + countDays = countDays+1; + + if (countDays<30) { + if(countDays==1){ + fineAmt11 = parseInt(fineAmt11)+300; + } + + + // foo++; + } + else{ + countDays=0; + + } + } + /* else if (k > 90) { if (k > 90 && k <= 120) { fineAmt2 = 300; @@ -1156,14 +1196,28 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } else { - fineAmt11 = 300; + countDays = countDays+1; + + if (countDays<30) { + if(countDays==1){ + fineAmt11 = parseInt(fineAmt11)+300; + } + + + // foo++; + } + else{ + countDays=0; + + } } - } + }*/ } - todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); + // todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); + todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt11); if(type1=='2'){ $scope.setTotalAmount = Math.round(parseInt(totAmt) -parseInt(other) + parseInt(todatlFineAmt)); $scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt)); @@ -1245,19 +1299,28 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } - - /* $scope.$watch('updateMoreItems', function (newValue, oldValue) { +/* + $scope.$watch('updateMoreItems', function (newValue, oldValue) { for (var i = 0; i < newValue.length; i++) { if (newValue[i].Amount != oldValue[i].Amount) { + var currentValue=0; + var pastValue=0; if(newValue[i].Amount>oldValue[i].Amount){ - var currentValue = parseInt(newValue[i].Amount)-oldValue[i].Amount; + currentValue = parseInt(newValue[i].Amount)-oldValue[i].Amount; } - else{ - var currentValue = oldValue[i].Amount-parseInt(newValue[i].Amount); + else if(newValue[i].Amount Date: Fri, 23 Feb 2018 10:54:01 +0530 Subject: [PATCH 3/9] course details changes done --- Apollo/assets/js/controllers/feesStatusCtrl.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 79e598fe..045a46da 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -922,8 +922,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n fineAmt11 = parseInt(fineAmt11)+300; } - - // foo++; } else{ countDays=0; @@ -1108,7 +1106,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n var dayDiff = exDatenew1.diff(exBatchDate, 'days'); dayDiff = dayDiff+1; - alert(dayDiff); var todatlFineAmt = 0; var fineAmt1 = 0; // var fineAmt2 = 0; @@ -1149,8 +1146,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n fineAmt11 = parseInt(fineAmt11)+300; } - - // foo++; } else{ countDays=0; From eaef4550d56f606e2384b93f23efb19ed6f688f4 Mon Sep 17 00:00:00 2001 From: saravana kumar kandasami Date: Fri, 23 Feb 2018 05:42:54 +0000 Subject: [PATCH 4/9] editEmployeeBranchDetails.html --- Apollo/assets/views/editEmployeeBranchDetails.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/editEmployeeBranchDetails.html b/Apollo/assets/views/editEmployeeBranchDetails.html index ebade0ca..d1771aa3 100755 --- a/Apollo/assets/views/editEmployeeBranchDetails.html +++ b/Apollo/assets/views/editEmployeeBranchDetails.html @@ -428,12 +428,12 @@
From dfc0838f107fc1b6c99456e53c757ccb9cc6cf67 Mon Sep 17 00:00:00 2001 From: saravana kumar kandasami Date: Fri, 23 Feb 2018 06:06:39 +0000 Subject: [PATCH 5/9] dashboardCtrl.js --- Apollo/assets/js/controllers/dashboardCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index a8ce4eda..0f77d24b 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -285,7 +285,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" }); } else { - swal("Failed!", "This student is not registered", "warning"); + swal("Failed!", "This student is not registerd", "warning"); $scope.courseEditLoading = false; $scope.studentDetails = ""; $scope.courseDetails = ""; From 62e5a5b4d03c6c1218785e9cc099b1f117c2f8e6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 16:22:13 +0530 Subject: [PATCH 6/9] course details changes done --- Apollo/api/application/models/Fees_status_model.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 0e4a37b4..94d36746 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -622,12 +622,21 @@ class Fees_status_model extends CI_Model * */ public function getCourseDetails($universityID=null) { - $this->db->select('CourseID,CourseName'); + $this->db->select('CourseID,CourseName,CourseCode'); $this->db->where('UniversityID',$universityID); $this->db->where('IsActive','1'); $this->db->order_by('CourseID','ASC'); $courseDetails = $this->db->get(COURSE); - return $courseDetails->result(); + $courseArray=array(); + if($courseDetails->result()){ + foreach ($courseDetails->result() as $row){ + $getDet['CourseID']=$row->CourseID; + $getDet['CourseName']=$row->CourseName.'('.$row->CourseCode.')'; + array_push($courseArray,$getDet); + } + + } + return $courseArray; } /* * get fees details assign for student From b638937d1a310a78026f3b19a98d949f371fc0a2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 16:28:25 +0530 Subject: [PATCH 7/9] course details changes done --- Apollo/api/application/models/Fees_status_model.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 94d36746..42d0505d 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -622,21 +622,12 @@ class Fees_status_model extends CI_Model * */ public function getCourseDetails($universityID=null) { - $this->db->select('CourseID,CourseName,CourseCode'); + $this->db->select('CourseID,CONCAT(CourseName, "(",CourseCode,")") AS CourseName'); $this->db->where('UniversityID',$universityID); $this->db->where('IsActive','1'); $this->db->order_by('CourseID','ASC'); $courseDetails = $this->db->get(COURSE); - $courseArray=array(); - if($courseDetails->result()){ - foreach ($courseDetails->result() as $row){ - $getDet['CourseID']=$row->CourseID; - $getDet['CourseName']=$row->CourseName.'('.$row->CourseCode.')'; - array_push($courseArray,$getDet); - } - - } - return $courseArray; + return $courseDetails->result(); } /* * get fees details assign for student From 6ddb05f021578ccfff18143d76a50aa4bae6d081 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 16:30:58 +0530 Subject: [PATCH 8/9] course details changes done --- Apollo/assets/js/controllers/feesStatusCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 045a46da..5bb02971 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -493,7 +493,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n angular.forEach($scope.feesStructureInfo[0].batchDetails,function (values,key) { $scope.BatchDetails.push({ "BatchCode":values.BatchCode, - "BatchName":values.BatchName + '-'+ values.BatchCode, + "BatchName":values.BatchName + '('+ values.BatchCode + ')', "BatchDate":values.BatchDate }) }); @@ -656,7 +656,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n angular.forEach(model.batchDetails,function (values,key) { $scope.BatchDetails.push({ "BatchCode":values.BatchCode, - "BatchName":values.BatchName + '-'+ values.BatchCode, + "BatchName":values.BatchName + '('+ values.BatchCode + ')', "BatchDate":values.BatchDate }) }); From b756a6e97b4589303ff717bad1ab3d65616cb6f9 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 17:30:07 +0530 Subject: [PATCH 9/9] changes in css --- Apollo/assets/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/css/styles.css b/Apollo/assets/css/styles.css index 86cc63c1..e7cdec59 100755 --- a/Apollo/assets/css/styles.css +++ b/Apollo/assets/css/styles.css @@ -11007,7 +11007,7 @@ td.small-width { /* ---------------------------------------------------------------------- */ #page-title { border-bottom: 1px solid #eee; - padding: 50px 0; + padding: 20px 0; position: relative; margin-left: -15px; margin-right: -15px;