diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index 0d3d8d62..9117a288 100755 --- a/Apollo/api/application/config/constants.php +++ b/Apollo/api/application/config/constants.php @@ -161,6 +161,8 @@ defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS',' defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details'); defined('ENROLMENTRECEIVEDFROMUNIV') OR define('ENROLMENTRECEIVEDFROMUNIV','T_Enrolment_Received_From_University'); defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_FormId_FeeDetails_Received_From_University'); +defined('UNIVERSITYCREDITDEBIY') OR define('UNIVERSITYCREDITDEBIY','T_University_Credit_Debit'); +defined('UNIVERSITYPAYMENT') OR define('UNIVERSITYPAYMENT','T_University_Payment'); // define APPLICATION certificate type constant diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index c9edcbd4..2f952bc8 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -215,7 +215,7 @@ $route['setgrpstatus'] = 'Broadcast_Controller/setgrpstatus'; $route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentcoursedetail'; $route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail'; -$route['updateCourseDetails'] = 'DataCorrection_Controller/updateCourseDetails'; +$route['updateCourseDetailss'] = 'DataCorrection_Controller/updateCourseDetailss'; /* @@ -369,4 +369,7 @@ $route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Control $route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails'; $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getForFormIdDraftDetails'; $route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails'; -$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList'; \ No newline at end of file +$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList'; +$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails'; +$route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails'; + diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 412ed4d0..0e64a295 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -148,10 +148,14 @@ class Call_Tracking_Controller extends REST_Controller { $search['requestedDept'] = $this->post('requestedDept'); // $search['branchID'] = $this->post('branchId'); $search['searchDate'] = $this->post('searchDate'); + // print_r( $search['searchDate']); $search['CreatedBranch'] = $this->post('branchId'); + + $status=$this->post('status'); + // $search['searchMobileNumber'] = $this->post('searchMobileNumber'); // $search['searchName']= $this->post('searchName'); - $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search); + $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search,$status); if ($getTrackedDetails) { diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php index e596b8f2..cf191812 100644 --- a/Apollo/api/application/controllers/DataCorrection_Controller.php +++ b/Apollo/api/application/controllers/DataCorrection_Controller.php @@ -140,7 +140,7 @@ class DataCorrection_Controller extends REST_Controller { } - public function updateCourseDetails_post() + public function updateCourseDetailss_post() { $search['University'] = $this->post('universityid'); $search['courseId'] = $this->post('courseId'); diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 511d6dda..4c8b7d13 100755 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -212,7 +212,7 @@ class HallTickets_Controller extends REST_Controller { $this->response([ 'message' => 'No records found!', - 'status' => REST_Controller::HTTP_NOT_FOUND + 'status' => REST_Controller::HTTP_NOT_FOUND ], REST_Controller::HTTP_NOT_FOUND); } @@ -316,7 +316,7 @@ class HallTickets_Controller extends REST_Controller { $Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata')); $CreatedOn = $Cdate->format('Y-m-d H:i:s'); /////////check semcoursemapping//// - $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId); + // $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId); $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId); // print_r( $data['subjectDetails']); if($data['subjectDetails'] == 1 ) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index ecdd2e3a..dda9badb 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -318,5 +318,24 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + public function editDraftFormIdFeesDetails_post(){ + $reqBranch = $this->post('localDetails'); + $details = $this->post('details'); + $detailsID = $this->post('detailsID'); + + $details = $this->post('details'); + $editDraftFormIdFeesDetails = $this->receive_model->editDraftFormIdFeesDetails($reqBranch, $details, $detailsID); // Check if the employee exist + if ($editDraftFormIdFeesDetails) { + $editDraftFormIdFeesDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($editDraftFormIdFeesDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } else { + // Set the response and exit + $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + } \ No newline at end of file diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index f71ad381..26432801 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -352,8 +352,9 @@ class Calltracking_model extends CI_Model { * created by kms * */ - public function getTrackingDetails($search=null) + public function getTrackingDetails($search=null,$status) { + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); @@ -437,7 +438,16 @@ class Calltracking_model extends CI_Model { } } + if($status!=true) + { $result_array['pendingTrackingDetails'] = $this->getPrevPendingTrackingDetails($search); + // print_r( $result_array['pendingTrackingDetails']); + } + else + { + $result_array['pendingTrackingDetails']=1; + } + return $result_array; diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index 827920e5..118c4a71 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -443,9 +443,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { if(count($queryDetails->result()) == 0){ $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University - (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus) + (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) VALUES - ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0)"; + ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0, 0)"; $queryDetails = $this->db->query($query); } else { echo 'else con'; @@ -967,9 +967,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { if(count($queryDetails->result()) == 0){ $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University - (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus) + (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) VALUES - ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1)"; + ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1, 1)"; $queryDetails = $this->db->query($query); if($queryDetails){ @@ -990,11 +990,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // print_r($details);exit(); foreach($detail as $row) { - // echo $row['ID'];exit(); - $data[] = array( - 'ID' => $row['ID'], - 'FormType'=> 'Hello' - ); + $ids = $row['ID']; + $updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `DraftStatus` = 0 WHERE `ID` = '.$ids; + $queryDetails = $this->db->query($updateQuery); } // $data = array( @@ -1008,16 +1006,81 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // ) // ); // print_r($data);exit(); - $this->db->update_batch('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); + // $this->db->update('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); - $detailsList = $details->result(); - if($detailsList){ - $result['draftStatus'] = true; - $result['draftDetailsMessagae'] = "Updated Successfully."; - } else { - $result['draftStatus'] = false; - $result['draftDetailsMessagae'] = "Something went wrong."; - } + // $detailsList = $details->result(); + $result['draftStatus'] = true; + $result['draftDetailsMessagae'] = "Updated Successfully."; + return $result; + } + + public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){ + $ids = $detailsID; + $formIds = $details['FormID']; + $formType = $details['FormType']; + $CentreCode = $details['CentreCode']; + $Session = $details['Session']; + $Year = $details['Year']; + $Semester = $details['Semester']; + $Student_Name = $details['Student_Name']; + $Father_Name = $details['Father_Name']; + $CourseCode = $details['CourseCode']; + $ActualCourseFee = $details['ActualCourseFee']; + $CourseFee = $details['CourseFee']; + $ExamFee = $details['ExamFee']; + $EnrollmentFee = $details['EnrollmentFee']; + $ProspectusFee = $details['ProspectusFee']; + $ReRegFee = $details['ReRegFee']; + $CreditTransferFee = $details['CreditTransferFee']; + $LateralEntryFee = $details['LateralEntryFee']; + $DualSpclFee = $details['DualSpclFee']; + $OtherFee = $details['OtherFee']; + $NRIFEE = $details['NRIFEE']; + $ProvisionalFee = $details['ProvisionalFee']; + $MigrationFee = $details['MigrationFee']; + $UrgentResultDMCFee = $details['UrgentResultDMCFee']; + $AdditionalFee = $details['AdditionalFee']; + $Amount = $details['Amount']; + + $data = array( + 'FormID' => $formIds , + 'FormType' => $formType , + 'CentreCode'=> $CentreCode, + 'Session' =>$Session, + 'Year' =>$Year, + 'Semester' =>$Semester, + 'Student_Name' =>$Student_Name , + 'Father_Name' =>$Father_Name, + 'CourseCode' =>$CourseCode, + 'ActualCourseFee' =>$ActualCourseFee, + 'CourseFee' =>$CourseFee, + 'ExamFee' =>$ExamFee, + 'EnrollmentFee' =>$EnrollmentFee, + 'ProspectusFee' =>$ProspectusFee, + 'ReRegFee'=>$ReRegFee, + 'CreditTransferFee' =>$CreditTransferFee, + 'LateralEntryFee' =>$LateralEntryFee, + 'DualSpclFee' =>$DualSpclFee, + 'OtherFee' =>$OtherFee, + 'NRIFEE' =>$NRIFEE , + 'ProvisionalFee' =>$ProvisionalFee, + 'MigrationFee' =>$MigrationFee, + 'UrgentResultDMCFee' =>$UrgentResultDMCFee, + 'AdditionalFee' =>$AdditionalFee, + 'Amount' => $Amount + ); + + $this->db->where('ID', $detailsID); + $this->db->update('T_FormId_FeeDetails_Received_From_University', $data); + // echo $this->db->affected_rows();exit(); + if($this->db->affected_rows() > 0){ +$result['updatedraftStatus'] = true; + $result['updatedraftDetailsMessagae'] = "Updated Successfully."; + }else{ +$result['updatedraftStatus'] = false; + $result['updatedraftDetailsMessagae'] = "Something went wrong."; + } + return $result; } } \ No newline at end of file diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index cb79bda7..de5b6bfd 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -354,6 +354,7 @@ class Student_model extends CI_Model { $this->db->join('' . STUDENTS_FEES_PAID . ' as t6', 't6.FeesId = t5.FeesID', 'LEFT'); $this->db->where('t1.BranchID', $req['localBranchID']); $this->db->where('t1.StudentID', $studentId); + $this->db->where('t1.IsActive', '1'); $this->db->group_by('t1.CourseID'); $courseDetails = $this->db->get(); $checkArr = $courseDetails->result(); diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index fdad1233..c51c3fe4 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -60,6 +60,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.checkDate = function (value,type) { + // console.log(value.searchDate); if(value.searchDate==null || value.searchDate==undefined){ $scope.myModel.search=''; @@ -68,33 +69,38 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", } else{ if(type=='2'){ - + $scope.myModel.search = $filter('date')(value.searchDate, 'yyyy-MM-dd'); $scope.toMinDate = $filter('date')(value.searchDate, 'MM-dd-yyyy'); } } - $scope.searchDateArray(value); + $scope.searchDateArray(value,type); } /* * check to date * */ - $scope.checkToDate = function (value) { - + $scope.status=''; + $scope.checkToDate = function (value,status) { + $scope.status=status; if(value.searchDate==null || value.searchDate==undefined){ swal("Failed!", 'Please Select From Date', "error"); $scope.myModel.dateTo=''; $scope.myModel.search=''; $scope.toMinDate = ''; } - else{ - $scope.filterSearch=$filter('date')(value.searchDate, 'dd-MM-yyyy'); - $scope.search=$scope.filterSearch; + else{ + if(value.searchDate!=null && value.dateTo!=null && status=='true') + { + + $scope.filterSearch=$filter('date')(value.searchDate,value.dateTo); + $scope.search=$scope.filterSearch; + } } - $scope.searchDateArray(value); + $scope.searchDateArray(value,status); } @@ -102,8 +108,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", /* * make a search date array */ - $scope.searchDateArray=function (dateValue) { - + $scope.searchDateArray=function (dateValue,status) { + var listDate = []; if((dateValue.search !=null && dateValue.search !=undefined) && (dateValue.dateTo !=null && dateValue.dateTo !=undefined && dateValue.dateTo !='')){ var startDate =dateValue.search; @@ -117,6 +123,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", var strDate = startDate; var arrayDate = $filter('date')(strDate, 'dd-MM-yyyy'); listDate.push(arrayDate); + } else{ while (strDate < endDate){ @@ -404,19 +411,19 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * */ $scope.init = function (myModel) { - + // console.log(myModel); var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) { - console.log("if"); + }else { if(logcheck != null && LOCALTYPE !='R001') { - console.log("else if"); + $state.go('app.dashboard'); } else { - console.log("else else"); + //ipCookie.remove('cookiechk'); window.localStorage.clear(); $state.go('login.signin'); @@ -432,6 +439,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.data = []; if(myModel!='' && myModel!=undefined){ $scope.finalSearchArry=myModel; + + + } else{ $scope.finalSearchArry=""; @@ -449,7 +459,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, - searchDate: $scope.finalSearchArry + searchDate: $scope.finalSearchArry, + status: $scope.status } }; $http(getTrackDetails).then(function (response) { @@ -521,7 +532,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", }); localStorage.setItem('trackingList', JSON.stringify($scope.data)); } - + else if(response.data.trackingStatus == 1) + { + console.log('hai'); + } + else { $scope.loader = false; @@ -651,8 +666,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte //from date change $scope.checkDate = function (value) { - - + $scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd'); @@ -687,14 +701,14 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte const LOCALTYPE = logcheck.localType; if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) { - console.log("if"); + // console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { - console.log("else if"); + // console.log("else if"); $state.go('app.dashboard'); } else { - console.log("else else"); + // console.log("else else"); //ipCookie.remove('cookiechk'); window.localStorage.clear(); $state.go('login.signin'); diff --git a/Apollo/assets/js/controllers/entrycorrectionCtrl.js b/Apollo/assets/js/controllers/entrycorrectionCtrl.js index 828f44a0..5188cdec 100644 --- a/Apollo/assets/js/controllers/entrycorrectionCtrl.js +++ b/Apollo/assets/js/controllers/entrycorrectionCtrl.js @@ -229,7 +229,7 @@ $scope.universitySearchData = ''; var updatecourse = { method: 'POST', - url: apiPoint.url + 'updateCourseDetails/', + url: apiPoint.url + 'updateCourseDetailss/', headers: { 'Content-Type': 'application/json' }, @@ -249,6 +249,7 @@ $scope.universitySearchData = ''; $http(updatecourse).then(function (response) { swal('Change Saved Successfully', response.data.message, "success"); $scope.close(); + $scope.getStudentDetails(form,myModel); }); diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index c0fd1d9b..e84cd727 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -374,7 +374,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { } - }; + }; $http(updateUniversityEnrolment).then(function (response) { console.log(response); diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index dd1faef7..ccfb701a 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -70,7 +70,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.getUniversitySearchList = function () { var empListreq = { method: 'POST', - url: apiPoint.url + 'getUniversitySessionDetails/', + url: apiPoint.url + 'getUnivCourseFromFileDetails/', headers: { 'Content-Type': 'application/json' }, @@ -90,36 +90,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.searchData = { "University": "", - "Session": "", + "Course": "", "Status": "" } $scope.myUnivSearch = ""; - $scope.sessionData = ""; + $scope.courseData = ""; + $scope.getUniveId = function (univ) { $scope.sessionData = ""; if (univ === '') { $scope.myUnivSearch = ""; + $scope.courseData = ""; $scope.searchData.University = ''; - // $scope.searchData.Course = ''; - // $scope.searchData.Batch = ''; - // $scope.courseData = name.Course; - // $scope.batchData = name.Batch; - $scope.searchData.Session = ''; - - $scope.OpenWindowStatus = false; + $scope.searchData.Course = ''; } else { let name = JSON.parse(univ); - $scope.searchData.University = name.UniversityID; - // $scope.searchData.Course = ''; - // $scope.searchData.Batch = ''; - // $scope.courseData = name.Course; - // $scope.batchData = name.Batch; - $scope.searchData.Session = ''; - $scope.sessionData = name.SessionDetails; - $scope.OpenWindowStatus = false; + $scope.searchData.University = name.univCode; + $scope.courseData = name.univCourseDetails; } - }; + //For session dropdown $scope.filterSessionDetails = ""; $scope.$watch('searchData.University', function (newValue, oldValue) { @@ -140,7 +130,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.onSubmit = function () { $scope.Searchloader = true; - if ($scope.searchData.University !== '' && $scope.searchData.Session !== '') { + if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') { $scope.Searchloader = true; var empListreq = { method: 'POST', @@ -482,19 +472,51 @@ $scope.draftManualEntryDetails = { }; $http(draftMoveToList).then(function (response) { if (response.data.draftStatus == true) { - // swal("", response.data.draftDetailsMessagae, "success"); - // getDraftFormIdDetails(); - // getEmptycall(); + // alert(); + swal("", response.data.draftDetailsMessagae, "success"); + getDraftFormIdDetails(); } else { - // swal("", response.data.draftDetailsMessagae, "warning"); - // getDraftFormIdDetails(); - // getEmptycall(); - } - }); + swal("", response.data.draftDetailsMessagae, "warning"); + + }}); } else { swal("Cancelled", "Your record not added to list :)", "error"); } }); } + $scope.editId = -1; + $scope.leader = {}; + $scope.editList = function(details, d){ + $scope.leader = {}; + angular.copy(d, $scope.leader); + $scope.editId = details; + } + + $scope.updateFeeIDDetails = function(id, p){ + var editDraftMoveToList = { + method: 'POST', + url: apiPoint.url + 'editDraftFormIdFeesDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details : p, + detailsID: id + } + }; + $http(editDraftMoveToList).then(function (response) { + if (response.data.updatedraftStatus == true) { + // alert(); + swal("", response.data.updatedraftDetailsMessagae, "success"); + getDraftFormIdDetails(); + $scope.editId = -1; + $scope.leader = {}; + } else { + swal("", response.data.updatedraftDetailsMessagae, "warning"); + + }}); + } + }]); diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index a0e539a5..1cc54713 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -92,7 +92,7 @@ diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 95d799f6..83c52768 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -221,16 +221,16 @@ University Form Enrolment - - +