diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php
index f8df5be8..516a351c 100755
--- a/Apollo/api/application/config/database.php
+++ b/Apollo/api/application/config/database.php
@@ -76,8 +76,8 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => 'apollodec.com',
- 'username' => 'apollod4_DEV',
- 'password' => 'apollo1234',
+ 'username' => 'apollod4_DEV',
+ 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli',
'dbprefix' => '',
diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php
index 0bfe5b5e..e596b8f2 100644
--- a/Apollo/api/application/controllers/DataCorrection_Controller.php
+++ b/Apollo/api/application/controllers/DataCorrection_Controller.php
@@ -36,7 +36,7 @@ class DataCorrection_Controller extends REST_Controller {
public function StudMerge_post()
{
$name = $this->post('name');
- $getStatus = $this->Data_Correction->Student_Merge($name);
+ $getStatus = $this->Data_correction->Student_Merge($name);
//print_r($getStatus);
if ($getStatus)
{
@@ -60,7 +60,7 @@ class DataCorrection_Controller extends REST_Controller {
{
$deleteNo = $this->post('deleteNo');
$mergeNo = $this->post('mergeNo');
- $getStatus = $this->Data_Correction->getMobile($deleteNo,$mergeNo);
+ $getStatus = $this->Data_correction->getMobile($deleteNo,$mergeNo);
//print_r($getStatus);
if ($getStatus)
{
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index c878eaf4..29ba3e3c 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -337,7 +337,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
title: 'status',
ncyBreadcrumb: {
label: 'status'
- }
+ }
}).state('app.student.status.studymaterial', {
url: '/studymaterial',
templateUrl: "assets/views/status-update/study_material_status.html",
diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html
index 55c3bc4d..58deac30 100755
--- a/Apollo/assets/views/status-update/answer_booklet_status.html
+++ b/Apollo/assets/views/status-update/answer_booklet_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update answer booklet status.
-
+
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index 03d30682..91b6203c 100644
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update application status.
-
+
diff --git a/Apollo/assets/views/status-update/certificate_status.html b/Apollo/assets/views/status-update/certificate_status.html
index 90611b4f..955a56ef 100644
--- a/Apollo/assets/views/status-update/certificate_status.html
+++ b/Apollo/assets/views/status-update/certificate_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update certificate status.
-
+
diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index 416f8ab2..30a91493 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -30,7 +30,7 @@
Update fees status.
-
+
diff --git a/Apollo/assets/views/status-update/markcard_status.html b/Apollo/assets/views/status-update/markcard_status.html
index 17634fbd..894db4c4 100644
--- a/Apollo/assets/views/status-update/markcard_status.html
+++ b/Apollo/assets/views/status-update/markcard_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update markcard status.
-
+
diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html
index 2d6b5ea5..11a1bcb9 100755
--- a/Apollo/assets/views/status-update/study_material_status.html
+++ b/Apollo/assets/views/status-update/study_material_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update study material status.
-
+
diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
index 3e923b72..c62e4797 100644
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Student Form Enrolment Details.
-
+
diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
index ac5daec2..c560ad2d 100644
--- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
+++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Student University FormId Fees Details.
-
+
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 68afc662..09c9182f 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Add/Edit student details.
-
+
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index 3e263f49..87a2d1ab 100755
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Add/Edit Student Details.
-
+