new reg student view, roll no in new-re report

Apollo/api/application/models/Reports_model.php

@@ -552,7 +552,7 @@ LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.Student
 LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
 LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
 LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
-LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=sfpd.FeeID
+LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=RD.Student_Fee_Status_Id
 where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
 
  ";
@@ -627,7 +627,7 @@ where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS
         }
 
 
-       // print_r($this->db->last_query());die();
+       //print_r($this->db->last_query());die();
        
         return $results;
     

Apollo/assets/js/controllers/newreg_reportCtrl.js

@@ -243,6 +243,62 @@ $scope.tdate ='';
 
 
 
+    $scope.open = function (studentDetails) {
+
+
+
+        // get student view details
+        var getcourse = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentBasicInfo/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: studentDetails.StudentID,
+                requestedFrom: 1,
+                branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+            }
+        };
+        $http(getcourse).then(function (response) {
+
+            if (response.data.status == 200 && response.data.studentStatus == true) {
+                $scope.courseEditLoading = false;
+                // $scope.studentDetails = response.data.studentDetails;
+                $scope.studentDetails = response.data;
+                // $scope.courseDetails = response.data.courseDetails;
+                var modalInstance = $modal.open({
+                    templateUrl: 'assets/views/student/studentDetailsModal.html',
+                    controller: 'ModalInstanceCtrl',
+                    // size: size,
+                    resolve: {
+                        items: function () {
+                            return $scope.studentDetails;
+                        }
+                    }
+                });
+
+                modalInstance.result.then(function (selectedItem) {
+                    $scope.selected = selectedItem;
+                }, function () {
+                    $log.info('Modal dismissed at: ' + new Date());
+                });
+
+            } else {
+                swal("Failed!", "This student is not registerd", "warning");
+                $scope.courseEditLoading = false;
+                $scope.studentDetails = "";
+                $scope.courseDetails = "";
+
+            }
+        });
+
+
+    };
+
+
+   
+
 
  
 
@@ -251,3 +307,127 @@ $scope.tdate ='';
 
 
 
+app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) {
+
+    $scope.items = items;
+    $scope.selected = {
+        item: $scope.items[0]
+    };
+
+    $scope.ok = function () {
+        $modalInstance.close($scope.selected.item);
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+
+}]);
+
+
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+    //Tooltip for print button
+    $scope.dynamicTooltip = 'Student View';
+
+
+
+    //  $scope.items = ['item1', 'item2', 'item3'];
+
+    $scope.open = function (studentDetails) {
+
+        // get student view details
+        var getcourse = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentBasicInfo/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: studentDetails.StudentID,
+                requestedFrom: 1,
+                branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+            }
+        };
+        $http(getcourse).then(function (response) {
+
+            if (response.data.status == 200 && response.data.studentStatus == true) {
+                $scope.courseEditLoading = false;
+                // $scope.studentDetails = response.data.studentDetails;
+                $scope.studentDetails = response.data;
+                // $scope.courseDetails = response.data.courseDetails;
+                var modalInstance = $modal.open({
+                    templateUrl: 'assets/views/student/studentDetailsModal.html',
+                    controller: 'ModalInstanceCtrl',
+                    // size: size,
+                    resolve: {
+                        items: function () {
+                            return $scope.studentDetails;
+                        }
+                    }
+                });
+
+                modalInstance.result.then(function (selectedItem) {
+                    $scope.selected = selectedItem;
+                }, function () {
+                    $log.info('Modal dismissed at: ' + new Date());
+                });
+
+            } else {
+                swal("Failed!", "This student is not registerd", "warning");
+                $scope.courseEditLoading = false;
+                $scope.studentDetails = "";
+                $scope.courseDetails = "";
+
+            }
+        });
+
+
+    };
+    $scope.open1 = 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;
+
+        var printInstance = $modal.open({
+            templateUrl: 'assets/views/student/studentPdf.html',
+            controller: 'studentModalDemoCtrl',
+        });
+    };
+
+    // generate pdf for student view
+    $scope.export = function(getName) {
+        kendo.drawing.drawDOM($("#exportthis")).then(function(group) {
+            kendo.drawing.pdf.saveAs(group, getName+".pdf");
+        });
+    }
+
+
+}]);
+
+
+
+

Apollo/assets/views/newreg_report.html

@@ -161,7 +161,7 @@
 
     <div class="col-md-12" ng-if="isShow">
    <div class="table-responsive"  style="margin-top: 20px;">
-      <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed">
+      <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed"  ng-controller="studentModalDemoCtrl">
          <thead>
             <tr >
               <!-- <th style="font-size: 12px;">Date Of Registration</th>
@@ -190,7 +190,7 @@
             <tr  dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
              <td>{{p.SL_NO}}</td>
              <td>{{p.DOJ}}</td>
-             <td>{{p.Firstname}} {{p.Lastname}}</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.CourseName}}</td> 
              <td>{{p.Sem_Year}}</td>