MT-152 :SNS :: Add_createdBy_modifiedBy_fileds_to_EmployeeDetails (#145)

src/main/java/com/nisum/mytime/controller/ProjectController.java

@@ -75,7 +75,7 @@ public class ProjectController {
 	public ResponseEntity<List<HashMap<Object, Object>>> getProjects(@RequestParam(value="empId", required = false, defaultValue = MyTimeUtils.ZERO) String  empId) throws MyTimeException {
 		List<HashMap<Object, Object>> projects = null;
 		
-		if(!MyTimeUtils.ZERO.equals(empId)) {
+		if(!"undefined".equalsIgnoreCase(empId) ) {
 			boolean isDl = userService.verifyRole(empId,MyTimeUtils.DL) ;
 			if( isDl ){
 				projects = projectService.deliveryLeadProjects(empId);

src/main/java/com/nisum/mytime/controller/UserController.java

@@ -65,9 +65,9 @@ public class UserController {
             produces = MediaType.APPLICATION_JSON_VALUE,
             consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<EmployeeRoles> assigingEmployeeRole(
-            @RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
+            @RequestBody EmployeeRoles employeeRoles, @RequestParam(value="empId") String  loginEmpId) throws MyTimeException {
         EmployeeRoles employeeRole = userService
-                .assigingEmployeeRole(employeeRoles);
+                .assigingEmployeeRole(employeeRoles,loginEmpId);
         return new ResponseEntity<>(employeeRole, HttpStatus.OK);
     }
 
@@ -75,9 +75,10 @@ public class UserController {
             produces = MediaType.APPLICATION_JSON_VALUE,
             consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<EmployeeRoles> updateEmployeeRole(
-            @RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
+            @RequestBody EmployeeRoles employeeRoles,
+            @RequestParam(value="empId") String  loginEmpId) throws MyTimeException {
         EmployeeRoles employeeRole = userService
-                .updateEmployeeRole(employeeRoles);
+                .updateEmployeeRole(employeeRoles,loginEmpId);
         return new ResponseEntity<>(employeeRole, HttpStatus.OK);
     }
 

src/main/java/com/nisum/mytime/controller/VisaController.java

@@ -18,6 +18,7 @@ import com.nisum.mytime.model.EmployeeVisa;
 import com.nisum.mytime.model.TravelRequest;
 import com.nisum.mytime.model.Visa;
 import com.nisum.mytime.service.VisaService;
+import com.nisum.mytime.utils.MyTimeUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -86,10 +87,10 @@ public class VisaController {
 	}
 
 	@RequestMapping(value = "/fileUpload", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	public ResponseEntity<String> exportDataFromFile(@RequestParam(value = "file") MultipartFile file)
+	public ResponseEntity<String> exportDataFromFile(@RequestParam(value = "file") MultipartFile file, @RequestParam(value="empId") String  loginEmpId)
 			throws MyTimeException {
 		log.info("Uploaded file: {} with size: {}", file.getOriginalFilename(), file.getSize());
-		String result = visaService.exportDataFromExcelFile(file);
+		String result = visaService.exportDataFromExcelFile(file,loginEmpId);
 		return new ResponseEntity<>(result, HttpStatus.OK);
 	}
 

src/main/java/com/nisum/mytime/model/EmployeeRoles.java

@@ -104,5 +104,9 @@ public class EmployeeRoles implements Serializable {
 
     @ExcelCellName("Exit Date")
     private Date endDate;
+    
+    private String createdBy;
+    
+    private String modifiedBy;
 
 }

src/main/java/com/nisum/mytime/service/UserService.java

@@ -26,7 +26,7 @@ public interface UserService {
 
     List<EmployeeRoles> getEmployeeRoles() throws MyTimeException;
 
-    EmployeeRoles assigingEmployeeRole(EmployeeRoles employeeRoles)
+    EmployeeRoles assigingEmployeeRole(EmployeeRoles employeeRoles, String empId)
             throws MyTimeException;
 
     String generatePdfReport(long id, String fromDate, String toDate)
@@ -36,7 +36,7 @@ public interface UserService {
 
     void deleteEmployee(String empId);
 
-    EmployeeRoles updateEmployeeRole(EmployeeRoles employeeRoles);
+    EmployeeRoles updateEmployeeRole(EmployeeRoles employeeRoles,String empId);
 
     void updateEmployeeLocationDetails(EmployeeRoles employeeRoles,
             boolean delete);

src/main/java/com/nisum/mytime/service/UserServiceImpl.java

@@ -133,9 +133,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public EmployeeRoles assigingEmployeeRole(EmployeeRoles employeeRoles)
+    public EmployeeRoles assigingEmployeeRole(EmployeeRoles employeeRoles, String empId)
             throws MyTimeException {
         employeeRoles.setCreatedOn(new Date());
+        
+        employeeRoles.setCreatedBy(empId);
+        employeeRoles.setModifiedBy(empId);
+        
         if (employeeRoles.getEmploymentType() != null
                 && !employeeRoles.getEmploymentType().isEmpty()
                 && !employeeRoles.getEmploymentType()
@@ -204,7 +208,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public EmployeeRoles updateEmployeeRole(EmployeeRoles employeeRoles) {
+    public EmployeeRoles updateEmployeeRole(EmployeeRoles employeeRoles,String empId) {
         // TODO update all emp details to inactive if employee is inactive
         Query query = new Query(
                 Criteria.where("employeeId").is(employeeRoles.getEmployeeId()));
@@ -226,6 +230,9 @@ public class UserServiceImpl implements UserService {
         update.set("hasB1", employeeRoles.getHasB1());
         update.set("passportExpiryDate", employeeRoles.getPassportExpiryDate());
         update.set("b1ExpiryDate", employeeRoles.getB1ExpiryDate());
+        
+        update.set("modifiedBy",empId);
+        
         if(employeeRoles.getEmpStatus().equalsIgnoreCase(MyTimeUtils.IN_ACTIVE_SPACE)) {
             update.set("endDate", employeeRoles.getEndDate());
         }

src/main/java/com/nisum/mytime/service/VisaService.java

@@ -36,5 +36,5 @@ public interface VisaService {
 
 	void deleteEmployeeVisas(TravelRequest e);
 	
-	String exportDataFromExcelFile(MultipartFile file) throws MyTimeException;
+	String exportDataFromExcelFile(MultipartFile file,String empId) throws MyTimeException;
 }

src/main/java/com/nisum/mytime/service/VisaServiceImpl.java

@@ -88,7 +88,7 @@ public class VisaServiceImpl implements VisaService {
     }
 
     @Override
-    public String exportDataFromExcelFile(MultipartFile file)
+    public String exportDataFromExcelFile(MultipartFile file,String empId)
             throws MyTimeException {
         String result = "Failure";
         int counter = 0;
@@ -104,7 +104,7 @@ public class VisaServiceImpl implements VisaService {
                 for (EmployeeRoles employee : employees) {
                     System.out.println("test employee" + employee);
                     if (null != employee.getEmployeeId())
-                        findAndModifyEmployeeRole(employee);
+                        findAndModifyEmployeeRole(employee,empId);
                     else
                         counter++;
                 }
@@ -127,7 +127,7 @@ public class VisaServiceImpl implements VisaService {
         return result;
     }
 
-    private void findAndModifyEmployeeRole(EmployeeRoles employee) {
+    private void findAndModifyEmployeeRole(EmployeeRoles employee,String empId) {
         /*
          * Query query = new
          * Query(Criteria.where("employeeId").is(employee.getEmployeeId()))
@@ -158,11 +158,12 @@ public class VisaServiceImpl implements VisaService {
          * employee.getEmployeeId());
          */
         employee.setRole("Employee");
+        
         EmployeeRoles emp = userService
                 .getEmployeesRoleData(employee.getEmployeeId());
         if (emp == null) {
             try {
-                userService.assigingEmployeeRole(employee);
+                userService.assigingEmployeeRole(employee,empId);
             } catch (MyTimeException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();

src/main/webapp/WEB-INF/controllers/ExportDataController.js

@@ -27,6 +27,7 @@ myApp
 
 					$scope.uploadFiles = function() {
 						var file = $scope.file;
+						var empId = myFactory.getEmpId();
 						if (file == "" || file.length == 0) {
 							showAlert('Please choose a file to import data...');
 							$scope.refreshPage();
@@ -41,7 +42,7 @@ myApp
 							$http
 									.post(
 											appConfig.appUri
-													+ "visa/fileUpload",
+													+ "visa/fileUpload?empId="+empId,
 											formData,
 											{
 												transformRequest : angular.identity,