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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2017-11-30 18:14:29 +05:30
commit 3a09750037
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/controllers/Student_Controller.php
View File

@ -270,8 +270,6 @@ class Student_Controller extends REST_Controller {
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
$reqCourse['CreatedOn'] = $date; $reqCourse['CreatedOn'] = $date;
// print_r($reqCourse);exit(); // print_r($reqCourse);exit();
$studentAddCourse = $this->student_model->add_student_course( $addStudent , $reqCourse);// Check if the employee exist $studentAddCourse = $this->student_model->add_student_course( $addStudent , $reqCourse);// Check if the employee exist
if ($studentAddCourse) if ($studentAddCourse)
{ {
@ -321,7 +319,7 @@ class Student_Controller extends REST_Controller {
$req['ReferersMobileNumber'] = $data['referredmobilenumber']; $req['ReferersMobileNumber'] = $data['referredmobilenumber'];
$req['PreQualification'] = $data['prequalification']; $req['PreQualification'] = $data['prequalification'];
$req['IsActive'] = $data['switchsetting']; $req['IsActive'] = $data['switchsetting'];
$req['CreatedBranch'] = $createdBranch; $req['BranchCode'] = $createdBranch;
$req['CreatedBy'] = $createdBy; $req['CreatedBy'] = $createdBy;
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');

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

@ -63,7 +63,7 @@ class Student_model extends CI_Model
$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');
$this->db->where('CreatedBranch', $loginUserBranchId); $this->db->where('BranchCode', $loginUserBranchId);
$stuDetails = $this->db->get(); $stuDetails = $this->db->get();
$checkArr = $stuDetails->result(); $checkArr = $stuDetails->result();
if (count($checkArr) > 0) { if (count($checkArr) > 0) {
@ -72,12 +72,13 @@ 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');
$this->db->where('CreatedBranch', $loginUserBranchId); $this->db->where('BranchCode', $loginUserBranchId);
$stuDetails = $this->db->get(); $stuDetails = $this->db->get();
$checkArr = $stuDetails->result(); $checkArr = $stuDetails->result();
if (count($checkArr) > 0) { if (count($checkArr) > 0) {
@ -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;

2
Apollo/assets/i18n/en.json
View File

@ -68,7 +68,7 @@
"ANNOUNCEMENT": "ANNOUNCEMENT DETAILS" "ANNOUNCEMENT": "ANNOUNCEMENT DETAILS"
}, },
"student": { "student": {
"MAIN": "STUDENTS DETAILS", "MAIN": "MANAGE STUDENTS",
"LISTING": "STUDENTS LISTING", "LISTING": "STUDENTS LISTING",
"ENROLLMENT": "STUDENT ENROLLMENT", "ENROLLMENT": "STUDENT ENROLLMENT",
"STUDENTDETAILS": "STUDENT DETAILS" "STUDENTDETAILS": "STUDENT DETAILS"

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/',

4
Apollo/assets/views/student/student_details.html
View File

@ -474,12 +474,12 @@
Date of Joining <span class="symbol required"></span> Date of Joining <span class="symbol required"></span>
</label> </label>
<style> <style>
.dropdown-menu { .dropdown-menu {
position: relative; position: relative;
/*top: -225px !important;*/ /*top: -225px !important;*/
} }
</style> </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" 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"/> placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"/>