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');
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.
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"/>
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.
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.
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"/>
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"/>
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.
diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index 77f20498..fa050887 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -267,11 +267,10 @@
is-open="startOpen"
ng-init="startOpen = false"
name="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.
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.
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}} |
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}} |