added student details

Apollo/api/application/config/constants.php

@@ -101,6 +101,8 @@ defined('LEAD_TRACKING') OR define('LEAD_TRACKING','T_Lead_Tracking');
 defined('LEAD_TRACKING_FOLLOWUP') OR define('LEAD_TRACKING_FOLLOWUP','T_Lead_Tracking_Followup');
 defined('PICK_LIST_DETAILS') OR define('PICK_LIST_DETAILS','T_PickListDetails');
 defined('BATCH') OR define('BATCH','T_BatchMaster');
+defined('STUDENTCOURSE') OR define('STUDENTCOURSE','T_Student_CourseDetails');
+defined('STUDENTS') OR define('STUDENTS','T_StudentDetails');
 
 //end of database table name 
 

Apollo/api/application/config/routes.php

@@ -96,6 +96,11 @@ $route['changePassword'] = 'Login_Controller/changePassword';
 // student
 $route['insertStudent'] = 'Student_Controller/addStudent';
 $route['getCourseBatchForUniv'] = 'Student_Controller/getCourseBatch';
+$route['chkStudentExistDetail'] = 'Student_Controller/chkStudentExistDetail';
+$route['getStudentList'] = 'Student_Controller/getStudentList';
+$route['updateStudentExistDetail'] = 'Student_Controller/updateStudentExistDetail';
+$route['chkUpdateStuExistDetail'] = 'Student_Controller/chkUpdateStuExistDetail';
+$route['getStudentCourseDetails'] = 'Student_Controller/getStudentCourseDetails';
 
 
 

Apollo/api/application/controllers/Student_Controller.php

@@ -37,6 +37,126 @@ class Student_Controller extends REST_Controller {
 
     }
 
+    public function getStudentList_post() {
+        $reqData = $this->post('data');
+        $loginUserId = $reqData['localUserID'];
+        $loginUserBranchId = $reqData['localBranchID'];
+        $loginUserType = $reqData['localType'];
+
+        $studentListDetails = $this->student_model->get_student_list( $loginUserId, $loginUserBranchId, $loginUserType );// Check if the employee exist
+            if ($studentListDetails)
+            {
+                $studentListDetails['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'message' => 'No users were found',
+                    'status' => REST_Controller::HTTP_NOT_FOUND
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+    }
+
+    public function getStudentCourseDetails_post() {
+          $studentID = $this->post('studentID');
+            $studentCourse = $this->student_model->get_student_course( $studentID );// Check if the employee exist
+                    if ($studentCourse)
+                    {
+                        $studentCourse['status'] = REST_Controller::HTTP_OK;
+                        // Set the response and exit
+                        $this->response($studentCourse, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+                    }
+                    else
+                    {
+                        // Set the response and exit
+                        $this->response([
+                            'message' => 'No users were found',
+                            'status' => REST_Controller::HTTP_NOT_FOUND
+                        ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+                    }
+    }
+
+    public function chkUpdateStuExistDetail_post() {
+        $exceptId = $this->post('exceptId');
+        $datas = $this->post('datas');
+        $checkFor = $this->post('check');
+
+        $checkRes = $this->student_model->check_update_exist( $exceptId, $datas, $checkFor );// Check if the employee exist
+        if ($checkRes)
+            {
+                $checkRes['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($checkRes, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            }
+        else
+            {
+                // Set the response and exit
+                $this->response([
+                    'message' => 'No users were found',
+                    'status' => REST_Controller::HTTP_NOT_FOUND
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            }
+    }
+
+    public function updateStudentExistDetail_post(){
+            $data = $this->post('data');
+            $updatedBy = $this->post('updatedBy');
+            $updateStudent = $data['StudentID'];
+
+            $req['MobileNumber'] = $data['MobileNumber'];
+            $req['Firstname'] = $data['Firstname'];
+            $req['Lastname'] = $data['Lastname'];
+            $req['Fathername'] = $data['Fathername'];
+            $req['EmailID'] = $data['EmailID'];
+            $req['MotherName'] = $data['MotherName'];
+            
+            $req['AlternateNumber'] = $data['AlternateNumber'];
+            $req['Gender'] = $data['Gender'];
+            $req['DOB'] = $data['DOB'];
+            $req['PresentAddress'] = $data['PresentAddress'];
+            $req['PermanentAddress'] = $data['PermanentAddress'];
+            $req['AadharNumber'] = $data['AadharNumber'];
+            $req['OtherID'] = $data['OtherID'];
+            $req['OtherIDDetails'] = $data['OtherIDDetails'];
+            $req['Qualification'] = $data['Qualification'];
+
+            $req['PreQualification'] = $data['PreQualification'];
+            $req['Caste'] = $data['Caste'];
+            $req['Category'] = $data['Category'];
+            $req['Religion'] = $data['Religion'];
+            $req['Nationality'] = $data['Nationality'];
+            $req['Occupation'] = $data['Occupation'];
+            $req['Designation'] = $data['Designation'];
+            $req['Companyname'] = $data['Companyname'];
+            $req['ReferredBy'] = $data['ReferredBy'];
+            $req['ReferersMobileNumber'] = $data['ReferersMobileNumber'];
+
+            $req['IsActive'] = $data['IsActive'];
+            
+            $req['UpdatedBy'] = $updatedBy;
+            $date = date('Y-m-d H:i:s');
+            $req['UpdatedOn'] = $date;
+            $studentUpdate = $this->student_model->update_student( $req, $updateStudent );// Check if the employee exist
+                    if ($studentUpdate)
+                    {
+                        $studentUpdate['status'] = REST_Controller::HTTP_OK;
+                        // Set the response and exit
+                        $this->response($studentUpdate, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+                    }
+                    else
+                    {
+                        // Set the response and exit
+                        $this->response([
+                            'message' => 'No users were found',
+                            'status' => REST_Controller::HTTP_NOT_FOUND
+                        ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+                    }
+    }
+
     public function getCourseBatch_post() {
         $data = $this->post('data');
         $getCourseBatchListDetails = $this->student_model->get_courseBatch_list($data);// Check if the employee exist
@@ -55,9 +175,31 @@ class Student_Controller extends REST_Controller {
                 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
+
+    public function chkStudentExistDetail_post() {
+        $data = $this->post('data');
+        $checkData = $this->post('check');
+          $checkRes = $this->student_model->check_exist( $data, $checkData );// Check if the employee exist
+          if ($checkRes)
+            {
+                $checkRes['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($checkRes, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'message' => 'No users were found',
+                    'status' => REST_Controller::HTTP_NOT_FOUND
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            }
+
+    }
     // add student
     public function addStudent_post() {
             $data = $this->post('data');
+            $coursedata = $this->post('coursedata');
             $createdBy = $this->post('createdBy');
             $createdBranch = $this->post('loginBranch');
 
@@ -86,12 +228,24 @@ class Student_Controller extends REST_Controller {
             $req['ReferersMobileNumber'] = $data['referredmobilenumber'];
             $req['PreQualification'] = $data['prequalification'];
             $req['IsActive'] = $data['switchsetting'];
+            $req['CreatedBranch'] = $createdBranch;
 
             $req['CreatedBy'] = $createdBy;
             $date = date('Y-m-d H:i:s');
             $req['CreatedOn'] = $date;
-            print_r($req);exit();
+
-            $studentAdd = $this->student_model->add_student( $req );// Check if the employee exist
+            $reqCourse['UniversityID'] = $coursedata['university'];
+            $reqCourse['CourseID'] = $coursedata['course'];
+            $reqCourse['BatchCode'] = $coursedata['batch'];
+            $reqCourse['DOJ'] = $coursedata['dateofjoining'];
+            $reqCourse['BranchID'] = $createdBranch;
+            $reqCourse['IsActive'] = $data['switchsetting'];
+            $reqCourse['CreatedBy'] = $createdBy;
+            $date = date('Y-m-d H:i:s');
+            $reqCourse['CreatedOn'] = $date;
+           
+            
+            $studentAdd = $this->student_model->add_student( $req , $reqCourse);// Check if the employee exist
                     if ($studentAdd)
                     {
                         $studentAdd['status'] = REST_Controller::HTTP_OK;

Apollo/api/application/models/Student_model.php

@@ -14,10 +14,105 @@ class Student_model extends CI_Model
      * created by kdk
      * */
 
+     // get student list based on login user
+    public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType)
+    {
+        // echo $loginUserId, $loginUserBranchId, $loginUserType; exit();
+        if ($loginUserType == SUPER_ADMIN) {
+            // list for super admin
+            // if ($loginUserBranchId == 'All') {
+            //     // for getting all branch details
+            //     $staffId = $this->selfGetEmpId($loginUserId);
+            //     $this->db->select('*');
+            //     $this->db->order_by('CreatedOn', 'DESC');
+            //     $this->db->from(STAFF);
+            //     // not for SuperAdmin and Student Role code
+            //     $this->db->where_not_in('StaffID', $staffId);
+            //     // $this->db->where('BranchCode', $loginUserBranchId);
+            //     $empDetails = $this->db->get();
+            //     $checkArr   = $empDetails->result();
+            //     if (count($checkArr) > 0) {
+            //         $results['employeeList']      = true;
+            //         $results['employees_details'] = $empDetails->result();
+            //     } else {
+            //         $results['employeeList'] = false;
+            //         $results['message']      = 'No record found';
+            //     }
+            // } else {
+            //     $staffId = $this->selfGetEmpId($loginUserId);
+            //     $this->db->select('*');
+            //     $this->db->order_by('CreatedOn', 'DESC');
+            //     $this->db->from(STAFF);
+            //     // not for SuperAdmin and Student Role code
+            //     $this->db->where_not_in('StaffID', $staffId);
+            //     $this->db->where('BranchCode', $loginUserBranchId);
+            //     $empDetails = $this->db->get();
+            //     $checkArr   = $empDetails->result();
+            //     if (count($checkArr) > 0) {
+            //         $results['employeeList']      = true;
+            //         $results['employees_details'] = $empDetails->result();
+            //     } else {
+            //         $results['employeeList'] = false;
+            //         $results['message']      = 'No record found';
+            //     }
+                
+            // }
+            
+        } else if ($loginUserType == ADMIN) {
+            // list for admin
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->order_by('CreatedOn', 'DESC');
+            $this->db->where('CreatedBranch', $loginUserBranchId);
+            $stuDetails = $this->db->get();
+            $checkArr   = $stuDetails->result();
+            if (count($checkArr) > 0) {
+                $results['studentList']      = true;
+                $results['student_details'] = $stuDetails->result();
+            } else {
+                $results['studentList'] = false;
+            }
+        } else if ($loginUserType == STAFF) {
+             // list for staff
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->order_by('CreatedOn', 'DESC');
+            $this->db->where('CreatedBranch', $loginUserBranchId);
+            $stuDetails = $this->db->get();
+            $checkArr   = $stuDetails->result();
+            if (count($checkArr) > 0) {
+                $results['studentList']      = true;
+                $results['student_details'] = $stuDetails->result();
+            } else {
+                $results['studentList'] = false;
+            }
+        } else {
+             $results['studentList'] = false;
+        }
+        return $results;
+    }
+     
+    // get student course details 
+    public function get_student_course($studentId) {
+        $this->db->select('*');
+        $this->db->from(STUDENTCOURSE);
+        $this->db->where('StudentID', $studentId);
+        $courseDetails  = $this->db->get();
+        $checkArr     = $courseDetails->result();
+        if (count($checkArr) > 0) {
+                $result['stuCourseDetails'] = true;
+                $result['course_details']     = $courseDetails->result();
+        } else {
+            $result['stuCourseDetails'] = false;
+        }
+        return $result;
+    }
+
+
+
     //get course for university
 
     public function get_courseBatch_list($univId) {
-
         $this->db->select('C.CourseID, C.CourseName');
         $this->db->from(COURSE.' as C');
         $this->db->where('UniversityID',$univId);
@@ -46,41 +141,177 @@ class Student_model extends CI_Model
         return $result;
     }
 
-    // add student 
+     // check exist
-    public function add_employee($empArr, $createdBy)
+    public function check_exist($data, $checkData)
     {
-        $this->db->insert(STAFF, $empArr);
+        if ($checkData == 'studentId') {
+            // check for student id
+            // $this->db->select('*');
+            // $this->db->from(STAFF);
+            // $this->db->where('StaffID', $data);
+            // if ($this->db->get()->first_row()) {
+            //     $result['existEmpId'] = true;
+            //     $result['message']    = "This Employee ID is already exist!";
+            // } else {
+            //     $result['existEmpId'] = false;
+            // }
+            
+        } else if ($checkData == 'mobileNumber') {
+            // check for mobile number
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->where('MobileNumber', $data);
+            if ($this->db->get()->first_row()) {
+                $result['existMobile'] = true;
+                $result['message']     = "This Mobile Number is already exist!";
+            } else {
+                    $this->db->select('*');
+                    $this->db->from(LOGIN);
+                    $this->db->where('MobileNumber', $data);
+                        if ($this->db->get()->first_row()) {
+                            $result['existMobile'] = true;
+                            $result['message']     = "This Mobile Number is already exist!";
+                        } else {
+                            $result['existMobile'] = false;
+                        }
+            }
+            
+        } else if ($checkData == 'emailId') {
+            // check for email id
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->where('EmailID', $data);
+            if ($this->db->get()->first_row()) {
+                $result['existEmailId'] = true;
+                $result['message']      = "This EmailId is already exist!";
+            } else {
+                $result['existEmailId'] = false;
+            }
+        } else {
+        }
+        return $result;
+    }
+
+    // add student 
+    public function add_student($Arr, $courseArr)
+    {
+        // print_r($Arr);
+        // print_r($courseArr);exit();
+        $this->db->insert(STUDENTS, $Arr);
+        $insert_id = $this->db->insert_id('StudentID');
+        $courseArr['StudentID'] = $insert_id;
         if ($this->db->affected_rows() == '1') {
-            $branchArr['StaffID']    = $empArr['StaffID'];
+            $this->db->insert(STUDENTCOURSE, $courseArr);
-            $branchArr['BranchCode'] = $empArr['BranchCode'];
-            $branchArr['IsActive']   = $empArr['IsActive'];
-            $branchArr['CreatedBy']  = $createdBy;
-            $this->db->insert(STAFF_BRANCH, $branchArr);
             if ($this->db->affected_rows() == '1') {
-                $loginArr['StaffID']      = $empArr['StaffID'];
+                $loginArr['StaffID']      = $courseArr['StudentID'];
-                $loginArr['ListCode']     = $empArr['ListCode'];
+                $loginArr['ListCode']     = STUDENT;
-                $loginArr['MobileNumber'] = $empArr['MobileNumber'];
+                $loginArr['MobileNumber'] = $Arr['MobileNumber'];
-                $loginArr['EmailId']      = $empArr['EmailID'];
+                $loginArr['EmailId']      = $Arr['EmailID'];
-                $loginArr['IsActive']     = $empArr['IsActive'];
+                $loginArr['IsActive']     = $Arr['IsActive'];
-                $loginArr['CreatedBy']    = $createdBy;
+                $loginArr['CreatedBy']    = $Arr['CreatedBy'];
+                $loginArr['CreatedOn']    = $Arr['CreatedOn'];
                 $loginArr['Password']     = ENCR_PASSWORD;
                 $this->db->insert(LOGIN, $loginArr);
                 if ($this->db->affected_rows() == '1') {
-                    $result['addEmpStatus'] = true;
+                    $result['addStudentStatus'] = true;
-                    $result['message']      = "Successfully employee details added";
+                    $result['message']      = "Successfully student details added";
                 } else {
-                    $result['addEmpStatus'] = false;
+                    $result['addStudentStatus'] = false;
                     $result['message']      = "Something went wrong.please try again";
                 }
             } else {
-                $result['addEmpStatus'] = false;
+                $result['addStudentStatus'] = false;
                 $result['message']      = "Something went wrong.please try again";
             }
         } else {
-            $result['addEmpStatus'] = false;
+            $result['addStudentStatus'] = false;
             $result['message']      = "Something went wrong.please try again";
         }
         return $result;
     }
 
+    // check existing data while update
+    public function check_update_exist($exceptId, $datas, $checkFor)
+    {
+        if ($checkFor == 'mobileNumber') {
+            // check update for mobile number
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->where('MobileNumber', $datas);
+            $this->db->where_not_in('StudentID', $exceptId);
+            if ($this->db->get()->first_row()) {
+                        $result['existMobile'] = true;
+                        $this->db->select('MobileNumber');
+                        $this->db->from(STUDENTS);
+                        $this->db->where('StudentID', $exceptId);
+                        $result['resetValue'] = $this->db->get()->first_row();
+                        $result['message']    = "This Mobile Number is already exist!";
+            } else {
+                    // check login
+                $this->db->select('*');
+                $this->db->from(LOGIN);
+                $this->db->where('MobileNumber', $datas);
+                $this->db->where_not_in('StaffID', $exceptId);
+                    if($this->db->get()->first_row()) {
+                        $result['existMobile'] = true;
+                        $this->db->select('MobileNumber');
+                        $this->db->from(STUDENTS);
+                        $this->db->where('StudentID', $exceptId);
+                        $result['resetValue'] = $this->db->get()->first_row();
+                        $result['message']    = "This Mobile Number is already exist!";
+                    } else {
+                        $result['existMobile'] = false;
+                    }
+            }
+            
+        } else if ($checkFor == 'emailId') {
+            // check update for email
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->where('EmailID', $datas);
+            $this->db->where_not_in('StudentID', $exceptId);
+            if ($this->db->get()->first_row()) {
+                $result['existEmailId'] = true;
+                $this->db->select('EmailID');
+                $this->db->from(STUDENTS);
+                $this->db->where('StudentID', $exceptId);
+                $result['resetValue'] = $this->db->get()->first_row();
+                $result['message']    = "This EmailId is already exist!";
+            } else {
+                $result['existEmailId'] = false;
+            }
+        } else {
+        }
+        return $result;
+    }
+    // update student personal details
+    public function update_student($empArr, $updateFor)
+    {
+        // print_r($empArr);
+        // print_r($updateFor);
+        // exit();
+        $this->db->where('StudentID', $updateFor);
+        $this->db->update(STUDENTS, $empArr);
+        if ($this->db->affected_rows() == '1') {
+                $mobile = $empArr['MobileNumber'];
+                $email = $empArr['EmailID'];
+                $active = $empArr['IsActive'];
+                $updatedBy = $empArr['UpdatedBy'];
+                $updatedOn = $empArr['UpdatedOn'];
+                $sql = "UPDATE ".LOGIN." SET MobileNumber='$mobile', EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'";
+                    if($this->db->query($sql) == '1'){
+                        $result['updateStuStatus'] = true;
+                        $result['message'] = "Successfully student details Updated";
+                    } else {
+                        $result['updateStuStatus'] = false;
+                        $result['message'] = "Something went wrong.please try again";
+                    }
+        } else {
+            $result['updateStuStatus'] = false;
+            $result['message']         = "Something went wrong.please try again";
+        }
+        return $result;
+    }
+    
+
 }

Apollo/assets/js/controllers/studentCtrl.js

@@ -37,6 +37,16 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
         'switchsetting': true,
     };
 
+    $scope.myModelCourse = {
+        'university': '',
+        'course': '',
+        'batch': '',
+        'dateofjoining': '',
+        'enrollmentid': ''
+    };
+
+
+
     // 2017-11-23T00:00:00+0530
     // sorting function for table params
     $scope.sort = function (keyname) {
@@ -52,6 +62,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
     $scope.init = function () {
         if (localDetail != null) {
             $scope.currentDate = new Date();
+            $scope.getStudentList();
             $scope.getUniversityList();
 
             // $scope.currentPage = 1;
@@ -59,22 +70,77 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
         }
     }
 
-    $scope.editId = -1;
+    $scope.getStudentList = function () {
-    $scope.editBranchId = -1;
+        $scope.loader = true;
-    $scope.setEditId = function (id) {
+        var empListreq = {
-        $scope.editId = id;
+            method: 'POST',
-        $scope.editBranchId = -1;
+            url: apiPoint.url + 'getStudentList/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(empListreq).then(function (response) {
+            if (response.data.studentList) {
+                $scope.loader = false;
+                $scope.studentData = true;
+                $scope.data = response.data.student_details;
+            } else {
+                $scope.loader = false;
+                $scope.studentData = false;
+            }
+        });
     }
 
-    $scope.setEditBranchId = function (id) {
+    $scope.editId = -1;
-        $scope.editBranchId = id;
+    $scope.editCourseId = -1;
+    $scope.setEditId = function (id) {
+        $scope.editId = id;
+        $scope.editCourseId = -1;
+    }
+
+    $scope.setEditCourseId = function (id) {
+        $scope.getStudentCourseDetails(id);
+        $scope.editCourseId = id;
         $scope.editId = -1;
-        $scope.branchEditLoading = true;
+        $scope.courseEditLoading = true;
     }
 
     $scope.cancel = function () {
+        $scope.getStudentList();
         $scope.editId = -1;
-        $scope.editBranchId = -1;
+        $scope.editCourseId = -1;
+    }
+
+    $scope.getStudentCourseDetails = function (studentId) {
+        var req = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentCourseDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                studentID: studentId
+            }
+        };
+        $http(req).then(function (response) {
+            if (response.data.stuCourseDetails) {
+                $scope.courseEditLoading = false;
+                $scope.studentCourse = response.data.course_details;
+                // $scope.branchArr = [];
+                // angular.forEach($scope.empBranchs, function (item, index) {
+                //     //   alert(item.BranchName);
+                //      $scope.branchArr.push(item.BranchName);
+                // });
+                // $scope.empBranchDetails = {
+                //     arr: $scope.branchArr,
+                // }
+                // $scope.empRoleDetail = response.data.role_details[0];
+            } else {
+            }
+        });
     }
 
 
@@ -99,21 +165,28 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
         });
     }
 
+    $scope.onSlecetUnivEdit = function(id) {
+        // $scope.stucour.CourseID = '';
+        // $scope.stucour.UniversityID = '';
+        $scope.myModelCourse.university = id;
+        $scope.onSlecetUniv();
+    }
+
     $scope.courseData = '';
     $scope.batchData = '';
     $scope.courseLoading = false;
-    $scope.onSlecetUniv = function() {
+    $scope.onSlecetUniv = function () {
-    $scope.myModel.course= '';
+        $scope.myModelCourse.course = '';
-    $scope.myModel.batch= '';
+        $scope.myModelCourse.batch = '';
-    $scope.courseLoading = true;
+        $scope.courseLoading = true;
-    var univListreq = {
+        var univListreq = {
             method: 'POST',
             url: apiPoint.url + 'getCourseBatchForUniv/',
             headers: {
                 'Content-Type': 'application/json'
             },
             data: {
-                data: $scope.myModel.university
+                data: $scope.myModelCourse.university
             }
         };
         $http(univListreq).then(function (response) {
@@ -127,9 +200,57 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
         });
     }
 
+
+
+
+    // check mobile number existing
+    $scope.checkMobileExist = function () {
+        var checkReq = {
+            method: 'POST',
+            url: apiPoint.url + 'chkStudentExistDetail/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.myModel.primaryPhone,
+                check: 'mobileNumber'
+            }
+        };
+        $http(checkReq).then(function (response) {
+            if (response.data.existMobile == true) {
+                swal("Warning!", response.data.message, "warning");
+                $scope.myModel.primaryPhone = '';
+            } else {
+            }
+        });
+    }
+
+    // check emailId existing
+    $scope.checkEmailExist = function () {
+        var checkReq = {
+            method: 'POST',
+            url: apiPoint.url + 'chkStudentExistDetail/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.myModel.emailId,
+                check: 'emailId'
+            }
+        };
+        $http(checkReq).then(function (response) {
+            if (response.data.existEmailId == true) {
+                swal("Warning!", response.data.message, "warning");
+                $scope.myModel.emailId = '';
+            } else {
+            }
+        });
+    }
+
     // add student
     $scope.studentFORM = {
-        submit: function (form, myModel) {
+       
+        submit: function (form, myModel, myModelCourse) {
             var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -149,6 +270,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
                 var formate = "dd-MM-yyyy";
                 $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0;
                 $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
+                $scope.myModelCourse.dateofjoining = $filter('date')(new Date($scope.myModelCourse.dateofjoining), formate);
                 var req = {
                     method: 'POST',
                     url: apiPoint.url + 'insertStudent/',
@@ -157,12 +279,13 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
                     },
                     data: {
                         data: $scope.myModel,
+                        coursedata: $scope.myModelCourse,
                         loginBranch: localDetails.localBranchID,
                         createdBy: localDetails.localUserID,
                     }
                 };
                 $http(req).then(function (response) {
-                    if (response.data.addEmpStatus == true) {
+                    if (response.data.addStudentStatus == true) {
                         swal("Success!", response.data.message, "success");
                         $state.go($state.current, {}, { reload: true });
                     } else {
@@ -198,6 +321,155 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
                 'role': '',
                 'switchsetting': true,
             };
+        }, resetCourse: function (form) {
+            form.$setPristine(true);
+            $scope.myModelCourse = {
+                'university': '',
+                'course': '',
+                'batch': '',
+                'dateofjoining': '',
+                'enrollmentid': ''
+            };
+        }
+    }
+
+
+     // update check mobile exist
+    $scope.updateCheckMobileExist = function (p) {
+
+        var checkReq = {
+            method: 'POST',
+            url: apiPoint.url + 'chkUpdateStuExistDetail/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                exceptId: p.StudentID,
+                datas: p.MobileNumber,
+                check: 'mobileNumber'
+            }
+        };
+        $http(checkReq).then(function (response) {
+            if (response.data.existMobile == true) {
+                swal("Warning!", response.data.message, "warning");
+                p.MobileNumber = response.data.resetValue.MobileNumber;
+            } else {
+            }
+        });
+    }
+
+    // update check email id exist
+    $scope.updateCheckEmailExist = function (p) {
+        var checkReq = {
+            method: 'POST',
+            url: apiPoint.url + 'chkUpdateStuExistDetail/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                exceptId: p.StudentID,
+                datas: p.EmailID,
+                check: 'emailId'
+            }
+        };
+        $http(checkReq).then(function (response) {
+            if (response.data.existEmailId == true) {
+                swal("Warning!", response.data.message, "warning");
+                p.EmailID = response.data.resetValue.EmailID;
+            } else {
+            }
+        });
+    }
+    
+    // update student details
+    $scope.updateStuDetails = function (form, p) {
+        var firstError = null;
+        if (form.$invalid) { 
+            var field = null, firstError = null;
+            for (field in form) {
+                if (field[0] != '$') {
+                    if (firstError === null && !form[field].$valid) {
+                        firstError = form[field].$name;
+                    }
+                    if (form[field].$pristine) {
+                        form[field].$dirty = true;
+                    }
+                }
+            }
+            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(p.DOB);
+            var formate = "dd-MM-yyyy";
+            var checkDOB = $filter('date')(new Date(p.DOB), formate);
+            p.IsActive = p.IsActive === true ? 1 : 0;
+            p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate);
+            var req = {
+                method: 'POST',
+                url: apiPoint.url + 'updateStudentExistDetail/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: p,
+                    updatedBy: localDetails.localUserID,
+                }
+            };
+            $http(req).then(function (response) {
+                if (response.data.updateStuStatus = true) {
+                    swal("Success!", response.data.message, "success");
+                    $scope.getStudentList();
+                    $scope.editId = -1;
+                } else {
+                    //  $scope.ldloading1[loading.replace('-', '_')] = false;
+                    swal("Failed!", response.data.message, "error");
+                }
+            });
+        }
+    }
+
+    $scope.updateStudentCourseDetails = function (form, datas) {
+       if (form.$invalid) { 
+            var field = null, firstError = null;
+            for (field in form) {
+                if (field[0] != '$') {
+                    if (firstError === null && !form[field].$valid) {
+                        firstError = form[field].$name;
+                    }
+                    if (form[field].$pristine) {
+                        form[field].$dirty = true;
+                    }
+                }
+            }
+            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(p.DOB);
+            var formate = "dd-MM-yyyy";
+            var checkDOB = $filter('date')(new Date(p.DOB), formate);
+            p.IsActive = p.IsActive === true ? 1 : 0;
+            p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate);
+            var req = {
+                method: 'POST',
+                url: apiPoint.url + 'updateStudentCourseDetail/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: datas,
+                    updatedBy: localDetails.localUserID,
+                }
+            };
+            $http(req).then(function (response) {
+                if (response.data.updateStuStatus = true) {
+                    swal("Success!", response.data.message, "success");
+                    $scope.getStudentList();
+                    $scope.editId = -1;
+                } else {
+                    //  $scope.ldloading1[loading.replace('-', '_')] = false;
+                    swal("Failed!", response.data.message, "error");
+                }
+            });
         }
     }
 

Apollo/assets/views/student/editStudentCourseDetails.html

@@ -0,0 +1,94 @@
+<form name="Form" id="form" novalidate>
+    <div class="row">
+        <div class="col-md-12">
+            <div ng-if="courseEditLoading == true" class="text-center">
+                <!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
+                <h3>Fetching ...</h3>
+            </div>
+            <div class="col-md-12">
+
+                <fieldset ng-if="courseEditLoading == false">
+                    <legend>
+                        Course Details
+                    </legend>
+                    <pre> {{studentCourse | json }} </pre>
+                    <!--Edit course details : Start-->
+                    <div>
+                        <div class="row" ng-repeat="stucour in studentCourse">
+                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.univ.$dirty && Form.univ.$invalid, 'has-success':Form.univ.$valid}">
+                                <label>
+                                          University <span class="symbol required"></span>
+                                            </label>
+                                <select ng-init="onSlecetUnivEdit(stucour.UniversityID)" class="form-control" name="univ" ng-model="stucour.UniversityID"
+                                    class="cs-select cs-skin-elastic" ng-change="onSlecetUnivEdit(stucour.UniversityID)" required>
+	
+                                    <option value="" disabled selected>Select University</option>
+									<option ng-repeat="items in universityData" value="{{items.UniversityID}}" ng-selected="stucour.UniversityID == items.UniversityID">{{items.UniversityName}}</option>
+								            </select>
+                                <span class="error text-small block" ng-if="Form.univ.$dirty && Form.univ.$error.required">University is required</span>
+                            </div>
+                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.course.$dirty && Form.course.$invalid, 'has-success':Form.course.$valid}">
+                                <label>
+                                          Course <span class="symbol required"></span>
+                                            </label>
+                                <select class="form-control" name="role" ng-model="stucour.CourseID" name="course" class="cs-select cs-skin-elastic" required>
+	
+                                    <option value="" disabled selected>Select Course</option>
+									<option ng-repeat="items in courseData" value="{{items.CourseID}}" ng-selected="stucour.CourseID == items.CourseID">{{items.CourseName}}</option>
+								            </select>
+                                <span class="error text-small block" ng-if="Form.course.$dirty && Form.course.$error.required">Course is required</span>
+                            </div>
+                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
+                                <label>
+                                          Batch <span class="symbol required"></span>
+                                            </label>
+                                <select class="form-control" name="batch" ng-model="stucour.BatchCode" class="cs-select cs-skin-elastic" required>
+	
+                                    <option value="" disabled selected>Select Batch</option>
+									<option ng-repeat="items in batchData" value="{{items.BatchCode}}" ng-selected="stucour.BatchCode == items.BatchCode">{{items.BatchName}}</option>
+								            </select>
+                                <span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Batch is required</span>
+                            </div>
+                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.enrollId.$dirty && Form.enrollId.$invalid}">
+                                <label>
+                                          Entrollment ID 
+                                            </label> {{ stucour.ID}}
+
+                                <input type="text" placeholder="Enter Entrollment ID" tabindex="15" class="form-control" name="enrollId" ng-model="stucour.ID"
+                                    ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                <span class="error text-small block" ng-if="Form.enrollId.$dirty && Form.enrollId.$error.pattern">Invalid Entrollment ID </span>
+                            </div>
+                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
+                                <label>
+                                          Date of Joining <span class="symbol required"></span>
+                                            </label>
+                                <!--{{ stucour.DOJ}}-->
+                                <input type="text" tabindex="8" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="stucour.DOJ"
+                                    is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
+                                    placeholder="Select Date of Joining" close-text="Close" required="required" max-date="currentDate"
+                                />
+
+                                <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="pull-right">
+                                    <button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStudentCourseDetails(Form, studentCourse)">
+                                                Update
+                                            </button>
+                                    <button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="cancel()">
+                                                Cancel
+                                            </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--Edit course details : Start-->
+                </fieldset>
+            </div>
+        </div>
+    </div>
+</form>
+<!--  class="editRowTd" -->

Apollo/assets/views/student/editStudentDetails.html

@@ -0,0 +1,385 @@
+<form name="Form" id="form" novalidate>
+    <div class="row">
+        <div class="col-md-12">
+                            <div class="col-md-12">
+                                <fieldset>
+                                    <legend>
+                                        Personal Details
+                                    </legend>
+
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                            <label>
+                                                Mobile Number <span
+                                                    class="symbol required"></span>
+                                            </label>
+                                            <input type="text" name="primaryPhone" tabindex="1" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber"
+                                                ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)'
+                                                required/>
+                                            <span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
+                                            <span class="error text-small block" ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.firstname.$dirty && Form.firstname.$invalid, 'has-success':Form.firstname.$valid}">
+                                            <label>
+                                                First Name <span class="symbol required"></span>
+                                            </label>
+                                            <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="p.Firstname"
+                                                ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
+                                            <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span>
+                                            <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}">
+                                            <label>
+                                                Last Name <span class="symbol required"></span>
+                                            </label>
+                                            <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="p.Lastname"
+                                                ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
+                                            <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span>
+                                            <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.fathername.$dirty && Form.fathername.$invalid, 'has-success':Form.fathername.$valid}">
+                                            <label>
+                                                Father Name <span class="symbol required"></span>
+                                            </label>
+                                            <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="p.Fathername"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" required/>
+                                            <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name required</span>
+                                            <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}">
+                                            <label>
+                                                Mother Name <span class="symbol required"></span>
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="p.MotherName"
+                                                ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
+                                            <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name required</span>
+                                            <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span>
+                                        </div>
+                                        <div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
+                                            <label>
+                                                Email ID <span class="symbol required"></span>
+                                            </label>
+                                            <input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
+                                                ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required>
+                                            <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
+                                            <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.secondaryPhone.$dirty && Form.secondaryPhone.$invalid, 'has-success':Form.secondaryPhone.$valid}">
+                                            <label class="control-label">
+                                                Alternate Mobile Number <span class="symbol required"></span>
+                                            </label>
+                                            <input type="text" name="secondaryPhone" tabindex="7" placeholder="Enter Alternate Mobile Number" class="form-control" ng-model="p.AlternateNumber"
+                                                ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" required/>
+                                            <span class="error text-small block" ng-if="Form.secondaryPhone.$dirty && Form.secondaryPhone.$invalid" ng-hide="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Alternate Mobile Number is required.</span>
+                                            <span class="error text-small block" ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span>
+                                        </div>
+
+                                        <div data-ng-controller="DatepickerDemoCtrl">
+                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}">
+                                                <label>
+                                                Date Of Birth <span
+                                                    class="symbol required"></span>
+                                            </label>
+                                                <input type="text" tabindex="8" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB"
+                                                    is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
+                                                    placeholder="Select Date of Birth" close-text="Close" required="required"
+                                                    ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate" />
+
+
+                                                <span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
+                                                <span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}">
+                                            <label class="block">
+										     Gender <span class="symbol required"></span>
+									         </label>
+                                            <div class="clip-radio radio-primary">
+                                                <input type="radio" tabindex="9" id="female" name="gender" value="female" ng-model="p.Gender" required>
+                                                <label for="female">
+											     Female
+										        </label>
+                                                <input type="radio" id="male" name="gender" value="male" ng-model="p.Gender" required>
+                                                <label for="male">
+											    Male
+										        </label>
+                                                <span class="error text-small block" ng-if="Form.gender.$dirty && Form.gender.$invalid">Gender is required.</span>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
+                                            <label>
+                                                   Permanent Address
+                                                </label>
+                                            <textarea placeholder="Enter Permanent Address" tabindex="10" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
+                                            <span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
+                                            <label>
+                                                   Current Address
+                                                </label>
+                                            <textarea placeholder="Enter Current Address" tabindex="11" class="form-control textdsc" name="address2" ng-model="p.PresentAddress"></textarea>
+                                            <span class="error text-small block" ng-if="Form.address2.$dirty && Form.address2.$invalid">Current Address is required</span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
+                                            <label>
+                                                Aadhar Number <span class="symbol required"></span>
+                                            </label>
+                                            <input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
+                                                ng-model="p.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/"
+                                                required>
+                                            <span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
+                                            <span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+
+                                        <div class="col-md-4 form-group">
+                                            <div class="row">
+                                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.otherId.$dirty && Form.otherId.$invalid}">
+                                                    <label>
+                                                Other ID
+                                            </label>
+                                                    <input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="p.OtherID" ng-minlength="1"
+                                                        ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
+                                                    <span class="error text-small block" ng-if="Form.otherId.$dirty && Form.otherId.$invalid" ng-hide="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Aadhar Number is required.</span>
+                                                    <span class="error text-small block" ng-if="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Enter a Valid Details</span>
+                                                </div>
+                                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.otherIdDetails.$dirty && Form.otherIdDetails.$invalid}">
+                                                    <label>
+                                                Other ID Details
+                                            </label>
+                                                    <input type="text" name="otherIdDetails" tabindex="14" placeholder="Other Id Details" class="form-control" ng-model="p.OtherIDDetails"
+                                                        ng-minlength="1" ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
+                                                    <span class="error text-small block" ng-if="Form.otherIdDetails.$dirty && Form.otherIdDetails.$invalid" ng-hide="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Aadhar Number is required.</span>
+                                                    <span class="error text-small block" ng-if="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Enter a Valid Details</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.caste.$dirty && Form.caste.$invalid}">
+                                            <label>
+                                                Caste 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Caste" tabindex="15" class="form-control" name="caste" ng-model="p.Caste" ng-pattern="/^[a-zA-Z.\s]*$/"
+                                            />
+                                            <span class="error text-small block" ng-if="Form.caste.$dirty && Form.caste.$error.pattern">Invalid Caste Name </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.category.$dirty && Form.category.$invalid}">
+                                            <label>
+                                                Category 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Category" tabindex="16" class="form-control" name="category" ng-model="p.Category"
+                                            />
+                                            <span class="error text-small block" ng-if="Form.category.$dirty && Form.category.$error.pattern">Invalid Category Name </span>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.religion.$dirty && Form.religion.$invalid}">
+                                            <label>
+                                                Religion 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Religion" tabindex="17" class="form-control" name="religion" ng-model="p.Religion"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                            <span class="error text-small block" ng-if="Form.religion.$dirty && Form.religion.$error.pattern">Invalid Religion Name </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.nationality.$dirty && Form.nationality.$invalid}">
+                                            <label>
+                                                Nationality 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Nationality" tabindex="18" class="form-control" name="nationality" ng-model="p.Nationality"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                            <span class="error text-small block" ng-if="Form.nationality.$dirty && Form.nationality.$error.pattern">Invalid Nationality Name </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.qualificaion.$dirty && Form.qualificaion.$invalid}">
+                                            <label>
+                                               Pre Qualification 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Qualification" tabindex="19" class="form-control" name="qualificaion" ng-model="p.PreQualification"
+                                            />
+                                            <span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.occupation.$dirty && Form.occupation.$invalid}">
+                                            <label>
+                                                Occupation 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Occupation" tabindex="20" class="form-control" name="occupation" ng-model="p.Occupation"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                            <span class="error text-small block" ng-if="Form.occupation.$dirty && Form.occupation.$error.pattern">Invalid Occupation </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.designation.$dirty && Form.designation.$invalid}">
+                                            <label>
+                                                Designation 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Designation" tabindex="21" class="form-control" name="designation" ng-model="p.Designation"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                            <span class="error text-small block" ng-if="Form.designation.$dirty && Form.designation.$error.pattern">Invalid Designation </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.companyname.$dirty && Form.companyname.$invalid}">
+                                            <label>
+                                                Company Name 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Company Name" tabindex="22" class="form-control" name="companyname" ng-model="p.Companyname"
+                                            />
+                                            <span class="error text-small block" ng-if="Form.companyname.$dirty && Form.companyname.$error.pattern">Invalid Company </span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.referredby.$dirty && Form.referredby.$invalid}">
+                                            <label>
+                                                Referred By 
+                                            </label>
+
+                                            <input type="text" placeholder="Enter Refer's Name" tabindex="23" class="form-control" name="referredby" ng-model="p.ReferredBy"
+                                                ng-pattern="/^[a-zA-Z.\s]*$/" />
+                                            <span class="error text-small block" ng-if="Form.referredby.$dirty && Form.referredby.$error.pattern">Invalid Referred By </span>
+                                        </div>
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid}">
+                                            <label>
+                                                Refer's Mobile Number
+                                            </label>
+                                            <input type="text" name="referredmobilenumber" tabindex="24" placeholder="Enter Refer's Mobile Number" class="form-control"
+                                                ng-model="p.ReferersMobileNumber" ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/"
+                                            />
+                                            <span class="error text-small block" ng-if="Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid" ng-hide="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Refer's Mobile Number is required.</span>
+                                            <span class="error text-small block" ng-if="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Enter a Valid Phone Number</span>
+                                        </div>
+                                    </div>
+                                      <div class="row">
+                                        <div class="col-md-4">
+                                            <label>
+                                                Active/De-Active
+                                            </label>
+                                            <div ng-if="p.IsActive==true">
+                                                    <switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
+                                            </div>
+                                                <div ng-if="p.IsActive==false">
+                                                    <switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                        <!--<pre>{{ p | json}}</pre>-->
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <div class="pull-right">
+                                            <button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStuDetails(Form, p)">
+                                                Save
+                                            </button>
+                                            <button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()">
+                                                Cancel
+                                            </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </fieldset>
+                                <!--<fieldset>
+                                    <legend>
+                                        Branch Details
+                                    </legend>
+                                    <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.homeBranch.$dirty && Form.homeBranch.$invalid, 'has-success':Form.homeBranch.$valid}">
+                                            <label for="form-field-select-2">
+                                                Home Branch <span class="symbol required"></span>
+                                            </label>
+
+                                            <select class="form-control" class="cs-select cs-skin-elastic" name="homeBranch" ng-model="p.BranchCode" required>
+									<option value="" disabled selected>Select Home Branch</option>
+										<option ng-repeat="item in branchDetails" value="{{item.BranchCode}}" ng-selected="p.BranchCode == item.BranchCode">{{item.BranchName}}</option>
+								</select>
+                                            <span class="error text-small block" ng-if="Form.homeBranch.$dirty && Form.homeBranch.$error.required">Home Branch is Required</span>
+                                        </div>
+
+                                        <div data-ng-controller="DatepickerDemoCtrl">
+                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
+                                                <label>
+                                                Date Of Joining <span class="symbol required"></span>
+                                            </label>
+
+                                                <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="yyyy-MM-dd" ng-model="p.DOJ"
+                                                    is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
+                                                    placeholder="Select Date of Joining" close-text="Close" required="required"
+                                                />
+                                                <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.role.$dirty && Form.role.$invalid, 'has-success':Form.role.$valid}">
+                                            <label>
+                                                Role <span class="symbol required"></span>
+                                            </label>
+                                            <select class="form-control" name="role" ng-model="p.ListCode" class="cs-select cs-skin-elastic" required>
+	
+                                    <option value="" disabled selected>Select Role</option>
+									<option ng-repeat="item in roleDetails" value="{{item.ListCode}}" ng-selected="p.ListCode == item.ListCode">{{item.ListName}}</option>
+								            </select>
+                                            <span class="error text-small block" ng-if="Form.role.$dirty && Form.role.$error.required">Role is required</span>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4">
+                                            <label>
+                                                Active/De-Active
+                                            </label>
+
+                                            <div ng-switch="p.IsActive">
+                                                <div ng-switch-when="true">
+                                                    <switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
+                                                </div>
+                                                <div ng-switch-when="false">
+                                                    <switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
+                                                </div>
+                                                <div ng-switch-default>
+                                                    <switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <pre>{{ p | json}}</pre>
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <div class="pull-right">
+                                            <button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p)">
+                                                Submit
+                                            </button>
+                                            <button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="branchForm.reset(Form)">
+                                                Reset
+                                            </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </fieldset>-->
+
+                            </div>
+                        </div>
+                <!--<div class="col-md-12">
+                    <div class="pull-right">
+                        <input type="button" class="btn btn-warning btn-wide" tabindex="9" value="Cancel"
+                                ng-click="cancel();">
+                        </input>
+                    </div>
+                </div>-->
+            <!--</fieldset>-->
+        </div>
+    </div>
+</form>
+<!--  class="editRowTd" -->

Apollo/assets/views/student/student_details.html

@@ -12,7 +12,7 @@
 <div class="container-fluid container-fullw bg-white">
     <div class="row" ng-controller="studentCtrl" data-ng-init="init()">
         <tabset class="tabbable">
-            <!--<tab heading="View Employee" id="employeebranch">
+            <tab heading="View Student" id="studentbranch">
                 <div class="container-fluid container-fullw">
                     <div class="row">
                         <div ng-if="loader == true" class="col-md-12" align="center">
@@ -20,12 +20,12 @@
 </spinner>
                         </div>
 
-                        <div class="col-md-12" ng-if="emptyData == false" style="min-height: 281px;">
+                        <div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
                             <p style="color: red;" align="center"><strong><h3 class="text-center">No
                                 records found... </h3></strong></p>
                         </div>
 
-                        <div class="col-md-12" ng-if="emptyData == true">
+                        <div class="col-md-12" ng-if="studentData == true">
                           <div class="row">
                                 <div class="col-md-3">
                                     <script>
@@ -40,9 +40,6 @@
                                 <table class="table table-hover">
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('StaffID')">Staff Id
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='StaffID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
-                                            </th>
                                             <th ng-click="sort('Firstname')">First Name
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
@@ -61,25 +58,23 @@
                                     </thead>
                                     <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
                                         <tr>
-                                            <td>{{p.StaffID}}</td>
                                             <td>{{p.Firstname}}</td>
                                             <td>{{p.Lastname}}</td>
                                             <td>{{p.MobileNumber}}</td>
                                             <td>{{p.EmailID}}</td>
                                             <td style="text-align: center;">
-                                                <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StaffID}}" value="Personal Details"
+                                                <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
-                                                    ng-click="setEditId(p.StaffID);">
+                                                    ng-click="setEditId(p.StudentID);">
-                                                <input type=button class="btn btn-blue btn-xs" id="editBranchRowBtn{{p.StaffID}}" value="Branch Details" ng-click="setEditBranchId(p.StaffID);">
+                                                <!--<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);">-->
                                             </td>
                                         </tr>
-                                        <tr ng-show="editId === p.StaffID" ng-if="editId === p.StaffID">
+                                        <tr ng-show="editId === p.StudentID" ng-if="editId === p.StudentID">
-                                            <td colspan="6" ng-include src="'assets/views/editEmployeeDetails.html'"></td>
+                                            <td colspan="6" ng-include src="'assets/views/student/editStudentDetails.html'"></td>
                                         </tr>
-                                        <tr ng-show="editBranchId === p.StaffID" ng-if="editBranchId === p.StaffID">
+                                        <tr ng-show="editCourseId === p.StudentID" ng-if="editCourseId === p.StudentID">
-                                            <td colspan="6" ng-include src="'assets/views/editEmployeeBranchDetails.html'"></td>
+                                            <td colspan="6" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
                                         </tr>
                                     </tbody>
-
                                 </table>
                                 <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
                                 </dir-pagination-controls>
@@ -89,7 +84,7 @@
                         </div>
                     </div>
                 </div>
-            </tab>-->
+            </tab>
             <script>
                 $('#addbranch').click(function () {
                     $('#branchcode').focus();
@@ -376,25 +371,35 @@
                                             <span class="error text-small block" ng-if="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Enter a Valid Phone Number</span>
                                         </div>
                                     </div>
-                                     <div class="row">
+                                    <div class="row">
-                                            <div class="col-md-3">
+                                        <div class="col-md-3">
-                                                <label>
+                                            <label>
                                                 Active/De-Active
                                             </label>
 
-                                                <div ng-switch="myModel.switchsetting">
+                                            <div ng-switch="myModel.switchsetting">
-                                                    <div ng-switch-when="true">
+                                                <div ng-switch-when="true">
-                                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
-                                                    </div>
+                                                </div>
-                                                    <div ng-switch-when="false">
+                                                <div ng-switch-when="false">
-                                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
-                                                    </div>
+                                                </div>
-                                                    <div ng-switch-default>
+                                                <div ng-switch-default>
-                                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
-                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
+                                    </div>
+                                    <!--<div class="row">
+                                        <div class="col-md-12">
+                                            <div class="pull-right">
+
+                                                <button type="reset" tabindex="31" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.reset(Form)">
+                                                Reset
+                                            </button>
+                                            </div>
+                                        </div>
+                                    </div>-->
 
                                 </fieldset>
                                 <fieldset>
@@ -402,74 +407,85 @@
                                         Course Details
                                     </legend>
                                     <div class="row">
-                                        <div class="col-md-3 form-group" ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid, 'has-success':Form.university.$valid}">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid, 'has-success':Form.university.$valid}">
                                             <label for="form-field-select-2">
                                                University <span class="symbol required"></span>
                                             </label>
 
-                                            <select class="form-control" tabindex="25" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.university"
+                                            <select class="form-control" tabindex="25" class="cs-select cs-skin-elastic" name="university" ng-model="myModelCourse.university"
-                                             ng-change="onSlecetUniv()"   required>
+                                                ng-change="onSlecetUniv()" required>
 									<option value="" disabled selected>Select University</option>
 										<option ng-repeat="item in universityData"  value="{{item.UniversityID}}">{{item.UniversityName}}</option>
 								</select>
                                             <span class="error text-small block" ng-if="Form.university.$dirty && Form.university.$error.required">University is Required</span>
                                         </div>
 
-                                          <div class="col-md-3 form-group" ng-class="{'has-error':Form.course.$dirty && Form.course.$invalid, 'has-success':Form.course.$valid}">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.course.$dirty && Form.course.$invalid, 'has-success':Form.course.$valid}">
 
                                             <label>
                                                 Course <span class="symbol required"></span>
                                             </label>
-                                               <div ng-if="courseLoading == true">
+                                            <div ng-if="courseLoading == true">
-                                                  <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
+                                                <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
-                                              </div>
+                                            </div>
-                                              <div ng-if="courseLoading == false">
+                                            <div ng-if="courseLoading == false">
-                                            <select  class="form-control" tabindex="26" name="course" ng-model="myModel.course" class="cs-select cs-skin-elastic" required>
+                                                <select class="form-control" tabindex="26" name="course" ng-model="myModelCourse.course" class="cs-select cs-skin-elastic"
+                                                    required>
 									<option value="" disabled selected>Select Course</option>
 									<option ng-repeat="item in courseData" value="{{item.CourseID}}">{{item.CourseName}}</option>
 								            </select>
-                                              </div>
+                                            </div>
                                             <span class="error text-small block" ng-if="Form.course.$dirty && Form.course.$error.required">Course is required</span>
 
                                         </div>
 
-                                        <div class="col-md-3 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
 
                                             <label>
                                                 Batch <span class="symbol required"></span>
                                             </label>
-                                               <div ng-if="courseLoading == true">
+                                            <div ng-if="courseLoading == true">
-                                                  <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
+                                                <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
-                                              </div>
+                                            </div>
-                                              <div ng-if="courseLoading == false">
+                                            <div ng-if="courseLoading == false">
-                                            <select  class="form-control" tabindex="26" name="batch" ng-model="myModel.batch" class="cs-select cs-skin-elastic" required>
+                                                <select class="form-control" tabindex="26" name="batch" ng-model="myModelCourse.batch" class="cs-select cs-skin-elastic"
+                                                    required>
 									<option value="" disabled selected>Select Batch</option>
 									<option ng-repeat="item in batchData" value="{{item.BatchCode}}">{{item.BatchName}}</option>
 								            </select>
-                                              </div>
+                                            </div>
                                             <span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Batch is required</span>
 
                                         </div>
+                                    </div>
+                                <div class="row">
+                                       <div class="col-md-4 form-group" ng-class="{'has-error':Form.enrollmentid.$dirty && Form.enrollmentid.$invalid}">
+                                            <label>
+                                                Enrollment ID 
+                                            </label>
+                                            <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control"
+                                                ng-model="myModelCourse.enrollmentid" 
+                                            />
+                                            <span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID required</span>
+                                        </div>
 
-                                          <div class="col-md-3 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
                                             <label>
                                                 Date of Joining <span class="symbol required"></span>
                                             </label>
-                                               <input type="text" tabindex="27" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.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"
+                                                placeholder="Select Date of Joining" close-text="Close" required="required" />
-                                                />
+                                            <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span>
-                                                <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span>
                                         </div>
-
+                                </div>
-                                       
                                         <div class="row">
                                             <div class="col-md-12">
                                                 <div class="pull-right">
                                                     <button type="submit" tabindex="30" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
                                                 Submit
                                             </button>
-                                                    <button type="reset" tabindex="31" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.reset(Form)">
+                                            <button type="reset" tabindex="31" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
                                                 Reset
                                             </button>
                                                 </div>
@@ -477,6 +493,7 @@
                                         </div>
                                 </fieldset>
                                 <pre> {{ myModel | json }}</pre>
+                                <pre> {{ myModelCourse | json }}</pre>
                                 </div>
                             </div>
                     </form>