From 5c0f39a619ed429501f9bd8c8e1cb751ce971a74 Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 31 Dec 2018 11:18:55 +0530 Subject: [PATCH] excel issue --- Apollo/api/application/config/database.php | 18 +++++++++--------- .../controllers/report_markcard_statusCtrl.js | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 50f2b8a8..3f0f4d6d 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -76,17 +76,17 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'apollodec.com', - 'username' => 'apollod4_DEV', - 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'username' => 'apollod4_DEV', + 'password' => 'apollo1234', + 'database' => 'apollod4_ApolloDECDev', - // 'username' => 'apollod4_SIT', - // 'password' => 'apollosit1234', - // 'database' => 'apollod4_ApolloDECNEWSIT', + // 'username' => 'apollod4_SIT', + // 'password' => 'apollosit1234', + // 'database' => 'apollod4_ApolloDECNEWSIT', - // 'username' => 'apollod4_PROD', - // 'password' => 'approd!2017', - // 'database' =>'apollod4_ApolloDECNEWPROD', + // 'username' => 'apollod4_PROD', + // 'password' => 'approd!2017', + // 'database' =>'apollod4_ApolloDECNEWPROD', 'dbdriver' => 'mysqli', 'dbprefix' => '', diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 760e78a8..7a9d981b 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -175,7 +175,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as Sem/Year,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSenttoUnivDate,ansdate as AnswerBookletSenttoUnivDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSenttoUnivDate,ansdate as AnswerBookletUnivDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" markcard_data | filter: search ");