commit merge changes : kdk

2018-09-10 17:21:32 +05:30 · 2018-09-10 17:21:32 +05:30 · 357f219425
commit 357f219425
parent 22afde7cb2 da7e5c18fe
4 changed files with 115 additions and 5 deletions
--- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
+++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
@ -10,7 +10,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
     */

    // get local client details
-    var localDetail = JSON.parse(localStorage.getItem('localObj'));
+    var localDetail = JSON.parse(localStorage.getItem('localObj')); 
    var localDetails = ipCookie('cookiechk');

    // load when html page load
@ -165,7 +165,28 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter

        }
    }
+   //Export excel
+   var mystyle1 = {
+    sheetid: 'Student University FormId Fees Details',
+    headers: true,
+    caption: {
+      title:'Student University FormId Fees Details',
+      width: '300px',
+      style:'font-size:50px;' 
+    },
+    // style:'background:#00FF00',
+    column: {
+      style:'font-size:16px'
+    },
+   
+};

+
+
+$scope.exportData = function () {
+    alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,Session as Session,CAST(Year as NUMBER) as Year,Semester as Semester,Student_Name as Student_Name,Father_Name as Father_Name,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(ExamFee as NUMBER) as ExamFee,CAST(EnrollmentFee as NUMBER) as EnrollmentFee,CAST(ProspectusFee as NUMBER) as ProspectusFee,CAST(ReRegFee as NUMBER) as ReRegFee,CAST(CreditTransferFee as NUMBER) as CreditTransferFee,CAST(LateralEntryFee as NUMBER) as LateralEntryFee,CAST(DualSpclFee as NUMBER) as DualSpclFee,CAST(OtherFee as NUMBER) as OtherFee,CAST(NRIFEE as NUMBER) as NRIFEE,CAST(ProvisionalFee as NUMBER) as ProvisionalFee,CAST(MigrationFee as NUMBER) as MigrationFee,CAST(UrgentResultDMCFee as NUMBER) as UrgentResultDMCFee,CAST(AdditionalFee as NUMBER) as AdditionalFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdFeesDetails.xls",?) FROM ?',[mystyle1,$scope.data]);
+};
+   //End of export excel
    $scope.myObj = {
        // "color" : "green",
        "font-size": "inherit"
@ -332,7 +353,28 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
            }
        });
    }
+   //Export Excel
+   var mystyle = {
+    sheetid: 'Student University FormId Unmatched Records',
+    headers: true,
+    caption: {
+      title:'Student University FormId Unmatched Records',
+      width: '300px',
+      style:'font-size:50px;' 
+    },
+    // style:'background:#00FF00',
+    column: {
+      style:'font-size:16px'
+    },
+   
+};

+
+
+$scope.exportDataTab3 = function () {
+    alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdUnmatchedRecords.xls",?) FROM ?',[mystyle,$scope.unMatchedRecordDetails]);
+};
+   //End of export excel
    // get subtab details for the formid fee details get form the university

    $scope.subTabActive = function (tab) {
--- a/Apollo/assets/js/controllers/student_university_fee_compare.js
+++ b/Apollo/assets/js/controllers/student_university_fee_compare.js
@ -6,7 +6,7 @@

 app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", 'SweetAlert', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval, SweetAlert) {
    /**
-     * student university fee details compare
+     * student university fee details compare 
     */
    
    // get local client details
@ -179,7 +179,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil

        }
    }
-
+    //export excel
+    var mystyle = {
+        sheetid: 'Enrolment Details',
+        headers: true,
+        caption: {
+          title:'Student Form Enrolment Details',
+          width: '300px',
+          style:'font-size:50px;' 
+        },
+        // style:'background:#00FF00',
+        column: {
+          style:'font-size:16px'
+        },
+       
+    };
+    
+    
+    
+    $scope.exportData = function () {
+        alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,FormType as FormType,concat(Firstname,Lastname) as StudentName,Fathername as FatherName,UniversityName as University,CourseName as Course,SemesterYear as SemYear INTO XLS("EnrolmentDetails.xls",?) FROM ?',[mystyle,$scope.data]);
+    };
+    //end of export excel
    $scope.editId = -1;
    $scope.setEditId=function(id){
        $scope.editId = id;
@ -339,6 +360,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
            }
        });
    }
+    //export excel
+    var mystyle1 = {
+        sheetid: 'Unmatched Records',
+        headers: true,
+        caption: {
+          title:'Unmatched Records',
+          width: '300px',
+          style:'font-size:50px;' 
+        },
+        // style:'background:#00FF00',
+        column: {
+          style:'font-size:16px'
+        },
+       
+    };
+    
+    
+    
+    $scope.exportDataTab2 = function () {
+        alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,SemesterYear as SemesterYear,CAST(MobileNumber AS NUMBER) as MobileNumber,StudentName as StudentName,UniversityCode as UniversityCode,UniversityName as UniversityName,CourseCode as CourseCode,CourseName as CourseName,FatherName as FatherName,MotherName as MotherName,EmailID as EmailID INTO XLS("UnmatchedRecords.xls",?) FROM ?',[mystyle1,$scope.unMatchedRecordDetails]);
+    };
+    //End of export excel
    $scope.manualEnModel={
        "enrolmentNo": '',
        "formID":"",
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@ -104,7 +104,7 @@

                                                <div class="col-md-5 form-group" ng-class="{'has-error':manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid, 'has-success':manualEnForm.manualFormID.$valid}">
                                                    <label> Form ID <span class="symbol required"></span>
-                                                    </label>
+                                                    </label> 

                                                    <input type="text" tabindex="6"  placeholder="Enter Form ID"
                                                           class="form-control" name="manualFormID"
@ -207,6 +207,11 @@

                    <div>
                        <!--{{data | json}}-->
+                <div class="row" style="text-align: right;">
+                       
+                        <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
+                    
+                </div>        
                <div ng-if="Searchloader">
                    <div align="center" >
                        <h3 style="color: blue;">Loading...</h3></div>
@ -331,6 +336,9 @@
                    <div class="col-md-2" style="margin-top: 20px;">
                        <button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
                    </div>
+
+                   
+
                    <div class="container">
                        <div ng-if="unMatchedLoadingStatus">
                            <div style="color: blue; align: center;" align="center"> Loading...</div>
@ -339,6 +347,13 @@
                            <div style="color: red; align: center;" align="center"> No Record Found ...</div>
                        </div>
                    </div>
+
+                    <div class="row" style="text-align: right;">
+                       
+                        <button class="btn btn-success btn-o" ng-click="exportDataTab2()">Export to Excel</button>
+                    
+                    </div>  
+
                    <div class="container table-responsive" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
                        <div ng-if="unMatchedRecordDetailsType == 'EnrolmentIDFile'">
                            <table class="table table-border table-hover" >
--- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
+++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
@ -104,6 +104,11 @@
                        <div ng-if="formIdListNoRecordFound" align="center">
                           <div style="color: red; align: center;" align="center"> No Record Found ...</div>
                        </div>
+                        <div class="row" style="text-align: right;">
+                       
+                            <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
+                        
+                        </div>  
                        <div class="table-responsive" ng-if="studentData">
                            <table class="table table-hover">
                                <thead>
@ -161,7 +166,7 @@
                                        <th> Amount
                                        </th>
                                    </tr>
-                                </thead>
+                                </thead> 
                                <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
                                    <tr>
                                        <td>
@ -758,6 +763,11 @@
                            <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
                            </dir-pagination-controls>
                        </div>
+                        <div class="row" style="text-align: right;">
+                       
+                            <button class="btn btn-success btn-o" ng-click="exportDataTab3()">Export to Excel</button>
+                        
+                        </div>  
                        <div ng-if="unMatchedRecordDetailsType == 'FormIDFile'">
                            <table class="table table-border table-hover">
                                <thead>