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

fileupload setup

Browse Source
This commit is contained in:
resicovenba 2017-12-04 19:28:06 +05:30
parent b9beccaa57
commit 2c8a43e9dc
11 changed files with 562 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Apollo/api/application/controllers/Announcement_Controller.php
View File

@ -111,8 +111,9 @@ class Announcement_Controller extends REST_Controller {
$details['Heading'] = $this->post('Heading'); $details['Heading'] = $this->post('Heading');
$details['Description'] = $this->post('description'); $details['Description'] = $this->post('description');
$details['IsActive'] = $this->post('status'); $details['IsActive'] = $this->post('status');
$details['UpdatedBy'] = $this->post('updatedBy'); $details['UpdatedBy'] = $this->post('createdBy');
$details['UpdatedOn'] = date("Y-m-d", time()); $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) $announcementDetails = $this->announcement_model->updateAnnouncement($details,$updateID);// Check if the users data store contains users (in case the database result returns NULL)
if ($announcementDetails) if ($announcementDetails)
@ -129,7 +130,5 @@ class Announcement_Controller extends REST_Controller {
'status' => REST_Controller::HTTP_NOT_FOUND 'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
} }
} }
} }

18
Apollo/api/application/models/Forgot_model.php
View File

@ -15,12 +15,16 @@ class Forgot_model extends CI_Model {
$this->db->select('ID,Emailid,MobileNumber,Password'); $this->db->select('ID,Emailid,MobileNumber,Password');
$this->db->from(LOGIN); $this->db->from(LOGIN);
$this->db->where('MobileNumber', $user['MobileNumber']); $this->db->where('MobileNumber', $user['MobileNumber']);
$forgotDetails1 = $this->db->get()->first_row();
$forgotDetails = $this->db->get()->first_row();
// echo $forgotDetails->MobileNumber;exit(); // echo $forgotDetails->MobileNumber;exit();
// $result = $query->result_array(); // $result = $query->result_array();
if($forgotDetails){ 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; $existUserID=$forgotDetails->ID;
$this->db->where('ID', $existUserID); $this->db->where('ID', $existUserID);
$upatePassword=$this->db->update('T_Login', $user); $upatePassword=$this->db->update('T_Login', $user);
@ -36,13 +40,15 @@ class Forgot_model extends CI_Model {
$result['forgotstatus'] = false; $result['forgotstatus'] = false;
$result['message'] = "Something went wrong!"; $result['message'] = "Something went wrong!";
} }
} else {
$result['forgotstatus'] = false;
$result['message'] = "This user in InActive state!";
}
} }
else { else {
$result['forgotstatus'] = false; $result['forgotstatus'] = false;
$result['message'] = "User is not exist!"; $result['message'] = "User is not exist!";
} }
return $result; return $result;
} }

2
Apollo/assets/js/config.router.js
View File

@ -55,7 +55,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
.state('app', { .state('app', {
url: "/app", url: "/app",
templateUrl: "assets/views/app.html", 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 abstract: true
}).state('app.dashboard', { }).state('app.dashboard', {
url: "/dashboard", url: "/dashboard",

295
Apollo/assets/js/controllers/employeeCtrl.js
View File

@ -4,7 +4,20 @@
* Simple table with sorting and filtering on AngularJS * 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 * staff details capture
* by : kdk * 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; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -423,13 +440,15 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
angular.element('.ng-invalid[name=' + firstError + ']').focus(); angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
// alert(p.DOB);
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
var checkDOB = $filter('date')(new Date(p.DOB), formate); // var checkDOB = $filter('date')(new Date(p.DOB), formate);
var checkDOJ = $filter('date')(new Date(p.DOJ), formate); // var checkDOJ = $filter('date')(new Date(p.DOJ), formate);
// alert(checkDOB);
// alert(checkDOJ);
p.IsActive = p.IsActive === true ? 1 : 0; 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 == hide_dob ? 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.DOJ = p.DOJ == hide_doj ? p.DOJ : $filter('date')(new Date(p.DOJ), formate);
var req = { var req = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateEmpExistDetail/', 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.
*/

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

@ -262,7 +262,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
} }
// update sutdent course details // update sutdent course details
$scope.updateStudentCourseDetails = function (form, datas) { $scope.updateStudentCourseDetails = function (form, datas, hidedoj) {
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
for (field in form) { for (field in form) {
@ -280,9 +280,9 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
} else { } else {
// alert(datas.DOJ); // alert(datas.DOJ);
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
var checkDOJ = $filter('date')(new Date(datas.DOJ), formate); // var checkDOJ = $filter('date')(new Date(datas.DOJ), formate);
datas.IsActive = datas.IsActive === true ? 1 : 0; datas.IsActive = datas.IsActive === true ? 1 : 0;
datas.DOJ = checkDOJ == "NaN-NaN-0NaN" ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate); datas.DOJ = datas.DOJ == hidedoj ? datas.DOJ : $filter('date')(new Date(datas.DOJ), formate);
// alert(datas.DOJ); // alert(datas.DOJ);
var req = { var req = {
method: 'POST', method: 'POST',
@ -576,7 +576,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
} }
// update student details // update student details
$scope.updateStuDetails = function (form, p) { $scope.updateStuDetails = function (form, p ,hidedob) {
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -595,9 +595,9 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
} else { } else {
// alert(p.DOB); // alert(p.DOB);
var formate = "dd-MM-yyyy"; 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.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 = { var req = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateStudentExistDetail/', url: apiPoint.url + 'updateStudentExistDetail/',

27
Apollo/assets/views/editEmployeeDetails.html
View File

@ -225,7 +225,8 @@
class="symbol required"></span> class="symbol required"></span>
</label> </label>
<input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber" <input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber"
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)' required/> ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)'
required/>
<span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span> <span class="error text-small block" ng-if="Form.primaryPhone.$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> <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>
@ -246,10 +247,11 @@
Date Of Birth <span Date Of Birth <span
class="symbol required"></span> class="symbol required"></span>
</label> </label>
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB" <input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB"
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate"/> 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.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
@ -293,8 +295,7 @@
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">--> <!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control" <input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="p.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" ng-model="p.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" required>
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.$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> <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>
@ -307,8 +308,8 @@
<label> <label>
Other ID Other ID
</label> </label>
<input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="p.OtherID" <input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="p.OtherID" ng-minlength="1"
ng-minlength="1" ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/"> 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.$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> <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>
@ -345,19 +346,21 @@
Date Of Joining <span class="symbol required"></span> Date Of Joining <span class="symbol required"></span>
</label> </label>
<input type="text" tabindex="17" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOJ" <input type="text" tabindex="17" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOJ"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
ng-change="getMaxEndDate(myModel.startDate)" /> />
<!--<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOJ" <!--<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOJ"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" placeholder="Select Date of Joining" close-text="Close" required="required"
/>--> />-->
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<label> <label>
@ -387,10 +390,12 @@
</div> </div>
</div> </div>
<!--<pre>{{ p | json}}</pre>--> <!--<pre>{{ p | json}}</pre>-->
<input type="hidden" ng-init="hidden_DOJ=p.DOJ" ng-model="hidden_DOJ">
<input type="hidden" ng-init="hidden_DOB=p.DOB" ng-model="hidden_DOB">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">
<button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p)"> <button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p, hidden_DOB, hidden_DOJ)">
Save Save
</button> </button>
<button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()"> <button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()">

43
Apollo/assets/views/employeeDetails.html
View File

@ -420,6 +420,49 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div>
<!--<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">
<fieldset>
<div class="form-group">
<div class="user-image">
<h4>Profile Picture</h4>
<!--<label>-->
<!--Image <span class="symbol required"></span>-->
<!--</label>-->
<div class=" margin-bottom-5">
<img src="{{userInfo.profileImage}}"
alt="">
</div>
</div>
<!--<input name="myModel.idproof" accept="image/jpeg" type="file">-->
<input type="file" file-model="idProof"
accept="image/*"/>
</div>
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15"
type="submit"
ng-click="uploadFile()">Submit
</button>
</div>
</div>
</fieldset>
</div>
</div>
</div>
<!--</form>-->
</div>
</div>
</div> </div>
<!--<pre>{{ myModel | json}}</pre>--> <!--<pre>{{ myModel | json}}</pre>-->
<div class="row"> <div class="row">

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

@ -140,11 +140,11 @@
</div> </div>
</div> </div>
<input type="hidden" ng-init="hidden_DOJ=stucour.DOJ" ng-model="hidden_DOJ">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">
<button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStudentCourseDetails(Form, stucour)"> <button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStudentCourseDetails(Form, stucour, hidden_DOJ)">
Update Update
</button> </button>
<button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="cancelCourseDetails()"> <button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="cancelCourseDetails()">

3
Apollo/assets/views/student/editStudentDetails.html
View File

@ -279,10 +279,11 @@
</div> </div>
</div> </div>
<!--<pre>{{ p | json}}</pre>--> <!--<pre>{{ p | json}}</pre>-->
<input type="hidden" ng-init="hidden_DOB=p.DOB" ng-model="hidden_DOB">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">
<button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStuDetails(Form, p)"> <button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateStuDetails(Form, p, hidden_DOB)">
Save Save
</button> </button>
<button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()"> <button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()">

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

@ -389,6 +389,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--<div class="row"> <!--<div class="row">
<div class="col-md-12"> <div class="col-md-12">

6
Apollo/bower_components/ckeditor/plugins/about/dialogs/about.js vendored
View File

@ -2,6 +2,6 @@
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license For licensing, see LICENSE.md or http://ckeditor.com/license
*/ */
CKEDITOR.dialog.add("about",function(a){var a=a.lang.about,b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'<style type="text/css">.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+ // CKEDITOR.dialog.add("about",function(a){var a=a.lang.about,b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'<style type="text/css">.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
b+");"+(CKEDITOR.env.hidpi?"background-size:163px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}</style><div class="cke_about_container"><div class="cke_about_logo"></div><p>CKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+')<br><a target="_blank" href="http://ckeditor.com/">http://ckeditor.com</a></p><p>'+a.help.replace("$1",'<a target="_blank" href="http://docs.ckeditor.com/user">'+ // b+");"+(CKEDITOR.env.hidpi?"background-size:163px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}</style><div class="cke_about_container"><div class="cke_about_logo"></div><p>CKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+')<br><a target="_blank" href="http://ckeditor.com/">http://ckeditor.com</a></p><p>'+a.help.replace("$1",'<a target="_blank" href="http://docs.ckeditor.com/user">'+
a.userGuide+"</a>")+"</p><p>"+a.moreInfo+'<br><a target="_blank" href="http://ckeditor.com/about/license">http://ckeditor.com/about/license</a></p><p>'+a.copy.replace("$1",'<a target="_blank" href="http://cksource.com/">CKSource</a> - Frederico Knabben')+"</p></div>"}]}],buttons:[CKEDITOR.dialog.cancelButton]}}); // a.userGuide+"</a>")+"</p><p>"+a.moreInfo+'<br><a target="_blank" href="http://ckeditor.com/about/license">http://ckeditor.com/about/license</a></p><p>'+a.copy.replace("$1",'<a target="_blank" href="http://cksource.com/">CKSource</a> - Frederico Knabben')+"</p></div>"}]}],buttons:[CKEDITOR.dialog.cancelButton]}});