diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php
index 6e7135a6..4cd86954 100644
--- a/Apollo/api/application/controllers/Student_Controller.php
+++ b/Apollo/api/application/controllers/Student_Controller.php
@@ -270,8 +270,6 @@ class Student_Controller extends REST_Controller {
$date = date('Y-m-d H:i:s');
$reqCourse['CreatedOn'] = $date;
// print_r($reqCourse);exit();
-
-
$studentAddCourse = $this->student_model->add_student_course( $addStudent , $reqCourse);// Check if the employee exist
if ($studentAddCourse)
{
@@ -321,7 +319,7 @@ class Student_Controller extends REST_Controller {
$req['ReferersMobileNumber'] = $data['referredmobilenumber'];
$req['PreQualification'] = $data['prequalification'];
$req['IsActive'] = $data['switchsetting'];
- $req['CreatedBranch'] = $createdBranch;
+ $req['BranchCode'] = $createdBranch;
$req['CreatedBy'] = $createdBy;
$date = date('Y-m-d H:i:s');
diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 58bd5c28..11ec17d0 100644
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -63,7 +63,7 @@ class Student_model extends CI_Model
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->order_by('CreatedOn', 'DESC');
- $this->db->where('CreatedBranch', $loginUserBranchId);
+ $this->db->where('BranchCode', $loginUserBranchId);
$stuDetails = $this->db->get();
$checkArr = $stuDetails->result();
if (count($checkArr) > 0) {
@@ -72,12 +72,13 @@ class Student_model extends CI_Model
} else {
$results['studentList'] = false;
}
- } else if ($loginUserType == STAFF) {
+ } else if ($loginUserType == EMPLOYEE) {
// list for staff
+
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->order_by('CreatedOn', 'DESC');
- $this->db->where('CreatedBranch', $loginUserBranchId);
+ $this->db->where('BranchCode', $loginUserBranchId);
$stuDetails = $this->db->get();
$checkArr = $stuDetails->result();
if (count($checkArr) > 0) {
@@ -87,6 +88,7 @@ class Student_model extends CI_Model
$results['studentList'] = false;
}
} else {
+
$results['studentList'] = false;
}
return $results;
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index 683dd34b..4e980786 100644
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -68,7 +68,7 @@
"ANNOUNCEMENT": "ANNOUNCEMENT DETAILS"
},
"student": {
- "MAIN": "STUDENTS DETAILS",
+ "MAIN": "MANAGE STUDENTS",
"LISTING": "STUDENTS LISTING",
"ENROLLMENT": "STUDENT ENROLLMENT",
"STUDENTDETAILS": "STUDENT DETAILS"
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 5a7f4995..7d3178b4 100644
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -268,12 +268,12 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
- alert(datas.DOJ);
+ // alert(datas.DOJ);
var formate = "dd-MM-yyyy";
var checkDOJ = $filter('date')(new Date(datas.DOJ), formate);
datas.IsActive = datas.IsActive === true ? 1 : 0;
datas.DOJ = checkDOJ == "NaN-NaN-0NaN" ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate);
- alert(datas.DOJ);
+ // alert(datas.DOJ);
var req = {
method: 'POST',
url: apiPoint.url + 'updateStudentCourseDetail/',
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 63f4495e..4ef9e509 100644
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -474,12 +474,12 @@
Date of Joining
-