From 56a4b89abdbdba18d96fc9b23d18a0459310e632 Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Tue, 1 Dec 2020 15:03:10 +0530 Subject: [PATCH] screen changes : ps --- Apollo/api/application/config/routes.php | 3 +- .../controllers/Fees_Status_Controller.php | 1 + .../controllers/StudentView_Controller.php | 25 ++++++++++++++++ .../application/models/Fees_status_model.php | 21 ++++++------- .../api/application/models/Student_model.php | 2 ++ .../application/models/Studentview_model.php | 16 ++++++++++ Apollo/api/system/libraries/Upload.php | 2 +- .../controllers/Fees_Status_Controller.php | 3 -- Apollo/assets/js/controllers/studentCtrl.js | 30 ++++++++++++++++++- .../views/status-update/fees_status.html | 13 ++++++++ .../views/student/studentDetailsModal.html | 11 ++++++- 11 files changed, 109 insertions(+), 18 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 90459ca4..26c0a48a 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -297,8 +297,7 @@ $route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusD /*get student view details*/ $route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo'; - - +$route['updateStudentCommentDetails']= 'StudentView_Controller/updateStudentCommentDetails'; /*get certificate Details*/ diff --git a/Apollo/api/application/controllers/Fees_Status_Controller.php b/Apollo/api/application/controllers/Fees_Status_Controller.php index 0e2fb5c4..238a8394 100755 --- a/Apollo/api/application/controllers/Fees_Status_Controller.php +++ b/Apollo/api/application/controllers/Fees_Status_Controller.php @@ -62,6 +62,7 @@ class Fees_Status_Controller extends REST_Controller { $search['CourseID'] = $this->post('course'); $search['requestedDept'] = $this->post('requestedDept'); $search['requestedBranch'] = $this->post('branchId'); + $search['BatchCode'] = $this->post('batch'); $getStudentDetails = $this->Fees_model->getStudentList($search); if ($getStudentDetails) { diff --git a/Apollo/api/application/controllers/StudentView_Controller.php b/Apollo/api/application/controllers/StudentView_Controller.php index cf8d5f89..21c6ee1e 100755 --- a/Apollo/api/application/controllers/StudentView_Controller.php +++ b/Apollo/api/application/controllers/StudentView_Controller.php @@ -32,6 +32,7 @@ class StudentView_Controller extends REST_Controller // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php $this->methods['getStudentInfo_post']['limit'] = 500; + $this->methods['updateStudentCommentDetails_post']['limit'] = 500; // load the employee model $this->load->model('Studentview_model', 'studentview_model'); @@ -61,5 +62,29 @@ class StudentView_Controller extends REST_Controller ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } + } + public function updateStudentCommentDetails_post(){ + + + $id = $this->post('studentID'); + $comment = $this->post('comments'); + print_r($id); + print_r($comment); + die(); + $studentListDetails = 1; + + if ($studentListDetails) { + // $studentListDetails['status'] = REST_Controller::HTTP_OK; + // // Set the response and exit + $this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } else { + // Set the response and exit + $this->response([ + 'message' => 'No users were found', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + } } diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 4e39b8b1..dd48f3fd 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -18,7 +18,7 @@ class Fees_status_model extends CI_Model { if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!='' OR $search['BatchCode']!=''){ - $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,BA.BatchCode,BA.BatchName'); + $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,BA.BatchCode,BA.BatchName,STC.IsActive as CourseActive, STC.Status as CourseStatus,ST.DeactiveComments,ST.IsActive'); $this->db->from(STUDENTS.' as ST'); $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); @@ -59,7 +59,7 @@ class Fees_status_model extends CI_Model $this->db->where('ST.Firstname',$search['Firstname']); }*/ $searchDetails = $this->db->get(); - +// print_r($this->db->last_query());die(); if($searchDetails->result()) { $result_array['studentStatus'] = true; $result_array['details'] = $searchDetails->result(); @@ -1188,10 +1188,10 @@ class Fees_status_model extends CI_Model * */ public function setFees($details=null,$jsonData=null){ - //echo 'in'; - // print_r($details); - //print_r($jsonData); - //die(); + echo 'i am Here'; + print_r($details); + print_r($jsonData); + die(); $RollNo= $details['RollNo']; @@ -1340,10 +1340,11 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe $listcode=''; - foreach($getId as $ge) - { - $listcode=$ge->ListCode; - } + // Expected Remove because mentioned ON Apollo XL sheet(30.11.2020) + // foreach($getId as $ge) + // { + // $listcode=$ge->ListCode; + // } $appstatus['StudentID'] = $details['StudentID']; $appstatus['CourseID'] = $details['CourseID']; diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index c20cfa67..1869606c 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -73,6 +73,8 @@ class Student_model extends CI_Model { // } $sql.=" group by LTF.TrackingID"; + // print_r($sql); + // die(); $b=$this->db->query($sql); $trackingDetails = $b->result(); $result =$trackingDetails; diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 87eb9f82..2774a852 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -75,6 +75,7 @@ class Studentview_model extends CI_Model $this->db->where('ST.MobileNumber', $requestedBy); $this->db->where('STC.BranchID', $requestedBranch); $studentDetails = $this->db->get()->first_row(); + // print_r($this->db->last_query());die(); if($studentDetails){ $result['studentStatus'] = true; $result['studentDetails'] = $studentDetails; @@ -692,4 +693,19 @@ class Studentview_model extends CI_Model } + public function updateStudentComment(){ + return 1; + // $array = (''=>); + // $this->db->where('ID', $Arr['ID']); + // $this->db->update(STUDENTS, $array); + // if ($this->db->affected_rows() == '1') { + // $result['updateUniversityStatus'] = true; + // $result['message'] = "Successfully University details Updated"; + // } else { + // $result['updateUniversityStatus'] = false; + // $result['message'] = "University details not Updated"; + // } + // return $result; + } + } \ No newline at end of file diff --git a/Apollo/api/system/libraries/Upload.php b/Apollo/api/system/libraries/Upload.php index 23fd02ea..730235d9 100755 --- a/Apollo/api/system/libraries/Upload.php +++ b/Apollo/api/system/libraries/Upload.php @@ -1104,7 +1104,7 @@ class CI_Upload { } $memory_limit = (int) ceil(filesize($file) + $memory_limit[0]); - ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net + ini_set('memory_limit', '512M'); // ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net } // If the file being uploaded is an image, then we should have no problem with XSS attacks (in theory), but diff --git a/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php b/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php index 58688ad8..79febb66 100644 --- a/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php +++ b/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php @@ -55,7 +55,6 @@ class Fees_Status_Controller extends REST_Controller { * */ public function getStudentList_post() { - echo "i am here";die(); $search['requestedBy'] = $this->post('requestedtBy'); $search['Firstname'] = $this->post('studentName'); $search['MobileNumber'] = $this->post('mobileNumber'); @@ -79,8 +78,6 @@ class Fees_Status_Controller extends REST_Controller { 'status' => REST_Controller::HTTP_NOT_FOUND ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } - - } /* diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index eeb28870..f2768dcc 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -3885,6 +3885,35 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }); }; + $scope.updateComments = function (form,details,loading) { + + var update = { + method: 'POST', + url: apiPoint.url + 'updateStudentCommentDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + studentID: details, + comments: details, + } + }; + $http(update).then(function (response) { + console.log(response); + // if (response.data.status==200 && response.data.followupStatus) { + // $rootScope.loadFollowupDetails(response.data.trackingID); + // $scope.ldloading2[loading.replace('-', '_')] = false; + // $rootScope.myModel1.comments=''; + + // } else { + // $scope.ldloading[loading.replace('-', '_')] = false; + // swal("Failed!", response.data.message, "error"); + // } + }); + + + }; + $scope.printStudentDetails = function (details) { $rootScope.pdfItems = details; @@ -3901,7 +3930,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }); } - }]); // Please note that $modalInstance represents a modal window (instance) dependency. diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index cfbede76..5b7bbf12 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -116,6 +116,9 @@ Course + Student Status + Course Status + Comment Action @@ -129,6 +132,16 @@ {{user.MobileNumber}} {{user.UniversityName}} {{user.CourseName}} + ACTIVE + DEACTIVE + + + ACTIVE + DEACTIVE + + +
{{user.Comments && user.CourseStatus ? user.Comments +' / '+ user.CourseStatus : (user.Comments ? user.Comments : (user.CourseStatus ? user.CourseStatus : ''))}}
+ diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 2be174e7..d38025e4 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -155,7 +155,10 @@ Designation {{items.studentDetails.Designation}} - + + Company Name + {{items.studentDetails.Companyname}} + @@ -190,6 +193,12 @@ Refered Person No {{items.studentDetails.ReferersMobileNumber}} + + Comments + + {{items.studentDetails.Comments}} + +