Skip to content

M
mytime
Commit e09a1938 authored by mduppanapudi-nisum-com's avatar mduppanapudi-nisum-com Committed by rbonthala-nisum-com
Browse files
Options

integration issue (#78)

parent c99aa775
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 912 additions and 895 deletions
src/main/java/com/nisum/mytime/model/Project.java
View file @ e09a1938
package com.nisum.mytime.model; package com.nisum.mytime.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; 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;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
@Setter @Setter
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@ToString @ToString
@Document(collection = "Teams") @Document(collection = "Teams")
public class Project implements Serializable { public class Project implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
private ObjectId id; private ObjectId id;
private String projectId; private String projectId;
private String projectName; private String projectName;
/* /*
* After Ui Integration this below commented code will be removed * After Ui Integration this below commented code will be removed
*/ */
//private String managerId; //private String managerId;
// private String managerName; // private String managerName;
// private String account; // private String account;
private String domain; private String domain;
private String status; private String status;
private List<String> employeeIds; private List<String> employeeIds;
private List<String> managerIds; private List<String> managerIds;
private String accountId; private String accountId;
private String domainId; private String domainId;
private List<String> deliveryLeadIds;
}
}
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ e09a1938
...@@ -37,7 +37,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -37,7 +37,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
{ field: 'projectName', displayName: 'Project ', enableColumnMenu: false, enableSorting: true, enableFiltering: true }, { field: 'projectName', displayName: 'Project ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
{ field: 'account', displayName: 'Account ', 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 : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false},
{ field: 'managerIds', displayName: 'Manager Name ', cellTemplate: '<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>', enableColumnMenu: false, enableSorting: true, enableFiltering: true }, { field: 'managerIds', 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: true },
{ field: 'status', displayName: 'Status ', enableColumnMenu: false, enableSorting: true, enableFiltering: false }, { field: 'status', displayName: 'Status ', enableColumnMenu: false, enableSorting: true, enableFiltering: false },
{ name: 'Actions', displayName: 'Actions', cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering: false, width: 130 } { name: 'Actions', displayName: 'Actions', cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering: false, width: 130 }
] ]
...@@ -54,6 +54,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -54,6 +54,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.parentData.status = row.entity.status; $scope.parentData.status = row.entity.status;
$scope.parentData.accountId = row.entity.accountId; $scope.parentData.accountId = row.entity.accountId;
$scope.parentData.domainId = row.entity.domainId; $scope.parentData.domainId = row.entity.domainId;
$scope.parentData.deliveryLeadIds = row.entity.deliveryLeadIds;
if (action == "Update") if (action == "Update")
$scope.addProject(action, $scope.parentData); $scope.addProject(action, $scope.parentData);
else if (action == "Delete") else if (action == "Delete")
...@@ -67,7 +68,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -67,7 +68,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.getProjects(); $scope.getProjects();
$scope.getManagerDetails(); $scope.getManagerDetails();
} }
getLeads = function(){
}
$scope.getProjects = function () { $scope.getProjects = function () {
$http({ $http({
method: "GET", method: "GET",
...@@ -273,7 +277,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -273,7 +277,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.billableStatuses = ["Billable","Shadow","Non-Billable","Reserved"]; $scope.billableStatuses = ["Billable","Shadow","Non-Billable","Reserved"];
$scope.accounts=myFactory.getAccounts(); $scope.accounts=myFactory.getAccounts();
$scope.selectedTab = 0; $scope.selectedTab = 0;
$scope.managersSelectedList = []; $scope.deliveryLeadsSelectedList = [];
$scope.employeeInTeam = []; $scope.employeeInTeam = [];
$scope.employeeRoles = ["Lead","Employee"]; $scope.employeeRoles = ["Lead","Employee"];
$scope.accountId = dataToPass.accountId; $scope.accountId = dataToPass.accountId;
...@@ -331,7 +335,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -331,7 +335,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
// code added // code added
$scope.clearSearchTerm = function () { $scope.clearSearchTerm = function () {
console.log($scope.managersSelectedList); console.log($scope.deliveryLeadsSelectedList);
// $("#lead .lead-search .md-select-value span .md-text").css({ // $("#lead .lead-search .md-select-value span .md-text").css({
//  'border': '1px solid #000', //  'border': '1px solid #000',
...@@ -341,24 +345,24 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -341,24 +345,24 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
} }
// $scope.removeSelectedLead = function (item) { // $scope.removeSelectedLead = function (item) {
// var index = $scope.managersSelectedList.indexOf(item); // var index = $scope.deliveryLeadsSelectedList.indexOf(item);
// $scope.managersSelectedList.splice(index, 1); // $scope.deliveryLeadsSelectedList.splice(index, 1);
// } // }
$scope.closeSelectBox = function () { $scope.closeSelectBox = function () {
$mdSelect.hide(); $mdSelect.hide();
} }
getSelectedLead = function () { getSelectedDeliveryLeadIds = function () {
var managerIds = []; var deliveryLeadIds = [];
if($scope.managersSelectedList.name){ if($scope.deliveryLeadsSelectedList.name){
managerIds.push($scope.managersSelectedList.id) managerIds.push($scope.deliveryLeadsSelectedList.id)
} }
else{ else{
managerIds.push($scope.managersSelectedList.employeeId) deliveryLeadIds.push($scope.deliveryLeadsSelectedList.employeeId)
} }
return managerIds; return deliveryLeadIds;
} }
...@@ -395,8 +399,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -395,8 +399,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
} }
console.log(dataToPass.managerIds[0]); $scope.deliveryLeadsSelectedList = dataToPass.deliveryLeadIds[0];
$scope.managersSelectedList = dataToPass.managerIds[0];
$scope.domain = {"domainName":dataToPass.domain,"domainId":dataToPass.domainId}; $scope.domain = {"domainName":dataToPass.domain,"domainId":dataToPass.domainId};
$scope.projectStatus = dataToPass.status; $scope.projectStatus = dataToPass.status;
$scope.managerModel = { $scope.managerModel = {
...@@ -582,37 +585,30 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -582,37 +585,30 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.getAccountText = function () { $scope.getAccountText = function () {
if ($scope.account !== undefined) { if ($scope.account !== undefined) {
getDomainsAssoicatedToAccount($scope.account.accountId);
return $scope.account.accountName; return $scope.account.accountName;
} else { } else {
return "Please select account"; return "Please select account";
} }
}; };
$scope.onAccountChange = function(){
if($scope.account.accountId){
getDomainsAssoicatedToAccount($scope.account.accountId);
}
};
$scope.getDomainText = function () { $scope.getDomainText = function () {
console.log($scope.domain,$scope.domains); if($scope.domain != undefined){
if ($scope.domain !== undefined) {
if($scope.domain.domainId != undefined){
getManagersAssociatedToDomain($scope.domain.domainId);
}
else{
$scope.managerDetails = managers;
}
return $scope.domain.domainName; return $scope.domain.domainName;
} else {
return "Please select domain";
}
};
$scope.onDomainChange = function(){
if($scope.domain.domainId !== undefined){
getManagersAssociatedToDomain($scope.domain.domainId);
} }
else{ else{
$scope.managerDetails = managers; $scope.managerDetails = managers;
} return "Please select domain";
}
} };
function getManagersAssociatedToDomain(id){ function getManagersAssociatedToDomain(id){
$http({ $http({
method : "GET", method : "GET",
...@@ -679,11 +675,11 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -679,11 +675,11 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
} }
return false; return false;
} }
$scope.getSelectedManager = function () { $scope.getSelectedDeliveryLead = function () {
if (Object.keys($scope.managersSelectedList).length > 0) { if (Object.keys($scope.deliveryLeadsSelectedList).length > 0) {
return $scope.managersSelectedList.employeeName; return $scope.deliveryLeadsSelectedList.employeeName;
} else { } else {
return "Please select a lead"; return "Please select a Delivery lead";
} }
} }
...@@ -771,7 +767,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -771,7 +767,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
else { else {
$scope.alertMsg = ""; $scope.alertMsg = "";
console.log($scope.projectStatus,$scope.domain.domainId); console.log($scope.projectStatus,$scope.domain.domainId);
var record = { "projectId": $scope.projectId, "projectName": $scope.projectName,"account": $scope.account.accountName, "domain": $scope.domain.domainName, "accountId":$scope.account.accountId, "domainId": $scope.domain.domainId, "managerIds": getSelectedLead(), "status": $scope.projectStatus}; var record = { "projectId": $scope.projectId, "projectName": $scope.projectName,"account": $scope.account.accountName, "domain": $scope.domain.domainName, "accountId":$scope.account.accountId, "domainId": $scope.domain.domainId, "managerIds": [], "deliveryLeadIds":getSelectedDeliveryLeadIds(), "status": $scope.projectStatus};
console.log(record); console.log(record);
addOrUpdateProject(record, $scope.templateTitle); addOrUpdateProject(record, $scope.templateTitle);
$timeout(function () { updateGrid($scope.templateTitle, record) }, 500); $timeout(function () { updateGrid($scope.templateTitle, record) }, 500);
......
src/main/webapp/WEB-INF/templates/newProject.html
View file @ e09a1938
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<b>Account</b> <b>Account</b>
</td> </td>
<td colspan="8"> <td colspan="8">
<md-select ng-model="account" md-selected-text="getAccountText()" ng-change="onAccountChange()" id="account"> <md-select ng-model="account" md-selected-text="getAccountText()" id="account">
<md-optgroup label="account"> <md-optgroup label="account">
<md-option ng-value="account1" ng-repeat="account1 in accounts">{{account1.accountName}}</md-option> <md-option ng-value="account1" ng-repeat="account1 in accounts">{{account1.accountName}}</md-option>
</md-optgroup> </md-optgroup>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<b>Domain</b> <b>Domain</b>
</td> </td>
<td colspan="8"> <td colspan="8">
<md-select ng-model="domain" md-selected-text="getDomainText()" ng-change="onDomainChange()" id="domain"> <md-select ng-model="domain" md-selected-text="getDomainText()" id="domain">
<md-optgroup label="domain"> <md-optgroup label="domain">
<md-option ng-value="domain" ng-repeat="domain in domains">{{domain.domainName}}</md-option> <md-option ng-value="domain" ng-repeat="domain in domains">{{domain.domainName}}</md-option>
</md-optgroup> </md-optgroup>
...@@ -59,11 +59,11 @@ ...@@ -59,11 +59,11 @@
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<b>Lead</b> <b>Delivery Lead</b>
</td> </td>
<td colspan="8"> <td colspan="8">
<div style="display: block; float: left; width: 100%;"> <div style="display: block; float: left; width: 100%;">
<md-select ng-model="managersSelectedList" data-md-container-class="selectHeader" md-selected-text="getSelectedManager()" > <md-select ng-model="deliveryLeadsSelectedList" data-md-container-class="selectHeader" md-selected-text="getSelectedDeliveryLead()" >
<md-select-header class="selectHeaderChild header-spacing" layout="column"> <md-select-header class="selectHeaderChild header-spacing" layout="column">
<input ng-model="searchTerm" type="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}" <input ng-model="searchTerm" type="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}"
placeholder="Please Search for a lead" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" /> placeholder="Please Search for a lead" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" />
......
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