Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

student changes in staff

Browse Source
This commit is contained in:
resicovenba 2017-11-30 12:06:41 +05:30
parent d84a7c874e
commit 9993e7cb25
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Student_model.php
View File

@ -72,8 +72,9 @@ class Student_model extends CI_Model
} else { } else {
$results['studentList'] = false; $results['studentList'] = false;
} }
} else if ($loginUserType == STAFF) { } else if ($loginUserType == EMPLOYEE) {
// list for staff // list for staff
$this->db->select('*'); $this->db->select('*');
$this->db->from(STUDENTS); $this->db->from(STUDENTS);
$this->db->order_by('CreatedOn', 'DESC'); $this->db->order_by('CreatedOn', 'DESC');
@ -87,6 +88,7 @@ class Student_model extends CI_Model
$results['studentList'] = false; $results['studentList'] = false;
} }
} else { } else {
$results['studentList'] = false; $results['studentList'] = false;
} }
return $results; return $results;

4
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -268,12 +268,12 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
angular.element('.ng-invalid[name=' + firstError + ']').focus(); 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"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
alert(datas.DOJ); // alert(datas.DOJ);
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
var checkDOJ = $filter('date')(new Date(datas.DOJ), formate); var checkDOJ = $filter('date')(new Date(datas.DOJ), formate);
datas.IsActive = datas.IsActive === true ? 1 : 0; datas.IsActive = datas.IsActive === true ? 1 : 0;
datas.DOJ = checkDOJ == "NaN-NaN-0NaN" ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate); datas.DOJ = checkDOJ == "NaN-NaN-0NaN" ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate);
alert(datas.DOJ); // alert(datas.DOJ);
var req = { var req = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateStudentCourseDetail/', url: apiPoint.url + 'updateStudentCourseDetail/',