From 807e299d27d187d801c050b341c93a57e1c73a2f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 17:59:12 +0530 Subject: [PATCH 01/13] date picker issue --- Apollo/assets/views/status-update/setFeesForStudent.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index 77f20498..61560400 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -267,11 +267,12 @@ is-open="startOpen" ng-init="startOpen = false" name="date{{$index}}" + id="date{{$index}}" datepicker-options="dateOptions" placeholder="Select Date" min-date="getDateArray[$index].Date" max-date="getDateArray[$index+2].Date" - close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/> + close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true" required="required"/> Date is required. From 666b74fe60f28d4282f599d3c96372bc6c2b0b2f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:05:04 +0530 Subject: [PATCH 02/13] course details changes done --- Apollo/assets/views/callTrackingDetails.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index fe1644d3..4ddea63d 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -68,7 +68,7 @@ datepicker-options="dateOptions" placeholder="Select From Date" - max-date="minStartDate" + max-date="minStartDate" ng-readonly="true" close-text="Close" ng-change="checkDate(myModel,'2');"> @@ -81,7 +81,7 @@ @@ -347,7 +347,7 @@ placeholder="Select Date" min-date="minDate" max-date="futureDate" - close-text="Close" required="required"/> + close-text="Close" required="required" ng-readonly="true"/> Followup Date is required. From 28b754e91a81902315591027752b842cf7aaad6f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:05:58 +0530 Subject: [PATCH 03/13] course details changes done --- Apollo/assets/views/callTrackingFollowup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index 5be524b5..f086caca 100755 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -140,7 +140,7 @@ placeholder="Select Date" min-date="currentDate1" max-date="futureDate1" - close-text="Close" required="required"/> + close-text="Close" required="required" ng-readonly="true"/> Date is required. From 6ccfb57dd411435dce5e19ad162b79968ab49cc2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:06:35 +0530 Subject: [PATCH 04/13] course details changes done --- Apollo/assets/views/callTrackingLeadDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html index ec7a9f51..38989084 100755 --- a/Apollo/assets/views/callTrackingLeadDetails.html +++ b/Apollo/assets/views/callTrackingLeadDetails.html @@ -51,7 +51,7 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="checkDate(myModel)"/> + close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> From 15e8e230a748550a6d034d55bdb1f012cfe05a14 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:06:54 +0530 Subject: [PATCH 05/13] course details changes done --- Apollo/assets/views/callTrackingPendingDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index ff243e80..a3999f06 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -51,7 +51,7 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="checkDate(myModel)"/> + close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> From dac5429a98a47a3c762672339ed432ad01db14ef Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:07:14 +0530 Subject: [PATCH 06/13] course details changes done --- Apollo/assets/views/callTrackingCloseDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index fe285c3a..d55a1178 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -50,7 +50,7 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="checkDate(myModel)"/> + close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> From f3eec3e25751e4cdba1b0b19d29ff3b63e684102 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:09:10 +0530 Subject: [PATCH 07/13] course details changes done --- Apollo/assets/views/status-update/updateFeesStatus.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index c2bc57e3..bf2a1512 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -289,7 +289,7 @@ placeholder="Select Date" min-date="currentDate" max-date="futureDate" - close-text="Close" required="required"/> + close-text="Close" required="required" ng-readonly="true"/> Date is required. From cb929baa33fec731c7d071654d19fbe91e3aa565 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:09:41 +0530 Subject: [PATCH 08/13] course details changes done --- Apollo/assets/views/editBatchDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/editBatchDetails.html b/Apollo/assets/views/editBatchDetails.html index 49223977..62549900 100755 --- a/Apollo/assets/views/editBatchDetails.html +++ b/Apollo/assets/views/editBatchDetails.html @@ -40,7 +40,7 @@ name="date" datepicker-options="dateOptions" placeholder="Select Date" - close-text="Close" ng-change="getDateFormat(p.BatchDate,'2');" required="required"/> + close-text="Close" ng-change="getDateFormat(p.BatchDate,'2');" required="required" ng-readonly="true"/> Batch date is required. From bb1a60ea667a37490fefabebdbfb2bd2551ce01e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:10:01 +0530 Subject: [PATCH 09/13] course details changes done --- Apollo/assets/views/batch.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/batch.html b/Apollo/assets/views/batch.html index 8e73fdf0..207ebb47 100755 --- a/Apollo/assets/views/batch.html +++ b/Apollo/assets/views/batch.html @@ -161,7 +161,7 @@ name="date" datepicker-options="dateOptions" placeholder="Select Date" - close-text="Close" ng-change="getDateFormat(myModel.date,'1');" required="required"/> + close-text="Close" ng-change="getDateFormat(myModel.date,'1');" required="required" ng-readonly="true"/> Batch date is required. From 3020a9779901fc31c78a288511f580e5fc773337 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Feb 2018 18:41:04 +0530 Subject: [PATCH 10/13] course details changes done --- Apollo/assets/views/status-update/setFeesForStudent.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index 61560400..fa050887 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -267,8 +267,6 @@ is-open="startOpen" ng-init="startOpen = false" name="date{{$index}}" - id="date{{$index}}" - datepicker-options="dateOptions" placeholder="Select Date" min-date="getDateArray[$index].Date" max-date="getDateArray[$index+2].Date" From 7356ab572c5575ed79e592f15ebc9376be801309 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 24 Feb 2018 12:26:43 +0530 Subject: [PATCH 11/13] student view changes done --- .../views/student/studentDetailsModal.html | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 8d0d7838..87b4976d 100644 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -334,7 +334,26 @@ - + + + + {{mark.Sem_Year}} ({{mark.Sem}}) + + + + {{mark.ListName}}   ON   {{mark.CDate}} + + + {{mark.Comments}} + + + + + + + {{mark.Sem_Year}} @@ -379,7 +398,22 @@ - + + + + {{study.Sem_Year}} ({{study.Sem}}) + + + {{study.ListName}}   ON   {{study.SDate}} + + + {{study.Comments}} + + + + + {{study.Sem_Year}} From dd3ba1c7da5573a8c2b1ff016f77562fe5d9f9a0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 24 Feb 2018 12:27:00 +0530 Subject: [PATCH 12/13] course details changes done --- Apollo/assets/views/student/studentView.html | 48 +++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index be634f03..efd50b27 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -582,11 +582,11 @@ - - - - {{mark.Sem_Year}} - + + + + {{mark.Sem_Year}} ({{mark.Sem}}) + @@ -601,6 +601,27 @@ + + + + + {{mark.Sem_Year}} + + + + {{mark.ListName}}   ON   {{mark.CDate}} + + + {{mark.Comments}} + + + + + + + + + {{study.ListName}}   ON   {{study.SDate}} + + + {{study.Comments}} + + + + + {{study.Sem_Year}} From e1d6cc2268799fbe3f3a5a2f31ad601a7bf77d76 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 24 Feb 2018 12:27:16 +0530 Subject: [PATCH 13/13] course details changes done --- Apollo/api/application/models/Studentview_model.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index aa0546a4..516ddcac 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -123,7 +123,7 @@ class Studentview_model extends CI_Model * */ public function getStudentFeesDetails($studentID=null,$courseID=null){ $this->db->distinct(); - $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year'); + $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year,CF.FeesType as CourseFeesType'); $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); $this->db->join(STUDENTS_FEES_PAID.' as SFP','SFP.FeesId = SFS.FeesID','left'); $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType'); @@ -141,6 +141,7 @@ class Studentview_model extends CI_Model $storePaidDetails['STFOrWR'] = $feeRow->STFOrWR; $storePaidDetails['Waiver'] = $feeRow->Waiver; $storePaidDetails['Others'] = $feeRow->Others; + $storePaidDetails['CourseFeesType'] = $feeRow->CourseFeesType; $storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver; $this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount'); @@ -242,7 +243,7 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentMaterialDetails($studentID=null,$courseID=null){ - $this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,CF.Sem_Year,PLD.ListName'); + $this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,SMS.Sem,CF.Sem_Year,CF.FeesType,PLD.ListName'); $this->db->from(STUDY_MATERIAL_STATUS.' as SMS'); $this->db->join(COURSE_FEES.' as CF','CF.ID = SMS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); @@ -289,7 +290,7 @@ class Studentview_model extends CI_Model * */ public function getMarkcardDetails($studentID=null,$courseID=null){ - $this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName'); + $this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,CF.FeesType,CS.Sem,PLD.ListName'); $this->db->from(CERTIFICATION_STATUS.' as CS'); $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');