daybook updation, Super admin edit/add sudent enabled : kdk

Apollo/api/application/config/routes.php

@@ -123,6 +123,7 @@ $route['updateStudentCourseDetail'] = 'Student_Controller/updateStudentCourseDet
 $route['insertStudentCourse'] = 'Student_Controller/insertStudentCourse';
 $route['insertStudentImg'] = 'Student_Controller/insertStudentImg';  
 $route['updateStudentImgDetails'] = 'Student_Controller/updateStudentImgDetails';
+$route['getBranchListDetails'] = 'Student_Controller/getBranchListDetails';
 
 //batch  
 $route['addBatchDetails'] = 'Batch_Controller/addBatchDetails';

Apollo/api/application/controllers/Student_Controller.php

@@ -37,6 +37,26 @@ class Student_Controller extends REST_Controller {
 
     }
  
+    // list of branch for admin student add screen
+    public function getBranchListDetails_post() {
+         $reqData = $this->post('data');
+           $branchListDetails = $this->student_model->get_branch_list();// Get Branch list
+            if ($branchListDetails)
+            {
+                $branchListDetails['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($branchListDetails, 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 getStudentList_post() {
         $reqData = $this->post('data');
         $loginUserId = $reqData['localUserID'];

Apollo/api/application/models/Student_model.php

@@ -14,12 +14,40 @@ class Student_model extends CI_Model
      * created by kdk
      * */
 
+    public function get_branch_list() {
+        $this->db->select('t1.BranchCode,t1.BranchName');
+        $this->db->from('' . BRANCH . ' as t1');
+        $this->db->where('t1.IsActive', 1);
+        $branchDetails  = $this->db->get();
+        $checkArr     = $branchDetails->result();
+        if (count($checkArr) > 0) {
+                $result['branDetailstatus'] = true;
+                $result['branch_details']     = $branchDetails->result();
+        } else {
+            $result['branDetailstatus'] = false;
+        }
+        return $result;
+    }
+    
+
      // 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
+            // list for super admin based on branch
+            $this->db->select('*');
+            $this->db->from(STUDENTS);
+            $this->db->order_by('CreatedOn', 'DESC');
+            $this->db->where('BranchCode', $loginUserBranchId);
+            $stuDetails = $this->db->get();
+            $checkArr   = $stuDetails->result();
+            if (count($checkArr) > 0) {
+                $results['studentList']      = true;
+                $results['student_details'] = $stuDetails->result();
+            } else {
+                $results['studentList'] = false;
+            }
             // if ($loginUserBranchId == 'All') {
             //     // for getting all branch details
             //     $staffId = $this->selfGetEmpId($loginUserId);

Apollo/assets/i18n/en.json

@@ -76,6 +76,7 @@
         "LISTING": "STUDENTS LISTING",
         "ENROLLMENT": "STUDENT ENROLLMENT",
         "STUDENTDETAILS": "STUDENT DETAILS",
+        "STUDENTDETAILSADDEDIT": "ADD/EDIT STUDENT DETAILS",
         "status" : {
           "MAIN": "STATUS UPDATE",
           "STUDYMATERIAL": "STUDY MATERIAL",

Apollo/assets/js/config.router.js

@@ -221,6 +221,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'Student Details'
                 }
+            }).state('app.student.studentDetailsSuperAdmin', {
+                url: '/studentDetailsAddEdit',
+                templateUrl: "assets/views/student/student_details_SuperAdmin.html",
+                resolve: loadSequence('ui.select','spin', 'ui.mask', 'ladda', 'angular-ladda', 'studentCtrl', 'ngTable'),
+                title: 'Add/Edit Student Details',
+                ncyBreadcrumb: {
+                    label: 'Add/Edit Student Details'
+                }
             }).state('app.student.status', {
                 url: '/status',
                 template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',

Apollo/assets/js/controllers/daybookCtrl.js

@@ -3,7 +3,7 @@
  * daybook details capturing
  * 
  */
-app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie) {
+app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window) {
 
     // get local client details
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
@@ -16,12 +16,21 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
 
     // get the data while page loading functions goes here
     $scope.init = function () {
+          const LOCALTYPE = localDetail.localType;
+        if(LOCALTYPE === 'R002') {
         $scope.currentDate = new Date();
         var formate = "dd-MM-yyyy";
         $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
         $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
         $scope.getDayBookList();
         $scope.getIncomeExpenseType_Status();
+        }else {
+   ipCookie.remove('cookiechk');
+            $window.localStorage.clear();
+            $state.go('login.signin');
+        }
+
+
     }
 
     // change from date, update and call search functionality 

Apollo/assets/js/controllers/daybookadminCtrl.js

@@ -3,7 +3,7 @@
  * daybook details capturing
  * 
  */
-app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie) {
+app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window) {
 
     // get local client details
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
@@ -28,16 +28,19 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
              $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
             $scope.getIncomeExpenseType_Status();
             $scope.getDayBookList();
-        } else if(LOCALTYPE === 'R004') {
+        } else {
-            $scope.localTypeViewSuperAdmin = true;
+            ipCookie.remove('cookiechk');
-            $scope.showTheRefValue = 'I001';
+            $window.localStorage.clear();
-            $scope.localTypeViewAdmin = true;
+            $state.go('login.signin');
-            $scope.currentDate = new Date();
+            // $scope.localTypeViewSuperAdmin = true;
-            var formate = "dd-MM-yyyy";
+            // $scope.showTheRefValue = 'I001';
-            $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+            // $scope.localTypeViewAdmin = true;
-             $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
+            // $scope.currentDate = new Date();
-            $scope.getIncomeExpenseType_Status();
+            // var formate = "dd-MM-yyyy";
-            $scope.getDayBookList();    
+            // $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+            //  $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
+            // $scope.getIncomeExpenseType_Status();
+            // $scope.getDayBookList();    
         }
     }
 
@@ -93,11 +96,15 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
         });
     }
 
+     $scope.loadingsearch = false;
     $scope.noRecordFound = true;
+    $scope.noRecordFoundSearch = false;
       $scope.dataLengthIncome = 0;
       $scope.dataLengthExpense = 0;
       // day book entry list
     $scope.getDayBookList = function () {
+          $scope.loadingsearch = true;
+        $scope.noRecordFoundSearch = false;
         var getDatBookListDetails = {
             method: 'POST',
             url: apiPoint.url + 'getDayBookDetails/',
@@ -111,8 +118,14 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
         };
         $http(getDatBookListDetails).then(function (response) {
             if (response.data.dayBookListStatus) {
+                  $scope.loadingsearch = false;
                 // $scope.data = response.data.dayBookListDetails;
                 let datas = response.data.dayBookListDetails;
+                if (datas.length <= 0) {
+                    $scope.noRecordFoundSearch = true;
+                } else {
+                    $scope.noRecordFoundSearch = false;
+                }
                 let searchResultDetailsBef = datas.filter(val => {
                     return val.Name == 'I001' ? 1 : 0;
                 });
@@ -138,7 +151,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
                 // alert(JSON.stringify($scope.data));
                 // $scope.incomeExpenseType = response.data.typeNameList;
             } else {
-
+ $scope.loadingsearch = false;
             }
         });
     }

Apollo/assets/js/controllers/daybooksuperadminCtrl.js

@@ -3,7 +3,7 @@
  * daybook details capturing
  * 
  */
-app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie) {
+app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window) {
 
     // get local client details
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
@@ -19,7 +19,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
     // get details functionality when page get loaded
     $scope.init = function () {
         const LOCALTYPE = localDetail.localType;
-        if(LOCALTYPE === 'R004') {
+        if (LOCALTYPE === 'R004') {
             $scope.localTypeViewSuperAdmin = true;
             $scope.showTheRefValue = 'I001';
             $scope.localTypeViewAdmin = true;
@@ -30,13 +30,16 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
             $scope.getIncomeExpenseType_Status();
             $scope.getDayBookList();
         } else {
+                      ipCookie.remove('cookiechk');
+            $window.localStorage.clear();
+            $state.go('login.signin');
 
         }
     }
 
     // change from date, update and call search functionality 
     $scope.changeDate = function () {
-        if($scope.searchData.date !== undefined) {
+        if ($scope.searchData.date !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
             $scope.getDayBookList();
@@ -48,7 +51,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
 
     // change to date, update and call search functionality 
     $scope.changeToDate = function () {
-        if($scope.searchData.dateTo !== undefined) {
+        if ($scope.searchData.dateTo !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
             $scope.getDayBookList();
@@ -86,13 +89,15 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
     }
 
 
-
+    $scope.loadingsearch = false;
     $scope.noRecordFound = true;
+    $scope.noRecordFoundSearch = false;
     $scope.dataLengthIncome = 0;
     $scope.dataLengthExpense = 0;
     // day book entry list
     $scope.getDayBookList = function () {
-
+        $scope.loadingsearch = true;
+        $scope.noRecordFoundSearch = false;
         var getDatBookListDetails = {
             method: 'POST',
             url: apiPoint.url + 'getDayBookDetailsSuperAdmin/',
@@ -106,9 +111,14 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
         };
         $http(getDatBookListDetails).then(function (response) {
             if (response.data.dayBookListStatus) {
-
+                $scope.loadingsearch = false;
                 // $scope.data = response.data.dayBookListDetails;
                 let datas = response.data.dayBookListDetails;
+                if (datas.length <= 0) {
+                    $scope.noRecordFoundSearch = true;
+                } else {
+                    $scope.noRecordFoundSearch = false;
+                }
                 let searchResultDetailsBef = datas.filter(val => {
                     return val.Name == 'I001' ? 1 : 0;
                 });
@@ -135,7 +145,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
                 // alert(JSON.stringify($scope.data));
                 // $scope.incomeExpenseType = response.data.typeNameList;
             } else {
-
+                $scope.loadingsearch = false;
             }
         });
     }

Apollo/assets/js/controllers/studentCtrl.js

@@ -4,7 +4,7 @@
  * Simple table with sorting and filtering on AngularJS
  */
 
-app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory) {
+app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval) {
     /**
      * student details capture
      * by : kdk
@@ -82,14 +82,21 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
 
     // load when html page load
     $scope.init = function () {
+        $scope.todayDate = new Date();
         var nowInMS = new Date().getTime(),
             sixteenYearsInMS = 1000 * 60 * 60 * 24 * 365 * 16,
             sixteenYearsBeforeNow = new Date(nowInMS - sixteenYearsInMS);
         if (localDetail != null) {
+            if (localDetails.localType === 'R003' || localDetails.localType === 'R002') {
                 $scope.currentDate = new Date(sixteenYearsBeforeNow);
                 $scope.getStudentList();
                 $scope.getUniversityList();
-            $scope.myModel.dateofbirth=$filter('date')($scope.currentDate, 'dd-MM-yyyy');
+                $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy');
+            } else {
+                ipCookie.remove('cookiechk');
+                $window.localStorage.clear();
+                $state.go('login.signin');
+            }
         } else {
         }
     }
@@ -486,7 +493,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
         $scope.stepsModel.length = 0;
     }
 
-    $scope.getChangeDate = function() {
+    $scope.getChangeDate = function () {
         var formate = "dd-MM-yyyy";
         $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
 
@@ -693,7 +700,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
     }
 
     // update student details
-    $scope.updateStuDetails = function (form, p ,hidedob) {
+    $scope.updateStuDetails = function (form, p, hidedob) {
         var firstError = null;
         if (form.$invalid) {
             var field = null, firstError = null;
@@ -718,7 +725,883 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
             p.IsActive = p.IsActive === true ? 1 : 0;
             p.DOB = p.DOB == hidedob ? p.DOB : $filter('date')(new Date(p.DOB), formate);
 
-            if(idProof == undefined) {
+            if (idProof == undefined) {
+                // alert(idProof);
+                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");
+                    }
+                });
+            } else {
+                var formData = new FormData();
+                var idStuUpProof = $scope.filesEdit[0];
+                //   alert(idProof); 
+                formData.append("data", JSON.stringify(p));
+                formData.append("updatedBy", localDetails.localUserID);
+                formData.append('idStuUpProof', idStuUpProof);
+
+                $http.post(apiPoint.url + 'updateStudentImgDetails/', formData, {
+                    transformRequest: angular.identity,
+                    headers: { 'Content-Type': undefined, 'Process-Data': false },
+                }).success(function (data) {
+                    if (data.updateStuStatus == true) {
+                        swal("Success!", data.message, "success");
+                        $scope.getStudentList();
+                        $scope.editId = -1;
+                    } else {
+                        //  $scope.ldloading1[loading.replace('-', '_')] = false;
+                        swal("Failed!", data.message, "error");
+                    }
+                });
+            }
+        }
+    }
+
+}]);
+
+// Student datails for super admin : Start
+app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory) {
+    /**
+     * student details capture
+     * by : kdk
+     */
+
+
+    // get local client details
+    var localDetail = JSON.parse(localStorage.getItem('localObj'));
+    var localDetails = ipCookie('cookiechk');
+    $scope.localBranchDetails = "";
+    $scope.loader = false;
+
+    $scope.viewStudentDetailsPage = false;
+    // load when html page load
+    $scope.init = function () {
+        if (localDetail != null) {
+            if (localDetails.localType === 'R004') {
+                $scope.getBranchList();
+            } else {
+                ipCookie.remove('cookiechk');
+                $window.localStorage.clear();
+                $state.go('login.signin');
+            }
+        } else {
+        }
+    }
+
+
+    $scope.getBranchList = function () {
+        $scope.loader = true;
+        var empListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getBranchListDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(empListreq).then(function (response) {
+            if (response.data.branDetailstatus) {
+                 $scope.loader = false;
+                $scope.branchList_data = response.data.branch_details;
+            } else {
+            }
+        });
+    }
+
+    $scope.changeBranch = function () {
+        $scope.viewStudentDetailsPage = false;
+        localDetails.localBranchID = $scope.localBranchDetails;
+        localDetail.localBranchID = $scope.localBranchDetails;
+        getDetails()
+    }
+
+    function getDetails() {
+        $scope.todayDate = new Date();
+        var nowInMS = new Date().getTime(),
+            sixteenYearsInMS = 1000 * 60 * 60 * 24 * 365 * 16,
+            sixteenYearsBeforeNow = new Date(nowInMS - sixteenYearsInMS);
+        $scope.currentDate = new Date(sixteenYearsBeforeNow);
+        $scope.getStudentList();
+        $scope.getUniversityList();
+        $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy');
+        $scope.viewStudentDetailsPage = true;
+    }
+
+    $scope.myModel = {
+        'primaryPhone': '',
+        'firstname': '',
+        'lastname': '',
+        'fathername': '',
+        'mothername': '',
+        'emailId': '',
+        'secondaryPhone': '',
+        'dateofbirth': '',
+        'gender': '',
+        'aadharNumber': '',
+        'otherId': '',
+        'otherIdDetails': '',
+        'address1': '',
+        'address2': '',
+        'caste': '',
+        'category': '',
+        'religion': '',
+        'nationality': '',
+        'prequalification': '',
+        'occupation': '',
+        'designation': '',
+        'companyname': '',
+        'referredby': '',
+        'referredmobilenumber': '',
+        'switchsetting': true,
+        'DeactiveComments': '',
+        'Comments': ''
+    };
+
+    $scope.myModelCourse = {
+        'university': '',
+        'course': '',
+        'batch': '',
+        'dateofjoining': '',
+        'enrollmentid': ''
+    };
+
+    $scope.myModelCourseAdd = {
+        'university': '',
+        'course': '',
+        'batch': '',
+        'dateofjoining': '',
+        'enrollmentid': ''
+    };
+
+    $scope.addStudentView = function () {
+        // $scope.myModelCourseAdd = {
+        //     'university': '',
+        //     'course': '',
+        //     'batch': '',
+        //     'dateofjoining': '',
+        //     'enrollmentid': ''
+        // };
+        // $scope.courseDataAdd = '';
+        // $scope.batchDataAdd = '';
+    }
+
+
+
+    // 2017-11-23T00:00:00+0530
+    // sorting function for table params
+    $scope.sort = function (keyname) {
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
+
+
+
+
+    $scope.getStudentList = function () {
+        $scope.loader = true;
+        var empListreq = {
+            method: 'POST',
+            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.editId = -1;
+    $scope.editCourseId = -1;
+    $scope.setEditId = function (id) {
+        $scope.editId = id;
+        $scope.editCourseId = -1;
+    }
+
+    $scope.setEditCourseId = function (id) {
+        $scope.list = false;
+        $scope.getStudentCourseList(id);
+        $scope.currentStudentId = id;
+        // $scope.getStudentCourseDetails(id);
+        $scope.editCourseId = id;
+        $scope.editId = -1;
+        $scope.courseEditLoading = true;
+    }
+
+    $scope.cancel = function () {
+        $scope.getStudentList();
+        $scope.editId = -1;
+        $scope.editCourseId = -1;
+    }
+
+    $scope.cancelCourseDetails = function () {
+        $scope.getStudentCourseList($scope.currentStudentId);
+        // $scope.editId = -1;
+        // $scope.editCourseId = -1;
+    }
+
+    $scope.addStudentCourse = function () {
+        $scope.myModelCourse = {
+            'university': '',
+            'course': '',
+            'batch': '',
+            'dateofjoining': '',
+            'enrollmentid': ''
+        };
+        $scope.list = false;
+        $scope.courseEdit = false;
+        $scope.courseAdd = true;
+    }
+
+    // add student course
+    $scope.addCourseFORM = {
+
+        submit: function (form, myModelCourse, p) {
+            // alert();
+            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(JSON.stringify(p.StudentID));
+                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 + 'insertStudentCourse/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        addStudent: p.StudentID,
+                        coursedata: $scope.myModelCourse,
+                        loginBranch: localDetails.localBranchID,
+                        createdBy: localDetails.localUserID,
+                    }
+                };
+                $http(req).then(function (response) {
+                    if (response.data.addStuCourseStatus == true) {
+                        swal("Success!", response.data.message, "success");
+                        $scope.getStudentCourseList($scope.currentStudentId);
+                    } else {
+                        swal("Failed!", response.data.message, "error");
+                        $scope.getStudentCourseList($scope.currentStudentId);
+                    }
+                });
+            }
+        }
+    }
+
+    // get Student Course List
+    $scope.getStudentCourseList = function (studentId) {
+        $scope.courseEditLoading = true;
+        $scope.list = true;
+        $scope.courseEdit = false;
+        $scope.courseAdd = false;
+        var req = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentCourseList/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                studentID: studentId
+            }
+        };
+        $http(req).then(function (response) {
+            if (response.data.stuCourseDetails) {
+                $scope.courseEditLoading = false;
+                $scope.studentCourseList = response.data.course_details;
+                // $scope.stucour =  $scope.studentCourse[0];
+            } else {
+            }
+        });
+    }
+
+    // get student particular course details : params : studentCourseID
+    $scope.getStudentCourseDetails = function (studentcourseID) {
+        $scope.courseEditLoading = true;
+        $scope.stucour = '';
+        $scope.list = false;
+        $scope.courseAdd = false;
+        $scope.courseEdit = true;
+        var req = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentCourseDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                studentcourseId: studentcourseID
+            }
+        };
+        $http(req).then(function (response) {
+            if (response.data.stuCourseDetails) {
+                $scope.courseEditLoading = false;
+                $scope.studentCourse = response.data.course_details;
+                $scope.stucour = $scope.studentCourse[0];
+            } else {
+            }
+        });
+    }
+
+    // update sutdent course details
+    $scope.updateStudentCourseDetails = function (form, datas, hidedoj) {
+        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(datas.DOJ);
+            var formate = "dd-MM-yyyy";
+            var checkDOJ = $filter('date')(new Date(datas.DOJ), formate);
+            datas.IsActive = datas.IsActive === true ? 1 : 0;
+            datas.DOJ = datas.DOJ == hidedoj ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate);
+            // alert(datas.DOJ);
+            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.updateStuCourseStatus) {
+                    swal("Success!", response.data.message, "success");
+                    $scope.getStudentCourseList($scope.currentStudentId);
+                    // $scope.editCourseId = false;
+                } else {
+                    //  $scope.ldloading1[loading.replace('-', '_')] = false;
+                    swal("Failed!", response.data.message, "error");
+                    $scope.getStudentCourseList($scope.currentStudentId);
+                }
+            });
+        }
+    }
+
+
+    $scope.universityData = '';
+    $scope.getUniversityList = function () {
+        var empListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentUniversity/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(empListreq).then(function (response) {
+            if (response.data.univList) {
+                $scope.universityData = response.data.university_details;
+            } else {
+            }
+        });
+    }
+
+    $scope.onSlecetUnivEdit = function (id) {
+        $scope.myModelCourse.university = id;
+        $scope.onSlecetUniv();
+    }
+
+    $scope.onChangeSlecetUnivEdit = function (id) {
+        $scope.myModelCourse.university = id;
+        $scope.onSlecetUniv();
+        $scope.stucour.CourseID = '';
+        $scope.stucour.BatchCode = '';
+    }
+    $scope.courseLoading = false;
+    $scope.onSlecetUniv = function () {
+        $scope.courseData = '';
+        $scope.batchData = '';
+        $scope.myModelCourse.course = '';
+        $scope.myModelCourse.batch = '';
+        $scope.courseLoading = true;
+        var univListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getCourseBatchForUniv/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.myModelCourse.university
+            }
+        };
+        $http(univListreq).then(function (response) {
+            if (response.data.courseStatus) {
+                $scope.courseLoading = false;
+                $scope.courseData = response.data.course_details;
+                $scope.batchData = response.data.batch_details;
+            } else {
+                $scope.courseLoading = false;
+            }
+        });
+    }
+
+
+    $scope.onSlecetUnivAdd = function () {
+        $scope.courseDataAdd = '';
+        $scope.batchDataAdd = '';
+        $scope.myModelCourseAdd.course = '';
+        $scope.myModelCourseAdd.batch = '';
+        $scope.courseLoading = true;
+        var univListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getCourseBatchForUniv/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.myModelCourseAdd.university
+            }
+        };
+        $http(univListreq).then(function (response) {
+            if (response.data.courseStatus) {
+                $scope.courseLoading = false;
+                $scope.courseDataAdd = response.data.course_details;
+                $scope.batchDataAdd = response.data.batch_details;
+            } else {
+                $scope.courseLoading = false;
+            }
+        });
+    }
+
+    // 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 {
+            }
+        });
+    }
+
+    //-------------------------------------------------------------->
+    // getting for image to show
+    //-------------------------------------------------------------->
+
+    $scope.stepsModel = [];
+    $scope.imageUpload = function (event) {
+        var files = event.target.files; //FileList object
+
+        for (var i = 0; i < files.length; i++) {
+            var file = files[i];
+            var reader = new FileReader();
+            reader.onload = $scope.imageIsLoaded;
+            reader.readAsDataURL(file);
+        }
+    }
+
+    $scope.imageIsLoaded = function (e) {
+        $scope.$apply(function () {
+            // $scope.stepsModel.push(e.target.result);
+            $scope.stepsModel[0] = e.target.result;
+        });
+    }
+
+    //an array of files selected
+    $scope.files = [];
+
+    //listen for the file selected event
+    $scope.$on("fileSelected", function (event, args) {
+        $scope.$apply(function () {
+            //add the file object to the scope's files collection
+            $scope.files[0] = args.file;
+        });
+    });
+
+    // reset image
+    $scope.resetImage = function () {
+        $scope.files.length = 0;
+        $scope.stepsModel.length = 0;
+    }
+
+    $scope.getChangeDate = function () {
+        var formate = "dd-MM-yyyy";
+        $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
+
+    }
+
+    $scope.tabactive1 = false;
+    $scope.tabactive2 = false;
+    $scope.tabActive = function (val) {
+        if (val === 'tabactive1') {
+            $scope.tabactive1 = true;
+            $scope.tabactive2 = false;
+        } else if (val === 'tabactive2') {
+            $scope.tabactive2 = true;
+            $scope.tabactive1 = false;
+        }
+    }
+
+    $scope.myActivateDiv = function() {
+         $scope.viewStudentDetailsPage = false;
+           $scope.myModel = {
+                'employeeId': '',
+                'firstname': '',
+                'lastname': '',
+                'fathername': '',
+                'mothername': '',
+                'emailId': '',
+                'primaryPhone': '',
+                'secondaryPhone': '',
+                'dateofbirth': '',
+                'gender': '',
+                'qualificaion': '',
+                'aadharNumber': '',
+                'otherId': '',
+                'otherIdDetails': '',
+                'address1': '',
+                'address2': '',
+                'homeBranch': '',
+                'dateofjoining': '',
+                'dateofjoining': '',
+                'role': '',
+                'switchsetting': true,
+                'DeactiveComments': '',
+                'Comments': ''
+            };
+              $scope.myModelCourseAdd = {
+                'university': '',
+                'course': '',
+                'batch': '',
+                'dateofjoining': '',
+                'enrollmentid': ''
+            };
+                       $timeout(function(){
+              getDetails();
+      },1000);
+    }
+
+    // add student
+    $scope.studentFORM = {
+        submit: function (form, myModel, myModelCourseAdd) {
+            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 {
+                $scope.disableButton = true;
+                var formate = "dd-MM-yyyy";
+                $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0;
+                $scope.myModelCourseAdd.dateofjoining = $filter('date')(new Date($scope.myModelCourseAdd.dateofjoining), formate);
+                var idStuProof = $scope.files[0];
+
+                if (idStuProof !== undefined) {
+                    var formData = new FormData();
+                    var idProof = $scope.files[0];
+                    //   alert(idProof); 
+                    formData.append("data", JSON.stringify($scope.myModel));
+                    formData.append("coursedata", JSON.stringify($scope.myModelCourseAdd));
+                    formData.append("createdBy", localDetails.localUserID);
+                    formData.append("loginBranch", localDetails.localBranchID);
+                    formData.append('idStuProof', idStuProof);
+
+                    $http.post(apiPoint.url + 'insertStudentImg/', formData, {
+                        transformRequest: angular.identity,
+                        headers: { 'Content-Type': undefined, 'Process-Data': false },
+                    }).success(function (data) {
+                        if (data.addStudentStatus == true) {
+                            swal("Success!", data.message, "success");
+                            $scope.disableButton = false;
+                            $scope.viewStudentDetailsPage = false;
+                            // $state.go($state.current, {}, { reload: true });
+                            $scope.myActivateDiv();
+                            // $scope.tabactive2 = false;
+                                //   $scope.viewStudentDetailsPage = false;
+                            // $scope.tabActive('tabactive1');
+                        } else {
+                            //  $scope.ldloading1[loading.replace('-', '_')] = false;
+                            swal("Failed!", data.message, "error");
+                        }
+                    });
+                } else {
+                    var req = {
+                        method: 'POST',
+                        url: apiPoint.url + 'insertStudent/',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        data: {
+                            data: $scope.myModel,
+                            coursedata: $scope.myModelCourseAdd,
+                            loginBranch: localDetails.localBranchID,
+                            createdBy: localDetails.localUserID,
+                        }
+                    };
+                    $http(req).then(function (response) {
+                        if (response.data.addStudentStatus == true) {
+                            swal("Success!", response.data.message, "success");
+                            $scope.disableButton = false;
+                            $scope.viewStudentDetailsPage = false;
+                            // $state.go($state.current, {}, { reload: true });
+                            $scope.myActivateDiv();
+                            // $scope.tabactive1 = true;
+                            //  $scope.tabactive2 = false;
+                                   
+                            // $scope.tabActive('tabactive1');
+                        } else {
+                            $scope.disableButton = false;
+                            swal("Failed!", response.data.message, "error");
+                        }
+                    });
+                }
+            }
+        },
+        reset: function (form) {
+            // $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                'employeeId': '',
+                'firstname': '',
+                'lastname': '',
+                'fathername': '',
+                'mothername': '',
+                'emailId': '',
+                'primaryPhone': '',
+                'secondaryPhone': '',
+                'dateofbirth': '',
+                'gender': '',
+                'qualificaion': '',
+                'aadharNumber': '',
+                'otherId': '',
+                'otherIdDetails': '',
+                'address1': '',
+                'address2': '',
+                'homeBranch': '',
+                'dateofjoining': '',
+                'dateofjoining': '',
+                'role': '',
+                'switchsetting': true,
+                'DeactiveComments': '',
+                'Comments': ''
+            };
+        }, 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 {
+            }
+        });
+    }
+
+
+
+    $scope.stepsModelEdit = [];
+    $scope.imageUploadEdit = function (event) {
+        var files = event.target.files; //FileList object
+
+        for (var i = 0; i < files.length; i++) {
+            var file = files[i];
+            var reader = new FileReader();
+            reader.onload = $scope.imageIsLoadedEdit;
+            reader.readAsDataURL(file);
+        }
+    }
+
+    $scope.imageIsLoadedEdit = function (e) {
+        $scope.$apply(function () {
+            // $scope.stepsModel.push(e.target.result);
+            $scope.stepsModelEdit[0] = e.target.result;
+        });
+    }
+
+    //an array of files selected
+    $scope.filesEdit = [];
+    //listen for the file selected event
+    $scope.$on("fileSelectedEdit", function (event, args) {
+        $scope.$apply(function () {
+            //add the file object to the scope's files collection
+            $scope.filesEdit[0] = args.file;
+        });
+    });
+
+
+    // reset image for Edit
+    $scope.resetImageEdit = function () {
+        $scope.filesEdit.length = 0;
+        $scope.stepsModelEdit.length = 0;
+    }
+
+    // update student details
+    $scope.updateStuDetails = function (form, p, hidedob) {
+        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 idProof = $scope.filesEdit[0];
+
+            var formate = "dd-MM-yyyy";
+            var checkDOB = $filter('date')(new Date(p.DOB), formate);
+            p.IsActive = p.IsActive === true ? 1 : 0;
+            p.DOB = p.DOB == hidedob ? p.DOB : $filter('date')(new Date(p.DOB), formate);
+
+            if (idProof == undefined) {
                 // alert(idProof);
                 var req = {
                     method: 'POST',

Apollo/assets/views/daybook/daybookadmin.html

@@ -104,6 +104,16 @@
 
                                         </div>
                                     </div>-->
+                                      <div>
+                                            <div ng-show="loadingsearch" class="center">
+                                                <span  style="color: #007AFF;
+    font-size: 16px;">Loading...</span>
+                                            </div>
+                                        </div>
+                                           <div class="center" ng-show="noRecordFoundSearch">
+                                                 <p style="color: red;" align="center"><strong><h3 class="text-center">No
+                                records found... </h3></strong></p>
+                                            </div>
                                     <div ng-if="showTheRefValue == 'I002'">
                                         <style>
                                             .listCoutShow {
@@ -119,7 +129,7 @@
                                             }
                                         </style>
 
-                                        <div class="row">
+                                        <div class="row" ng-if="searchResultLength > 0">
                                             <div class="pull-right">
                                                 <div style="margin: 8px;">
                                                     <div style="width: 45px; display: initial;">
@@ -215,7 +225,7 @@
                                         </style>
 
                                         <div class="row">
-                                            <div class="pull-right">
+                                            <div class="pull-right"  ng-if="searchResultLength > 0">
                                                 <div style="margin: 8px;">
                                                     <div style="width: 45px; display: initial;">
                                                         <span style="font-size: 14px;

Apollo/assets/views/daybook/daybooksuperadmin.html

@@ -104,6 +104,16 @@
 
                                         </div>
                                     </div>-->
+                                      <div>
+                                            <div ng-show="loadingsearch" class="center">
+                                                <span  style="color: #007AFF;
+    font-size: 16px;">Loading...</span>
+                                            </div>
+                                        </div>
+                                           <div class="center" ng-show="noRecordFoundSearch">
+                                                 <p style="color: red;" align="center"><strong><h3 class="text-center">No
+                                records found... </h3></strong></p>
+                                            </div>
                                     <div ng-if="showTheRefValue == 'I002'">
                                         <style>
                                             .listCoutShow {
@@ -119,7 +129,7 @@
                                             }
                                         </style>
 
-                                        <div class="row">
+                                        <div class="row" ng-if="searchResultLength > 0">
                                             <div class="pull-right">
                                                 <div style="margin: 8px;">
                                                     <div style="width: 45px; display: initial;">
@@ -130,7 +140,11 @@
                                                 </div>
                                             </div>
                                         </div>
+
+                                      
+                                      
                                         <div class="table-responsive">
+                                         
                                             <table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
                                                 <thead>
                                                     <tr>
@@ -216,7 +230,7 @@
                                             }
                                         </style>
 
-                                        <div class="row">
+                                        <div class="row" ng-if="searchResultLength > 0">
                                             <div class="pull-right">
                                                 <div style="margin: 8px;">
                                                     <div style="width: 45px; display: initial;">

Apollo/assets/views/partials/nav.html

@@ -1,7 +1,6 @@
-
 <!-- start: MAIN NAVIGATION MENU -->
 
- <!-- start: Super Admin -->
+<!-- start: Super Admin -->
 
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'superAdmin'">
 	<li ui-sref-active="active">
@@ -28,12 +27,12 @@
 			</div>
 		</a>
 		<ul class="sub-menu">
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.status">
 					<span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.studentStatusUpdate">
 					<span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span>
 				</a>
@@ -64,17 +63,17 @@
 					<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.employee">
 					<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.announcement">
 					<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.dayBookMaster">
 					<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
 				</a>
@@ -96,11 +95,11 @@
 			</div>
 		</a>
 		<ul class="sub-menu">
-			<!--<li ui-sref-active="active">
+			<li ui-sref-active="active">
-				<a ui-sref="app.student.studentDetails">
+				<a ui-sref="app.student.studentDetailsSuperAdmin">
-					<span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span>
+					<span class="title" translate="sidebar.nav.student.STUDENTDETAILSADDEDIT"> STUDENT DETAILS </span>
 				</a>
-			</li>-->
+			</li>
 			<li ui-sref-active="active">
 				<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.STUDENTFEES">
 					Fess
@@ -189,9 +188,9 @@
 	</li>
 </ul>
 
- <!-- end: Super Admin -->
+<!-- end: Super Admin -->
 
- <!-- start: Admin -->
+<!-- start: Admin -->
 
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'Admin'">
 	<li ui-sref-active="active">
@@ -244,17 +243,17 @@
 					<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
 				</a>
 			</li>-->
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.employee">
 					<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.announcement">
 					<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
 				</a>
 			</li>
-				<li ui-sref-active="active" >
+			<li ui-sref-active="active">
 				<a ui-sref="app.master.certificateType">
 					<span class="title" translate="sidebar.nav.master.CERTIFICATETYPE"> CERTIFICATETYPE</span>
 				</a>
@@ -400,9 +399,9 @@
 	</li>
 </ul>
 
- <!-- end: Admin -->
+<!-- end: Admin -->
 
- <!-- start: Staff -->
+<!-- start: Staff -->
 
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'staff'">
 	<li ui-sref-active="active">
@@ -525,7 +524,7 @@
 
 </ul>
 
- <!-- end: Staff -->
+<!-- end: Staff -->
 
 <!-- end: MAIN NAVIGATION MENU -->
 <!-- start: CORE FEATURES -->

Apollo/assets/views/student/editStudentCourseDetails.html

@@ -113,7 +113,7 @@
                                             </label>
                                 <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" />
+                                    placeholder="Select Date of Joining" close-text="Close" required="required" max-date="todayDate"/>
 
                                 <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
                             </div>
@@ -248,7 +248,7 @@
                                 <input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourse.dateofjoining"
                                     is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
                                     placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
-                                />
+                                max-date="todayDate"/>
 
                                 <span class="error text-small block" ng-if="FormAdd.dateofjoining.$dirty && FormAdd.dateofjoining.$error.required">Date of Joining required</span>
                             </div>

Apollo/assets/views/student/student_details.html

@@ -10,6 +10,28 @@
 <!-- end: STUDENT TITLE -->
 <!-- start: LIST GROUP -->
 <div class="container-fluid container-fullw bg-white">
+    <style>
+                /*#wrapper {
+                    width: 200px;
+                    height: 110px;
+                }*/
+
+                #containersPara {
+                    /*background-color: #fff;*/
+                    width: 180px;
+                    height: 75px;
+                    /*overflow-x: scroll;*/
+                    /*color: rgba(7, 21, 176, 0.7);*/
+                    overflow: auto
+                }
+                /*.square {
+                    background-color: #00b;
+                    float: left;
+                    height: 90px;
+                    width: 90px;
+                    margin: 5px;
+                }*/
+            </style>
     <div class="row" ng-controller="studentCtrl" data-ng-init="init()">
         <tabset class="tabbable">
             <tab heading="View Student" id="studentbranch">
@@ -72,7 +94,7 @@
                                             <td>{{p.Fathername}}</td>
                                             <td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
                                                 <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
-                                            <td style="width: 275px !important;">{{p.Comments}}</td>
+                                            <td><div id="containersPara">{{p.Comments}}</div></td>
                                             <td style="text-align: center;">
                                                 <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
                                                     ng-click="setEditId(p.StudentID);">
@@ -563,7 +585,7 @@
                                             <input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
                                                 is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
                                                 placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
-                                            />
+                                             max-date="todayDate"/>
 
                                             <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span>
                                         </div>

Apollo/assets/views/student/student_details_SuperAdmin.html

@@ -0,0 +1,651 @@
+<!-- start: STUDENT TITLE -->
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle" translate="Add/Edit Student Details">{{ mainTitle }}</h1>
+        </div>
+        <div ncy-breadcrumb></div>
+    </div>
+</section>
+<!-- end: STUDENT TITLE -->
+<!-- start: LIST GROUP -->
+<div ng-controller="studentSuperAdminCtrl" class="container-fluid container-fullw bg-white">
+    
+     <style>
+                /*#wrapper {
+                    width: 200px;
+                    height: 110px;
+                }*/
+
+                #containersPara {
+                    /*background-color: #fff;*/
+                    width: 180px;
+                    height: 75px;
+                    /*overflow-x: scroll;*/
+                    /*color: rgba(7, 21, 176, 0.7);*/
+                    overflow: auto
+                }
+                /*.square {
+                    background-color: #00b;
+                    float: left;
+                    height: 90px;
+                    width: 90px;
+                    margin: 5px;
+                }*/
+            </style>
+    <div ng-init="init()">
+        <div class="row">
+            <div class="col-lg-4"></div> 
+            <div class="col-lg-4"> 
+            <div>
+                <label for="form-field-select-2">
+                                             Select Branch 
+                                            </label>
+
+                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
+                    required>
+									<option value="" disabled selected>Select Branch</option>
+										<option ng-repeat="bdata in branchList_data"  value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
+								</select>
+              
+            </div>
+            <!-- ng-if="loader == true"-->
+            <span ng-if="loader == true" style="color: #007AFF;
+    font-size: 16px;">Loading...</span>
+            </div>
+            <div class="col-lg-4"></div> 
+        </div>  
+        <br>
+       
+    <div class="row" ng-if="viewStudentDetailsPage">
+        <!--{{tab1}}
+         <button ng-click="tabActive('0')" value="Tab1">Tab1</button>
+          <button ng-click="tabActive('1')" value="Tab2">Tab2</button>-->
+        <tabset id="here" class="tabbable" ng-init="tabActive('tabactive1')">
+            <tab active="tabactive1" ng-click="tabActive('tabactive1')" 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">
+                            <spinner name="html5spinner">
+                                <div class="overlay"></div>
+                                <div class="spinner">
+                                    <div class="double-bounce1"></div>
+                                    <div class="double-bounce2"></div>
+                                </div>
+                                <div class="please-wait">Please Wait...</div>
+                            </spinner>
+                        </div>
+
+                        <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="studentData == true">
+                            <div class="row">
+                                <div class="col-md-3">
+                                    <script>
+                                        $(function () {
+                                            $("#search").focus();
+                                        });
+                                    </script>
+                                    <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
+                                </div>
+                            </div>
+                            <div class="table-responsive">
+                                <table class="table table-hover">
+                                    <thead>
+                                        <tr>
+                                            <th ng-click="sort('MobileNumber')">MobileNumber
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('Firstname')">Student Name
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('Fathername')">Father Name
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('Fathername')">Status
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th>Comments
+                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            </th>
+                                            <th style="text-align: center;"> Details
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
+                                        <tr>
+                                            <td>{{p.MobileNumber}}</td>
+                                            <td>{{p.Firstname}} {{p.Lastname}}</td>
+                                            <td>{{p.Fathername}}</td>
+                                            <td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
+                                                <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
+                                            <td><div id="containersPara">{{p.Comments}}</div></td>
+                                            <td style="text-align: center;">
+                                                <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
+                                                    ng-click="setEditId(p.StudentID);">
+                                                <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.StudentID" ng-if="editId === p.StudentID">
+                                            <td colspan="6" ng-include src="'assets/views/student/editStudentDetails.html'"></td>
+                                        </tr>
+                                        <tr ng-show="editCourseId === p.StudentID" ng-if="editCourseId === p.StudentID">
+                                            <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>
+
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </tab>
+            <script>
+                $('#addbranch').click(function () {
+                    $('#branchcode').focus();
+                });
+            </script>
+            <style>
+                .sort-icon {
+                    font-size: 9px;
+                    margin-left: 5px;
+                }
+
+                th {
+                    cursor: pointer;
+                }
+            </style>
+
+
+            <tab active="tabactive2" ng-click="tabActive('tabactive1')" heading="Add Student" id="addstudent" ng-click="addStudentView()">
+                 <!--<button ng-click="tabActive('0')" value="Tab1">Tab1</button>-->
+                <div>
+                <!--<button ng-click="myActivateDiv()">Click Me</button>-->
+                    <form name="Form" id="form" novalidate ng-submit="studentFORM.submit(Form, myModel)" method="post">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <fieldset style="background-color: #eaeaea;">
+                                    <legend>
+                                        Personal Details
+                                    </legend>
+                                    <div class="row">
+                                        <div class="col-md-8">
+                                        </div>
+                                        <div class="col-md-4">
+                                            <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
+                                                <div class="file-upload">
+                                                    <div class="row">
+                                                        <div class="col-md-6">
+                                                            <div class="form-group">
+                                                                <div class="user-image">
+                                                                    <h5>Profile Picture</h5>
+                                                                    <div class=" margin-bottom-5">
+                                                                    </div>
+                                                                </div>
+                                                                <!--<input type="file" file-model="idProof"
+                                                                       accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
+
+                                                                <input type="file" ng-init="resetImage()" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)"
+                                                                />
+
+                                                                <style>
+                                                                    .thumb {
+                                                                        width: 90px;
+                                                                        height: 115px;
+                                                                        margin: 18px;
+                                                                        float: left;
+                                                                    }
+
+                                                                    .uploader {
+                                                                        clear: both;
+                                                                    }
+                                                                </style>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-6">
+                                                            <div>
+                                                                <div ng-repeat="step in stepsModel">
+                                                                    <!--<a class="close-thin"></a>-->
+                                                                    <img class="thumb" ng-src="{{step}}" />
+                                                                    <div class="col-md-12">
+                                                                        <div class="pull-right">
+                                                                            <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
+                                                                    </button>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                    <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="myModel.primaryPhone"
+                                                ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='checkMobileExist()'
+                                                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="myModel.firstname"
+                                                ng-pattern="/^[a-zA-Z.\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="myModel.lastname"
+                                                ng-pattern="/^[a-zA-Z.\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="myModel.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="myModel.mothername"
+                                                ng-pattern="/^[a-zA-Z.\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="myModel.emailId" 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="myModel.secondaryPhone"
+                                                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="myModel.dateofbirth"
+                                                    is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
+                                                    placeholder="Select Date of Birth" close-text="Close" required="required"
+                                                    ng-change="getChangeDate()" show-button-bar="false" 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="myModel.gender" required>
+                                                <label for="female">
+											     Female
+										        </label>
+                                                <input type="radio" id="male" name="gender" value="male" ng-model="myModel.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="myModel.address1"></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="myModel.address2"></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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.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="myModel.referredmobilenumber" 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 class="col-md-4">
+                                            <label>
+                                                 Comments
+                                            </label>
+                                            <textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea>
+                                            <span class="text-small block">Comments Should be Less than 100 Characters.</span>
+                                            <!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4">
+                                            <label>
+                                                Active/De-Active
+                                            </label>
+
+                                            <div ng-switch="myModel.switchsetting">
+                                                <div ng-switch-when="true">
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+                                                </div>
+                                                <div ng-switch-when="false">
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
+                                                </div>
+                                                <div ng-switch-default>
+                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-4" ng-if="myModel.switchsetting == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}">
+                                            <label>
+                                                Reason for Deactivating <span class="symbol required"></span>
+                                            </label>
+                                            <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments"
+                                                ng-model="myModel.DeactiveComments" required></textarea>
+                                            <span class="text-small block">Comments Should be Less than 100 Characters.</span>
+                                            <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
+                                        </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>
+                                    <legend>
+                                        Course Details
+                                    </legend>
+                                    <div class="row">
+                                        <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="myModelCourseAdd.university"
+                                                ng-change="onSlecetUnivAdd()" 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-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">
+                                                <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
+                                            </div>
+                                            <div ng-if="courseLoading == false">
+                                                <select class="form-control" tabindex="26" name="course" ng-model="myModelCourseAdd.course" class="cs-select cs-skin-elastic"
+                                                    required>
+									<option value="" disabled selected>Select Course</option>
+									<option ng-repeat="item in courseDataAdd" value="{{item.CourseID}}">{{item.CourseName}}</option>
+								            </select>
+                                            </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-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">
+                                                <span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
+                                            </div>
+                                            <div ng-if="courseLoading == false">
+                                                <select class="form-control" tabindex="26" name="batch" ng-model="myModelCourseAdd.batch" class="cs-select cs-skin-elastic"
+                                                    required>
+									<option value="" disabled selected>Select Batch</option>
+									<option ng-repeat="item in batchDataAdd" value="{{item.BatchCode}}">{{item.BatchName}}</option>
+								            </select>
+                                            </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="myModelCourseAdd.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-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>
+                                            <style>
+                                                .dropdown-menu {
+                                                    position: relative;
+                                                    /*top: -225px !important;*/
+                                                }
+                                            </style>
+                                            <input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
+                                                is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
+                                                placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
+                                                max-date="todayDate"
+                                            />
+
+                                            <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" ng-disabled="disableButton" 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.resetCourse(Form)">
+                                                Reset
+                                            </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </fieldset>
+                                <!--<pre> {{ myModel | json }}</pre>
+                                <pre> {{ myModelCourse | json }}</pre>-->
+                                <!--{"isNavbarFixed":true,"isSidebarFixed":true,"isSidebarClosed":true,"isFooterFixed":false,"theme":"theme-5","logo":"assets/images/logo.png"}-->
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </tab>
+        </tabset>
+    </div>
+    </div>
+</div>
+
+<!-- end: LIST GROUP -->