diff --git a/Apollo/api/application/controllers/Announcement_Controller.php b/Apollo/api/application/controllers/Announcement_Controller.php index d919d4b9..3bdf0b7e 100644 --- a/Apollo/api/application/controllers/Announcement_Controller.php +++ b/Apollo/api/application/controllers/Announcement_Controller.php @@ -111,8 +111,9 @@ class Announcement_Controller extends REST_Controller { $details['Heading'] = $this->post('Heading'); $details['Description'] = $this->post('description'); $details['IsActive'] = $this->post('status'); - $details['UpdatedBy'] = $this->post('updatedBy'); - $details['UpdatedOn'] = date("Y-m-d", time()); + $details['UpdatedBy'] = $this->post('createdBy'); + $date = date('Y-m-d H:i:s'); + $details['UpdatedOn'] = $date; $announcementDetails = $this->announcement_model->updateAnnouncement($details,$updateID);// Check if the users data store contains users (in case the database result returns NULL) if ($announcementDetails) @@ -129,7 +130,5 @@ class Announcement_Controller extends REST_Controller { 'status' => REST_Controller::HTTP_NOT_FOUND ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } - - } } \ No newline at end of file diff --git a/Apollo/api/application/models/Forgot_model.php b/Apollo/api/application/models/Forgot_model.php index 7b0eaf4a..cbeada85 100644 --- a/Apollo/api/application/models/Forgot_model.php +++ b/Apollo/api/application/models/Forgot_model.php @@ -15,34 +15,40 @@ class Forgot_model extends CI_Model { $this->db->select('ID,Emailid,MobileNumber,Password'); $this->db->from(LOGIN); $this->db->where('MobileNumber', $user['MobileNumber']); - - $forgotDetails = $this->db->get()->first_row(); + $forgotDetails1 = $this->db->get()->first_row(); // echo $forgotDetails->MobileNumber;exit(); - - // $result = $query->result_array(); - if($forgotDetails){ - $existUserID=$forgotDetails->ID; - $this->db->where('ID', $existUserID); - $upatePassword=$this->db->update('T_Login', $user); - // print_r ($upatePassword) ; - //exit(); - if($upatePassword) { - $this->smssend($user['MobileNumber'], $password); - $result['forgotstatus'] = true; - $result['resPass'] = "Check your registered Mobile Number!!"; - $result['message'] = "Password updated successfully"; - } - else{ - $result['forgotstatus'] = false; - $result['message'] = "Something went wrong!"; - } - + // $result = $query->result_array(); + if($forgotDetails1){ + $this->db->select('ID,Emailid,MobileNumber,Password'); + $this->db->from(LOGIN); + $this->db->where('MobileNumber', $user['MobileNumber']); + $this->db->where('IsActive', 1); + $forgotDetails = $this->db->get()->first_row(); + if($forgotDetails) { + $existUserID=$forgotDetails->ID; + $this->db->where('ID', $existUserID); + $upatePassword=$this->db->update('T_Login', $user); + // print_r ($upatePassword) ; + //exit(); + if($upatePassword) { + $this->smssend($user['MobileNumber'], $password); + $result['forgotstatus'] = true; + $result['resPass'] = "Check your registered Mobile Number!!"; + $result['message'] = "Password updated successfully"; + } + else{ + $result['forgotstatus'] = false; + $result['message'] = "Something went wrong!"; + } + } else { + $result['forgotstatus'] = false; + $result['message'] = "This user in InActive state!"; + } } else { $result['forgotstatus'] = false; $result['message'] = "User is not exist!"; } - return $result; } diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index f4f8ffeb..7da67c6a 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -55,7 +55,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com .state('app', { url: "/app", templateUrl: "assets/views/app.html", - resolve: loadSequence('sessionCtrl', 'modernizr', 'moment', 'angularMoment', 'uiSwitch', 'perfect-scrollbar-plugin', 'toaster', 'ngAside', 'vAccordion', 'sweet-alert', 'chartjs', 'tc.chartjs', 'oitozero.ngSweetAlert', 'chatCtrl'), + resolve: loadSequence('sessionCtrl', 'modernizr', 'moment', 'angularMoment', 'uiSwitch', 'perfect-scrollbar-plugin', 'toaster', 'ngAside', 'vAccordion', 'sweet-alert', 'chartjs', 'tc.chartjs', 'oitozero.ngSweetAlert', 'chatCtrl', 'flow'), abstract: true }).state('app.dashboard', { url: "/dashboard", diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 6a2ffb1a..7911e2eb 100644 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -4,7 +4,20 @@ * Simple table with sorting and filtering on AngularJS */ -app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window) { +app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http",'fileUpload', "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", function ($scope, toaster, $filter, ngTableParams, $http, fileUpload, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory) { + + + // $scope.removeImage = function () { + // $scope.noImage = true; + // }; + // $scope.obj = new Flow(); + + // if ($scope.userInfo.avatar == '') { + // $scope.noImage = true; + // } + + + /** * staff details capture * by : kdk @@ -406,7 +419,11 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }); } - $scope.updateEmpDetails = function (form, p) { + $scope.hidden_DOB= ''; + $scope.hidden_DOJ= ''; + + $scope.updateEmpDetails = function (form, p, hide_dob, hide_doj) { + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -423,13 +440,15 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ angular.element('.ng-invalid[name=' + firstError + ']').focus(); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { - // alert(p.DOB); var formate = "dd-MM-yyyy"; - var checkDOB = $filter('date')(new Date(p.DOB), formate); - var checkDOJ = $filter('date')(new Date(p.DOJ), formate); + // var checkDOB = $filter('date')(new Date(p.DOB), formate); + // var checkDOJ = $filter('date')(new Date(p.DOJ), formate); + // alert(checkDOB); + // alert(checkDOJ); p.IsActive = p.IsActive === true ? 1 : 0; - p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate); - p.DOJ = checkDOJ == "NaN-NaN-0NaN" ? p.DOJ : $filter('date')(new Date(p.DOJ), formate); + p.DOB = p.DOB == hide_dob ? p.DOB : $filter('date')(new Date(p.DOB), formate); + p.DOJ = p.DOJ == hide_doj ? p.DOJ : $filter('date')(new Date(p.DOJ), formate); + var req = { method: 'POST', url: apiPoint.url + 'updateEmpExistDetail/', @@ -507,4 +526,266 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ } } + + + $scope.uploadFile = function () { + +alert(); + + // var customer_name = $scope.customer_name; + // console.log(customer_name); + + // var userId = $scope.userId; + // console.log(userId); + + // var cafNo = $scope.cafNo; + // console.log(cafNo); + + // var primaryEmail = $scope.primaryEmail; + // console.log(primaryEmail); + + // var primaryPhone = $scope.primaryPhone; + // console.log(primaryPhone); + + // var presentAddress = $scope.presentAddress; + // console.log(presentAddress); + + // var createdBy = localStorage.getItem('id'); + // // console.log('Id is '); + // console.log(createdBy); + + // var idProof = $scope.idProof; + // console.log('Id Proof is '); + // console.dir(idProof); + + // var addressProof = $scope.addressProof; + // console.log('address Proof is '); + // console.dir(addressProof); + + // var cafForm = $scope.cafForm; + // console.log('caf Form is '); + // console.dir(cafForm); + + var uploadUrl = apiPoint.url + "addschoolimage.php"; + + fileUpload.uploadFileToUrl(customer_name, userId, cafNo, primaryEmail, primaryPhone, presentAddress, createdBy, idProof, addressProof, cafForm, uploadUrl); + + + + + }; + }]); + + +'use strict'; +/** + * controllers used for the dashboard + */ + +app.directive('fileModel', ['$parse', function ($parse) { + return { + restrict: 'A', + link: function (scope, element, attrs) { + var model = $parse(attrs.fileModel); + var modelSetter = model.assign; + + element.bind('change', function () { + scope.$apply(function () { + modelSetter(scope, element[0].files[0]); + }); + }); + } + }; +}]); + +// We can write our own fileUpload service to reuse it in the controller +app.service('fileUpload', ['$http', '$state', function ($http, $state) { + this.uploadFileToUrl = function (customer_name, userId, cafNo, primaryEmail, primaryPhone, presentAddress, createdBy, idProof, addressProof, cafForm, uploadUrl) { + var fd = new FormData(); + fd.append('customer_name', customer_name); + fd.append('userId', userId); + fd.append('cafNo', cafNo); + fd.append('primaryEmail', primaryEmail); + fd.append('primaryPhone', primaryPhone); + fd.append('presentAddress', presentAddress); + fd.append('createdBy', createdBy); + fd.append('idProof', idProof); + fd.append('addressProof', addressProof); + fd.append('cafForm', cafForm); + $http.post(uploadUrl, fd, { + transformRequest: angular.identity, + headers: {'Content-Type': undefined, 'Process-Data': false}, + + }) + .success(function (data) { + if (data.status == true) { + console.log("Success"); + swal("Success!", "Profile image is updated successfully!", "success"); + $state.go($state.current, {}, {reload: true}); + }else if(data.status_1 == true){ + swal("Success!", "school logo is updated successfully!", "success"); + $state.go($state.current, {}, {reload: true}); + }else if(data.status_2 == false){ + swal("Failed!", "Select Image for uploading!", "error"); + }else if(data.status_3 == false){ + swal("Failed!", "Image Size Should Be Less Than 5 Mb!", "error"); + } + else if(data.status_4 == false){ + swal("Failed!", "Image Size Should Be More Than 50 Kb!", "error"); + }else{ + swal("Failed!", "Image uploading has failed!", "error"); + } + }); + } + + +}]); + +app.controller('tarrifimage', ['$scope', '$state', '$http', 'fileUpload', 'API_POINTS', 'ngTableParams', '$filter', function ($scope, $state, $http, fileUpload, apiPoint, ngTableParams, $filter) { + + + $scope.idProof_check = false; + $scope.customerID = ''; + $scope.customerCafNo = ''; + $scope.new_id_form = ''; + + + $scope.address_check = false; + $scope.custID = ''; + $scope.cusCafNo = ''; + + + $scope.checked_check = false; + $scope.cafFormId = ''; + $scope.cafFormNo = ''; + $scope.customerId = ''; + $scope.new_caf_form = ''; + + //$scope.uploadFile = function () { + // + // + // var idProof = $scope.idProof; + // console.log('Id Proof is '); + // console.dir(idProof); + // + // + // + // + // var uploadUrl = apiPoint.url + "addimage.php"; + // + // fileUpload.uploadFileToUrl( idProof, uploadUrl); + //}; + + $scope.uploadFile_1 = function () { + +//alert(idProof); + + var customer_name = $scope.customer_name; + console.log(customer_name); + + var userId = $scope.userId; + console.log(userId); + + var cafNo = $scope.cafNo; + console.log(cafNo); + + var primaryEmail = $scope.primaryEmail; + console.log(primaryEmail); + + var primaryPhone = $scope.primaryPhone; + console.log(primaryPhone); + + var presentAddress = $scope.presentAddress; + console.log(presentAddress); + + var createdBy = localStorage.getItem('id'); + // console.log('Id is '); + console.log(createdBy); + + var idProof = $scope.idProof; + console.log('Id Proof is '); + console.dir(idProof); + + var addressProof = $scope.addressProof; + console.log('address Proof is '); + console.dir(addressProof); + + var cafForm = $scope.cafForm; + console.log('caf Form is '); + console.dir(cafForm); + + var uploadUrl = apiPoint.url + "addschoolimage.php"; + + fileUpload.uploadFileToUrl(customer_name, userId, cafNo, primaryEmail, primaryPhone, presentAddress, createdBy, idProof, addressProof, cafForm, uploadUrl); + + + + + }; + $scope.uploadFile = function () { + +//alert(idProof); + + var customer_name = $scope.customer_name; + console.log(customer_name); + + var userId = $scope.userId; + console.log(userId); + + var cafNo = $scope.cafNo; + console.log(cafNo); + + var primaryEmail = $scope.primaryEmail; + console.log(primaryEmail); + + var primaryPhone = $scope.primaryPhone; + console.log(primaryPhone); + + var presentAddress = $scope.presentAddress; + console.log(presentAddress); + + var createdBy = localStorage.getItem('id'); + // console.log('Id is '); + console.log(createdBy); + + var idProof = $scope.idProof; + console.log('Id Proof is '); + console.dir(idProof); + + var addressProof = $scope.addressProof; + console.log('address Proof is '); + console.dir(addressProof); + + var cafForm = $scope.cafForm; + console.log('caf Form is '); + console.dir(cafForm); + + var uploadUrl = apiPoint.url + "addprofileimage.php"; + + fileUpload.uploadFileToUrl(customer_name, userId, cafNo, primaryEmail, primaryPhone, presentAddress, createdBy, idProof, addressProof, cafForm, uploadUrl); + + + + + }; + $scope.viewId = -1; + $scope.viewMore = function (pid) { + $scope.viewId = pid; + $scope.editId = -1; + }; + + + $scope.editId = -1; + + $scope.setEditId = function (pid) { + + $scope.editId = pid; + + }; +}]); + + +/** + * Created by ws040 on 10/1/17. + */ diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 60cf913a..a4c048d0 100644 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -262,7 +262,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } // update sutdent course details - $scope.updateStudentCourseDetails = function (form, datas) { + $scope.updateStudentCourseDetails = function (form, datas, hidedoj) { if (form.$invalid) { var field = null, firstError = null; for (field in form) { @@ -280,9 +280,9 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } else { // alert(datas.DOJ); var formate = "dd-MM-yyyy"; - var checkDOJ = $filter('date')(new Date(datas.DOJ), formate); + // var checkDOJ = $filter('date')(new Date(datas.DOJ), formate); datas.IsActive = datas.IsActive === true ? 1 : 0; - datas.DOJ = checkDOJ == "NaN-NaN-0NaN" ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate); + datas.DOJ = datas.DOJ == hidedoj ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate); // alert(datas.DOJ); var req = { method: 'POST', @@ -576,7 +576,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } // update student details - $scope.updateStuDetails = function (form, p) { + $scope.updateStuDetails = function (form, p ,hidedob) { var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -595,9 +595,9 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } else { // alert(p.DOB); var formate = "dd-MM-yyyy"; - var checkDOB = $filter('date')(new Date(p.DOB), formate); + // var checkDOB = $filter('date')(new Date(p.DOB), formate); p.IsActive = p.IsActive === true ? 1 : 0; - p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate); + p.DOB = p.DOB == hidedob ? p.DOB : $filter('date')(new Date(p.DOB), formate); var req = { method: 'POST', url: apiPoint.url + 'updateStudentExistDetail/', diff --git a/Apollo/assets/views/editEmployeeDetails.html b/Apollo/assets/views/editEmployeeDetails.html index 93ed996b..00546de4 100644 --- a/Apollo/assets/views/editEmployeeDetails.html +++ b/Apollo/assets/views/editEmployeeDetails.html @@ -6,7 +6,7 @@ Update Employee Details --> - -
-
- - Personal Details - +
+
+ + Personal Details + -
-
-
+
-
-
-
-
- - -
-
-
-
+
+ +
+
+
+ -
- -
-
-
+
+
+ - - Enter a Valid Qualification -
+ + Enter a Valid Qualification +
-
-
+ + Aadhar Number is required. + Enter a Valid Aadhar Number +
+
-
-
-
-
-
+
+ - - Permanent Address is required -
-
-
+
+ - - Current Address is required -
-
-
-
-
-
+
+
+
+
+ - + - - Date of Joining required -
-
-
-
-
-
+
+
+ +
+
+ - -
- -
-
- -
- -
-
-
- -
-
-
-
+
+
+ + + +
+
+
+ - -
-
-
-
- -
-
- - - + + - + \ No newline at end of file diff --git a/Apollo/assets/views/employeeDetails.html b/Apollo/assets/views/employeeDetails.html index f36c0137..ba76acf6 100644 --- a/Apollo/assets/views/employeeDetails.html +++ b/Apollo/assets/views/employeeDetails.html @@ -420,6 +420,49 @@ +
+
+ +
+
+ +
+
+ +
+
+

Profile Picture

+ + + + +
+ +
+
+ + + +
+ +
+
+ +
+
+
+
+
+
+ +
+
diff --git a/Apollo/assets/views/student/editStudentCourseDetails.html b/Apollo/assets/views/student/editStudentCourseDetails.html index 5b3746e8..bc8d5237 100644 --- a/Apollo/assets/views/student/editStudentCourseDetails.html +++ b/Apollo/assets/views/student/editStudentCourseDetails.html @@ -140,11 +140,11 @@
- +
-
+
-
+