From 4e365b597eeddf4dcbbc7c1b8f7e5a722b6694d3 Mon Sep 17 00:00:00 2001
From: resicovenba <venbatechnologies@gmail.com>
Date: Thu, 30 Nov 2017 11:01:37 +0530
Subject: [PATCH] student details updation

---
 Apollo/api/application/controllers/Student_Controller.php | 4 +---
 Apollo/api/application/models/Student_model.php           | 4 ++--
 Apollo/assets/i18n/en.json                                | 2 +-
 Apollo/assets/views/student/student_details.html          | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

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..b0cad632 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) {
@@ -77,7 +77,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) {
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/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 <span class="symbol required"></span>
                                             </label>
                                            <style>
-                                                   .dropdown-menu {
+                                                  .dropdown-menu {
                                                        position: relative;
                                                         /*top: -225px !important;*/
                                                         }
                                             </style>
-                                            <input  type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourse.dateofjoining"
+                                            <input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourse.dateofjoining"
                                                 is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
                                                 placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"/>