From 735f6ff3a8635e9b753210194eb04c6a85b3c831 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 24 Jan 2019 16:19:48 +0530 Subject: [PATCH] batch add in excel 1614 --- .../api/application/controllers/HallTickets_Controller.php | 4 +++- Apollo/assets/js/controllers/schCtrl.js | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 99bf467f..512c022d 100644 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -347,6 +347,8 @@ class HallTickets_Controller extends REST_Controller { $filedetails = $this->post('details'); $requestedBy = $this->post('requestedBy'); $branchId = $this->post('branchId'); + $Sem_Year = $this->post('Sem_Year'); + $Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata')); $CreatedOn = $Cdate->format('Y-m-d H:i:s'); $fileArray = array(); @@ -375,7 +377,7 @@ class HallTickets_Controller extends REST_Controller { foreach($courseArray as $CourseDatialArray) { $course=$CourseDatialArray; - $schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn); + $schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn,'SEM_Year'=>$Sem_Year); $schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMasterFile($schedulemaster,$filedetails); } diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index 3d7be428..faa0599d 100644 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -421,6 +421,9 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { // $scope.scheduledDetails.push({ // "universityID":myModel.universityName.universityID, // }); + + // console.log(myModel); + // return false; var updateUniversityEnrolment = { method: 'POST', url: apiPoint.url + 'batchUploadDataDetails/', @@ -431,6 +434,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { details: FileDetails, universityDetails : $scope.universityDetails, courseDetails : $scope.courseDetailsArray, + Sem_Year : myModel.Sem_Year, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -439,7 +443,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { }; $http(updateUniversityEnrolment).then(function (response) { - console.log(response); + //console.log(response); if (response.data.status == 200) { swal("", "Saved Successfully", "success"); $state.go($state.current, {}, {reload: true});