From 9993e7cb254a940ac893942068e9b66f36473a8c Mon Sep 17 00:00:00 2001
From: resicovenba <venbatechnologies@gmail.com>
Date: Thu, 30 Nov 2017 12:06:41 +0530
Subject: [PATCH] student changes in staff

---
 Apollo/api/application/models/Student_model.php | 4 +++-
 Apollo/assets/js/controllers/studentCtrl.js     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index b0cad632..11ec17d0 100644
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -72,8 +72,9 @@ 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');
@@ -87,6 +88,7 @@ class Student_model extends CI_Model
                 $results['studentList'] = false;
             }
         } else {
+            
              $results['studentList'] = false;
         }
         return $results;
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/',