Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php

@@ -44,12 +44,19 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
 
     public function receiveEnrolmentFromUniv_post()
     {
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
         $enrolmentDetails = $this->post('details');
         $localDetails = $this->post('localDetails');
-        $updatedDetails = $this->receive_model->updateEnrolmentDetails($enrolmentDetails,$localDetails);// Check if the users data store contains users (in case the database result returns NULL)
+        $fromDetails['CreatedOn'] = $now->format('Y-m-d H:i:s');
+        $fromDetails['CreatedBy'] =  $localDetails['localUserID'];
+        $fromDetails['UniversityCode']=$this->post('universityID');
+        $fromDetails['UniversityName']=$this->post('universityName');
+        $fromDetails['BranchCode']=$localDetails['localBranchID'];
+        $updatedDetails = $this->receive_model->updateEnrolmentDetails($enrolmentDetails,$fromDetails);// Check if the users data store contains users (in case the database result returns NULL)
         if ($updatedDetails['status'])
         {
-            $updatedDetails['status'] = REST_Controller::HTTP_OK;
+            $updatedDetails['status'] = true;
             // Set the response and exit
             $this->response($updatedDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }

Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php

@@ -118,12 +118,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                   else{
                       $insert['Category'] = "";
                   }
+
                 if(array_key_exists('Course_Code',$checkRow)) {
                     $insert['CourseCode'] = $checkRow['Course_Code'];
                 }
                 else{
                     $insert['CourseCode'] = "";
                 }
+
                 if(array_key_exists('Course_Name',$checkRow)) {
                     $insert['CourseName'] = $checkRow['Course_Name'];
                 }
@@ -219,6 +221,12 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                   else{
                       $insert['ApprovedDate'] = "";
                   }
+                $insert['UniversityCode'] = $local['UniversityCode'];
+                $insert['UniversityName'] = $local['UniversityName'];
+                $insert['BranchCode'] = $local['BranchCode'];
+                $insert['CreatedBy'] = $local['CreatedBy'];
+                $insert['CreatedOn'] = $local['CreatedOn'];
+
                 $get_data[count($get_data)]=array(
                     'FormID' => $insert['FormID'],
                     'EnrolmentNo' => $insert['EnrolmentNo'],
@@ -236,6 +244,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                     'PresentAddress' => $insert['PresentAddress'],
                     'AadharNumber' => $insert['AadharNumber'],
                     'Category' => $insert['Category'],
+                    'UniversityCode'=>$insert['UniversityCode'],
+                    'UniversityName'=>$insert['UniversityName'],
                     'CourseCode' => $insert['CourseCode'],
                     'CourseName' => $insert['CourseName'],
                     'Specialization' => $insert['Specialization'],
@@ -253,6 +263,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                     'CreatedDate' => $insert['CreatedDate'],
                     'ApprovedByName' => $insert['ApprovedByName'],
                     'ApprovedDate' => $insert['ApprovedDate'],
+                    'BranchCode' => $insert['BranchCode'],
+                    'CreatedBy' => $insert['CreatedBy'],
+                    'CreatedOn' => $insert['CreatedOn'],
 
                 );
             }
@@ -736,25 +749,34 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 //             }
 //         }
         
-        return 'true';
+        $results['stuFeeList'] = true;
+        $results['stuFeeList_details'] = "details updated successfully.";
+        return $results;
     }
 
- public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){
+    public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){
-// echo $univID, $courseID;exit();
+    // echo $univID, $courseID;exit();
 
-        // $this->db->select('t1.*,t2.EnrolmentNo');
+            $this->db->select('t1.*,t2.EnrolmentNo,t2.CourseName, t4.*,t5.UniversityID, t5.UniversityName');
-        // $this->db->from('T_FormId_FeeDetails_Received_From_University as t1');
+            $this->db->from('T_FormId_FeeDetails_Received_From_University as t1');
-        // $this->db->join('T_Enrolment_Received_From_University as t2', 't2.FormID = t1.FormID', 'LEFT');
+            $this->db->join('T_Enrolment_Received_From_University as t2', 't2.FormID = t1.FormID');
-        // $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo', 'LEFT');
+            $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo');
-        // $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID', 'LEFT');
+            $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID');
-        // // $this->db->where('t2.CourseCode', $courseID);
+            $this->db->join('T_UniversityMaster as t5', 't5.UniversityID = t3.UniversityID');
-        // // $this->db->where('t2.UniversityCode', $univCode);
+            // $this->db->where('t2.CourseCode', $courseID);
-        // $details = $this->db->get();
+            // $this->db->where('t2.UniversityCode', $univCode);
-        // $detailsList = $details->result();
+            $details = $this->db->get();
-        // print_r($detailsList);exit();
+            $detailsList = $details->result();
-
-        // return "$roleDetails->Sem_Year $roleDetails->CourseName";
-
- }
 
+            if($detailsList){
+                $resultArr['studentFeeCompareDetails'] = $detailsList;
+                $resultArr['formTypeStatus'] = true;
+                $resultArr['message'] = "Successfully data generated";
+            } else {
+                $resultArr['studentFeeCompareDetails'] = [];
+                $resultArr['formTypeStatus'] = false;
+                $resultArr['message'] = "No record found";
+            }
+        return $resultArr;
+    }
 }

Apollo/assets/js/controllers/student_university_fee_compare.js

@@ -130,10 +130,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                 }
             };
             $http(empListreq).then(function (response) {
-                if (response.data.studentList) {
+                if (response.data.formTypeStatus) {
                     $scope.Searchloader = false;
                     $scope.studentData = true;
-                    $scope.data = response.data.student_details;
+                    $scope.data = response.data.studentFeeCompareDetails;
                     $scope.studentListLength = $scope.data.length;
                 } else {
                     $scope.Searchloader = false;
@@ -203,7 +203,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
     }
 
     $scope.receiveEnrolmentDetails = function (details,uploadForDetails) {
-
         var updateUniversityEnrolment = {
             method: 'POST',
             url: apiPoint.url + 'receiveEnrolmentFromUniv/',
@@ -213,15 +212,16 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
             data: {
                 localDetails: localDetail,
                 details: details,
-                universityID: uploadForDetails.UniversityID,
+                universityID: angular.fromJson(uploadForDetails.university).UniversityID,
-                universityName: uploadForDetails.UniversityName,
+                universityName: angular.fromJson(uploadForDetails.university).UniversityName,
 
             }
         };
 
         $http(updateUniversityEnrolment).then(function (response) {
-            if (response.data.branchListStatus == true) {
+            if (response.data.status == true) {
                 swal("", "Updated Successfully", "success");
+                $state.go($state.current, {}, {reload: true});
             } else {
                 swal("", "Failed", "error");
             }

Apollo/assets/js/directives/convert_Json/convertJson.js

@@ -38,7 +38,7 @@ app.directive('jsXls', function () {
                         }
 
                         // Clear input file
-                        element.val('');
+                        // element.val('');
                     };
 
                     //extend FileReader

Apollo/assets/views/student/studentUnivFeeCompareDetails.html

@@ -92,6 +92,49 @@
 
                         </form>
                     </div>
+                    <div>
+                        <!--{{data | json}}-->
+
+                            <div class="table-responsive">
+                                <table class="table table-hover">
+                                    <thead>
+                                        <tr>
+                                            <th> FormID
+                                            </th>
+                                            <th> Student Name
+                                            </th>
+                                            <th> Father Name
+                                           </th>
+                                            <th> University
+                                            </th>
+                                            <th> Course
+                                           </th>
+                                            <th> Enrolment ID
+                                           </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                        <tr>
+                                            <td>
+                                                    {{p.FormID}}
+                                            </td>
+                                            <td>
+                                                <a tooltip="View Student" ng-click="open(p);" class="text-dark">
+                                                    {{p.Firstname}} {{p.Lastname}}
+                                                </a>
+                                            </td>
+                                            <td>{{p.Fathername}}</td>
+                                            <td>{{p.UniversityName}}</td>
+                                            <td>{{p.CourseName}}</td>
+                                            <td>{{p.EnrolmentNo}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>
+
+                            </div>
+                    </div>
                 </tab>
                 <tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Files" id="uploadFiles">
                     <div class="container-fluid">