Commit 27a29b2e authored by ssathu-nisum-com's avatar ssathu-nisum-com Committed by tdutta-nisum-com

MT-79:: In ManageProjectsscreen_allow_the_user_to_select_more_than_on… (#22)

* MT-79:: In ManageProjectsscreen_allow_the_user_to_select_more_than_oneLead_from_selectoption.

* added the comments
parent 0a4ebbcf
...@@ -33,5 +33,6 @@ public class Project implements Serializable { ...@@ -33,5 +33,6 @@ public class Project implements Serializable {
private String domain; private String domain;
private String status; private String status;
private List<String> employeeIds; private List<String> employeeIds;
private List<String> managerIds;
} }
...@@ -2,6 +2,7 @@ package com.nisum.mytime.model; ...@@ -2,6 +2,7 @@ package com.nisum.mytime.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
import org.bson.types.ObjectId; import org.bson.types.ObjectId;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
...@@ -48,5 +49,6 @@ public class ProjectTeamMate implements Serializable { ...@@ -48,5 +49,6 @@ public class ProjectTeamMate implements Serializable {
@DateTimeFormat(iso = ISO.DATE) @DateTimeFormat(iso = ISO.DATE)
private Date newBillingStartDate; private Date newBillingStartDate;
private boolean active; private boolean active;
private List<String> managerIds;
} }
...@@ -14,6 +14,8 @@ public interface ProjectTeamMatesRepo ...@@ -14,6 +14,8 @@ public interface ProjectTeamMatesRepo
List<ProjectTeamMate> findByManagerId(String projectId); List<ProjectTeamMate> findByManagerId(String projectId);
List<ProjectTeamMate> findByManagerIds(String managerId);
List<ProjectTeamMate> findByEmployeeId(String employeeId); List<ProjectTeamMate> findByEmployeeId(String employeeId);
ProjectTeamMate findById(ObjectId id); ProjectTeamMate findById(ObjectId id);
......
package com.nisum.mytime.service; package com.nisum.mytime.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
...@@ -79,7 +80,19 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -79,7 +80,19 @@ public class ProjectServiceImpl implements ProjectService {
@Override @Override
public List<Project> getProjects() throws MyTimeException { public List<Project> getProjects() throws MyTimeException {
return projectRepo.findAll(); /*
* MT-79:returns all project info. This will get implemented once managers are
* maintained as List and not attributes
* return projectRepo.findAll();
*/
List<Project> projects=projectRepo.findAll();
for(Project p:projects)
{
if(p.getManagerIds()== null && p.getManagerId()!= null)
p.setManagerIds(Arrays.asList(p.getManagerId()));
}
return projects;
} }
@Override @Override
...@@ -109,8 +122,12 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -109,8 +122,12 @@ public class ProjectServiceImpl implements ProjectService {
Criteria.where("projectId").is(project.getProjectId())); Criteria.where("projectId").is(project.getProjectId()));
Update update = new Update(); Update update = new Update();
update.set("projectName", project.getProjectName()); update.set("projectName", project.getProjectName());
update.set("managerId", project.getManagerId()); if(project.getManagerIds()!= null)
update.set("managerName", project.getManagerName()); {
update.set("managerIds", project.getManagerIds());
}else{
update.set("managerIds",Arrays.asList(project.getManagerId()));
}
update.set("account", project.getAccount()); update.set("account", project.getAccount());
update.set("status", project.getStatus()); update.set("status", project.getStatus());
FindAndModifyOptions options = new FindAndModifyOptions(); FindAndModifyOptions options = new FindAndModifyOptions();
...@@ -122,10 +139,12 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -122,10 +139,12 @@ public class ProjectServiceImpl implements ProjectService {
.findByProjectId(project.getProjectId()); .findByProjectId(project.getProjectId());
if (employeeDetails != null && projectDB != null) { if (employeeDetails != null && projectDB != null) {
for (ProjectTeamMate emp : employeeDetails) { for (ProjectTeamMate emp : employeeDetails) {
emp.setManagerId(projectDB.getManagerId()); //emp.setManagerId(projectDB.getManagerId());
emp.setManagerName(projectDB.getManagerName()); //emp.setManagerName(projectDB.getManagerName());
emp.setAccount(projectDB.getAccount()); emp.setAccount(projectDB.getAccount());
emp.setProjectName(projectDB.getProjectName()); emp.setProjectName(projectDB.getProjectName());
//MT-79:Maintatin the managerids in List
emp.setManagerIds(projectDB.getManagerIds());
projectTeamMatesRepo.save(emp); projectTeamMatesRepo.save(emp);
} }
} }
...@@ -139,7 +158,9 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -139,7 +158,9 @@ public class ProjectServiceImpl implements ProjectService {
@Override @Override
public List<ProjectTeamMate> getTeamDetails(String empId) { public List<ProjectTeamMate> getTeamDetails(String empId) {
return projectTeamMatesRepo.findByManagerId(empId); // return projectTeamMatesRepo.findByManagerId(empId);
// MT-79:maintain the ManagerIds in List
return projectTeamMatesRepo.findByManagerIds(empId);
} }
...@@ -411,7 +432,15 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -411,7 +432,15 @@ public class ProjectServiceImpl implements ProjectService {
@Override @Override
public List<ProjectTeamMate> getProjectDetails(String projectId) { public List<ProjectTeamMate> getProjectDetails(String projectId) {
return projectTeamMatesRepo.findByProjectId(projectId); //return projectTeamMatesRepo.findByProjectId(projectId);
//MT-79: adding the existing managerIds in List and sending them as response
List<ProjectTeamMate> teamMates=projectTeamMatesRepo.findByProjectId(projectId);
for(ProjectTeamMate pt:teamMates)
{
if(pt.getManagerIds()== null && pt.getManagerId()!= null)
pt.setManagerIds(Arrays.asList(pt.getManagerId()));
}
return teamMates;
} }
......
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