Issues fixed while Updating checking Project Duplicate Name and While Updating...

Issues fixed while Updating checking Project Duplicate Name and While Updating Employee Update (#155)

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

@@ -49,7 +49,7 @@ public class ProjectController {
 		// checking project duplicateName
     	int projectNameCount=0;
 		if (projectAdded.getAccountId() != null) {
-			List<Project> projects = projectRepo.findByAccountId(projectAdded.getAccountId());
+			List<Project> projects = projectRepo.findByDomainId(projectAdded.getDomainId());
 			for (Project existproject : projects) {
 				if (projectAdded.getProjectName().equalsIgnoreCase(existproject.getProjectName()))
 					projectNameCount++;		}
@@ -82,7 +82,7 @@ public class ProjectController {
 		// checking project duplicateName
     	int projectNameCount=0;
 		if (project.getAccountId() != null) {
-			List<Project> projects = projectRepo.findByAccountId(project.getAccountId());
+			List<Project> projects = projectRepo.findByDomainId(project.getDomainId());
 			for (Project existproject : projects) {
 				if (project.getProjectName().equalsIgnoreCase(existproject.getProjectName())
 						&& !project.getProjectId().equals(existproject.getProjectId())) {

src/main/java/com/nisum/mytime/repository/ProjectRepo.java

@@ -9,15 +9,16 @@ import com.nisum.mytime.model.Project;
 
 public interface ProjectRepo extends MongoRepository<Project, String> {
 
-    Project findByProjectId(String projectId);
+	Project findByProjectId(String projectId);
 
-    List<Project> findByDeliveryLeadIds(String empId);
+	List<Project> findByDeliveryLeadIds(String empId);
+
+	// List<Project> findByManagerId(String managerId);
+
+	List<Project> findByAccountIdIn(Set<String> accIdsSet);
+
+	List<Project> findByAccountId(String accountId);
+
+	List<Project> findByDomainId(String domainId);
 
-    // List<Project> findByManagerId(String managerId);
-    
-    List<Project> findByAccountIdIn(Set<String> accIdsSet);
-	
-	 List<Project> findByAccountId(String accountId);
-	
-	
 }
\ No newline at end of file

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

@@ -664,19 +664,16 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public List<ProjectTeamMate> getShiftDetails(String shift) {
-        List<Project> projects = projectRepo.findAll();
+    	List<ProjectTeamMate> employeeDetails = null;
         List<ProjectTeamMate> shiftEmpDetails = new ArrayList<>();
+        List<Project> projects = projectRepo.findAll();
         for (Project pt : projects) {
             if ("Active".equalsIgnoreCase(pt.getStatus())) {
-                List<ProjectTeamMate> employeeDetails = projectTeamMatesRepo
-                        .findByProjectId(pt.getProjectId());
+                employeeDetails = projectTeamMatesRepo.findByProjectId(pt.getProjectId());
                 for (ProjectTeamMate emp : employeeDetails) {
-                    if (emp.getShift() != null
-                            && emp.getShift().equalsIgnoreCase(shift)) {
+                    if (emp.getShift() != null && emp.getShift().equalsIgnoreCase(shift) && emp.isActive()) {
                         shiftEmpDetails.add(emp);
-                    } else if (emp.getShift() == null
-                            && "Shift 1(09:00 AM - 06:00 PM)"
-                                    .equalsIgnoreCase(shift))
+                    } else if (emp.getShift() == null && "Shift 1(09:00 AM - 06:00 PM)".equalsIgnoreCase(shift) && emp.isActive())
                         shiftEmpDetails.add(emp);
                 }
             }

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

@@ -47,6 +47,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 		enableFiltering: true,
 		columnDefs: [
 			{ field: 'projectName', displayName: 'Project ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
+			{ field: 'domain', displayName: 'Domain ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
 			{ field: 'account', displayName: 'Account ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
 			//{field : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false},
 			{ field: 'deliveryLeadIds', displayName: 'Delivery Lead / Lead ', cellTemplate: '<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>', enableColumnMenu: false, enableSorting: true, enableFiltering: false },