From 8eaaf839ab1924b5ba5b528326f527a82b7f1e9d Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Sat, 9 Jan 2021 21:38:21 +0530 Subject: [PATCH] fixes: ps --- .../application/models/Fees_status_model.php | 40 ++++--- .../application/models/Studentview_model.php | 9 +- .../js/controllers/answerBookletStatusCtrl.js | 24 ++++ .../views/student/studentDetailsModal.html | 104 ++++-------------- .../views/student/studentPaymentModal.html | 7 +- 5 files changed, 84 insertions(+), 100 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 12f6a957..61001a2d 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1249,22 +1249,34 @@ class Fees_status_model extends CI_Model $this->db->where('FeesType', $details['FeesType']); $checkExist=$this->db->get(STUDENTS_FEES_STATUS); - $this->db->select('SFS.FeesType,CF.Sem_Year,CF.ProgramType'); - $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); - $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType'); - $this->db->where('SFS.CourseID',$details['CourseID']); - $this->db->where('SFS.StudentID',$details['StudentID']); - $result = $this->db->get()->result_array(); + // $this->db->select('SFS.FeesType,CF.Sem_Year,CF.ProgramType'); + // $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + // $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType'); + // $this->db->where('SFS.CourseID',$details['CourseID']); + // $this->db->where('SFS.StudentID',$details['StudentID']); + // $result = $this->db->get()->result_array(); + + $this->db->select('ID')->from(COURSE_FEES)->where('CourseID',$details['CourseID']); + $result2 = $this->db->get()->first_row(); + $CF_FeeID = $result2->ID; + $check = 0;// id has value means Sem1 Already Exist so NewReg Set t0 0 no value in ID(which means Empty) newreg value 1; - // echo count($result); - for($j=0;$jgetStudentMaterialDetails($studentId,$row->CourseID); // get application details if($requestFrom!='2'){ - //$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID); - + // $fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID); $fetchData['applicationDetails']=$this->getStudentLatestAppStatus($studentId,$row->CourseID); $fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID); @@ -564,7 +563,7 @@ class Studentview_model extends CI_Model $this->db->where('CM.CertificateName', APPLICATION_CONST); $this->db->order_by('AS.ID', 'DESC'); $getCertDetails = $this->db->get(); - + print_r($this->db->last_query());die(); if($getCertDetails->result()){ return $getCertDetails->result(); } @@ -613,6 +612,7 @@ class Studentview_model extends CI_Model $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode'); $this->db->where('CU.CourseID', $courseID); $this->db->where('ABT.StudentID', $studentID); + // $this->db->group_by('ABT.ID'); $this->db->order_by('ABT.ID', 'DESC'); $getBookletDetails = $this->db->get(); @@ -678,7 +678,8 @@ class Studentview_model extends CI_Model - $subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)'; + $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)'; + $subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?'; $query = $this->db->query($subquery,array($studentid,$courseid)); diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index e8065e90..4963ba58 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -625,6 +625,30 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" $log.info('Modal dismissed at: ' + new Date()); }); }; + $scope.open2 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; $scope.printStudentDetails = function (details) { $rootScope.pdfItems = details; diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index f483b04c..d6a7eb06 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -291,7 +291,8 @@ {{fees.FeesName}} - {{fees.BatchName}} + {{fees.BatchName}} + {{fees.BatchName}} {{fees.SessionName}}/{{fees.ToSessionName}} {{fees.SessionName}} {{fees.RollNo}} @@ -417,7 +418,7 @@ - + {{booklet.AnsDate}} @@ -467,7 +468,7 @@ - + + + - - - - - - - - - + + + + + + + - - + - - - - - - - - - - - + + + + + + + -
DateSem/YearStatusComments
DateSem/YearStatusComments
- {{mark.CDate}} - - {{mark.Sem_Year}} ({{mark.Sem}}) - - {{mark.ListName}} - - {{mark.Comments}} -
{{mark.CDate}}{{mark.Sem_Year}} ({{mark.Sem}}){{mark.ListName}} {{mark.Comments}}
- - - - +
@@ -647,23 +605,7 @@
- -
-
- -
-
    -
  • -
    {{bh.UpdatedBy}}   Updated The Batch On   {{bh.UpdatedOn}}    {{bh.ExistValue}}    into    {{bh.NewValue}}
    -
    • -
-
- - -
diff --git a/Apollo/assets/views/student/studentPaymentModal.html b/Apollo/assets/views/student/studentPaymentModal.html index 01ff806d..447de2d4 100755 --- a/Apollo/assets/views/student/studentPaymentModal.html +++ b/Apollo/assets/views/student/studentPaymentModal.html @@ -48,7 +48,12 @@ - +
    +
  • +
    {{bh.UpdatedBy}}   Updated The Batch On   {{bh.UpdatedOn}}    {{bh.ExistValue}}    into    {{bh.NewValue}}
    +
    • +
+
Batch History Not Found