Commit 8f8e6b01 authored by manikanta's avatar manikanta

url modification of importDataand few other files

parent 9d60bb96
...@@ -191,14 +191,14 @@ public class EmployeeController { ...@@ -191,14 +191,14 @@ public class EmployeeController {
} }
@RequestMapping(value = "/getEmployeeRoleDataForSearchCriteria", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/employee/searchCriteria", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Employee> getEmployeeRoleDataForSearchCriteria(@RequestParam("searchId") String searchId, public ResponseEntity<Employee> getEmployeeRoleDataForSearchCriteria(@RequestParam("searchId") String searchId,
@RequestParam("searchAttribute") String searchAttribute) throws MyTeamException { @RequestParam("searchAttribute") String searchAttribute) throws MyTeamException {
Employee employeesRole = empService.getEmployeeRoleDataForSearchCriteria(searchId, searchAttribute); Employee employeesRole = empService.getEmployeeRoleDataForSearchCriteria(searchId, searchAttribute);
return new ResponseEntity<>(employeesRole, HttpStatus.OK); return new ResponseEntity<>(employeesRole, HttpStatus.OK);
} }
@RequestMapping(value = "/getEmployeeDetailsForAutocomplete", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/employee/autocomplete", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<String>> getEmployeeDetailsForAutocomplete() throws MyTeamException { public ResponseEntity<List<String>> getEmployeeDetailsForAutocomplete() throws MyTeamException {
List<String> details = empService.getEmployeeDetailsForAutocomplete(); List<String> details = empService.getEmployeeDetailsForAutocomplete();
return new ResponseEntity<>(details, HttpStatus.OK); return new ResponseEntity<>(details, HttpStatus.OK);
......
...@@ -37,7 +37,7 @@ myApp ...@@ -37,7 +37,7 @@ myApp
showProgressDialog('Please wait while data is imported from file...!!!'); showProgressDialog('Please wait while data is imported from file...!!!');
var formData = new FormData(); var formData = new FormData();
formData.append('file', file); formData.append('file', file);
$http.post(appConfig.appUri+ "user/fileUpload?empId="+empId, $http.post(appConfig.appUri+ "/employee/fileUpload?empId="+empId,
formData,{ formData,{
transformRequest : angular.identity, transformRequest : angular.identity,
headers : {'Content-Type' : undefined }, headers : {'Content-Type' : undefined },
......
...@@ -310,8 +310,8 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window ...@@ -310,8 +310,8 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window
menuItems.push({"menu" : "Manage Domains","icon" : "fa fa fa-cubes fa-2x","path" : "templates/domains.html"}); menuItems.push({"menu" : "Manage Domains","icon" : "fa fa fa-cubes fa-2x","path" : "templates/domains.html"});
menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"}); menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"});
//menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"}); //menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"});
menuItems.push({"menu" : "Manage Visa","icon" : "fa fa-empire fa-2x","path" : "templates/visaList.html"}); //menuItems.push({"menu" : "Manage Visa","icon" : "fa fa-empire fa-2x","path" : "templates/visaList.html"});
menuItems.push({"menu" : "Manage Travels","icon" : "fa fa-tasks fa-2x","path" : "templates/onsiteTravelsList.html"}); //menuItems.push({"menu" : "Manage Travels","icon" : "fa fa-tasks fa-2x","path" : "templates/onsiteTravelsList.html"});
menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"}); menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"});
menuItems.push({"menu" : "Login Reports","icon" : "fa fa-pie-chart fa-2x","path" : "templates/reports.html"}); menuItems.push({"menu" : "Login Reports","icon" : "fa fa-pie-chart fa-2x","path" : "templates/reports.html"});
menuItems.push({"menu" : "Attendance Report","icon" : "fa fa-bar-chart fa-2x","path" : "templates/attendanceReport.html"}); menuItems.push({"menu" : "Attendance Report","icon" : "fa fa-bar-chart fa-2x","path" : "templates/attendanceReport.html"});
......
...@@ -53,7 +53,7 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi ...@@ -53,7 +53,7 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi
$scope.getEmployeeDetailsForAutocomplete = function(){ $scope.getEmployeeDetailsForAutocomplete = function(){
$http({ $http({
method : "GET", method : "GET",
url : appConfig.appUri + "user/getEmployeeDetailsForAutocomplete" url : appConfig.appUri + "/employee/autocomplete"
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
if(response.data != "" && response.data.length !=0){ if(response.data != "" && response.data.length !=0){
$scope.employeeDetails = response.data; $scope.employeeDetails = response.data;
...@@ -151,7 +151,7 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi ...@@ -151,7 +151,7 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi
function getEmployeeIdFromRoles(searchId, searchAttribute, fromDate, toDate, type){ function getEmployeeIdFromRoles(searchId, searchAttribute, fromDate, toDate, type){
$http({ $http({
method : "GET", method : "GET",
url : appConfig.appUri + "user/getEmployeeRoleDataForSearchCriteria?searchId=" + searchId + "&searchAttribute=" + searchAttribute url : appConfig.appUri + "/employee/searchCriteria?searchId=" + searchId + "&searchAttribute=" + searchAttribute
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
if(response.data != "" && response.data.length !=0){ if(response.data != "" && response.data.length !=0){
getData(response.data.employeeId, fromDate, toDate, type); getData(response.data.employeeId, fromDate, toDate, type);
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
<div class="form-inline col-lg-12" <div class="form-inline col-lg-12"
style="margin-left: 22%; margin-top: 5%;"> style="margin-left: 22%; margin-top: 5%;">
<div class="form-group col-lg-4"> <div class="form-group col-lg-4">
<a class="btn btn-primary" href='javascript:;' <a class="btn btn-primary" href='javascript:;'> Choose File...
style="background: cadetblue;border-color:cadetblue; margin-top: 1%;"> Choose File...
<input type="file" file-model="file" <input type="file" file-model="file"
style="position: absolute; z-index: 2; top: 0; left: 0; filter: alpha(opacity = 0); -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); opacity: 0; background-color: transparent; color: transparent;" style="position: absolute; z-index: 2; top: 0; left: 0; filter: alpha(opacity = 0); -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); opacity: 0; background-color: transparent; color: transparent;"
name="file_source" name="file_source"
...@@ -28,10 +27,8 @@ ...@@ -28,10 +27,8 @@
<div class="form-group col-lg-1"> <div class="form-group col-lg-1">
<label class="" for="submitBtn"><md-button <label class="" for="submitBtn"><md-button
class="md-raised md-primary" class="md-raised md-primary"
style="width:120px;background: cadetblue;"
ng-click="uploadFiles()"> <i ng-click="uploadFiles()"> <i
class="fa fa-upload fa-2x" class="fa fa-upload fa-2x"></i>
style="margin-top: 5px; font-size: 1.5em; float: left"></i>
Import Data</md-button></label> Import Data</md-button></label>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment