Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
a5d233b1
Commit
a5d233b1
authored
Aug 01, 2018
by
Rajeshekar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update project domain and domain id not getting saved
parent
4de4661a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
16 deletions
+20
-16
ProjectServiceImpl.java
...ain/java/com/nisum/mytime/service/ProjectServiceImpl.java
+20
-16
No files found.
src/main/java/com/nisum/mytime/service/ProjectServiceImpl.java
View file @
a5d233b1
...
@@ -197,6 +197,8 @@ public class ProjectServiceImpl implements ProjectService {
...
@@ -197,6 +197,8 @@ public class ProjectServiceImpl implements ProjectService {
* else{
* else{
* update.set("managerIds",Arrays.asList(project.getManagerId())); }
* update.set("managerIds",Arrays.asList(project.getManagerId())); }
*/
*/
update
.
set
(
"domain"
,
project
.
getDomain
());
update
.
set
(
"domainId"
,
project
.
getDomainId
());
update
.
set
(
"accountId"
,
project
.
getAccountId
());
update
.
set
(
"accountId"
,
project
.
getAccountId
());
update
.
set
(
"status"
,
project
.
getStatus
());
update
.
set
(
"status"
,
project
.
getStatus
());
FindAndModifyOptions
options
=
new
FindAndModifyOptions
();
FindAndModifyOptions
options
=
new
FindAndModifyOptions
();
...
@@ -369,12 +371,12 @@ public class ProjectServiceImpl implements ProjectService {
...
@@ -369,12 +371,12 @@ public class ProjectServiceImpl implements ProjectService {
billings
.
setProjectName
(
projectTeamMate
.
getProjectName
());
billings
.
setProjectName
(
projectTeamMate
.
getProjectName
());
billings
.
setBillableStatus
(
projectTeamMate
.
getBillableStatus
());
billings
.
setBillableStatus
(
projectTeamMate
.
getBillableStatus
());
billings
.
setActive
(
true
);
billings
.
setActive
(
true
);
//TODO
//
TODO
Date
d
=
projectTeamMate
.
getNewBillingStartDate
();
Date
d
=
projectTeamMate
.
getNewBillingStartDate
();
d
.
setDate
(
d
.
getDate
()
+
1
);
d
.
setDate
(
d
.
getDate
()
+
1
);
billings
.
setBillingStartDate
(
DateUtils
.
truncate
(
billings
.
setBillingStartDate
(
DateUtils
.
truncate
(
d
,
Calendar
.
DATE
));
d
,
Calendar
.
DATE
));
existingTeammate
.
setNewBillingStartDate
(
existingTeammate
.
setNewBillingStartDate
(
DateUtils
.
truncate
(
d
,
Calendar
.
DATE
));
DateUtils
.
truncate
(
d
,
Calendar
.
DATE
));
billings
.
setBillingEndDate
(
DateUtils
billings
.
setBillingEndDate
(
DateUtils
.
truncate
(
projectTeamMate
.
getEndDate
(),
Calendar
.
DATE
));
.
truncate
(
projectTeamMate
.
getEndDate
(),
Calendar
.
DATE
));
billings
.
setCreateDate
(
new
Date
());
billings
.
setCreateDate
(
new
Date
());
...
@@ -467,18 +469,20 @@ public class ProjectServiceImpl implements ProjectService {
...
@@ -467,18 +469,20 @@ public class ProjectServiceImpl implements ProjectService {
@Override
@Override
public
List
<
Project
>
getProjects
(
String
managerId
)
throws
MyTimeException
{
public
List
<
Project
>
getProjects
(
String
managerId
)
throws
MyTimeException
{
/* Query query = new Query(Criteria.where("managerId").is(managerId)
/*
.and("status").ne("Completed"));
* Query query = new Query(Criteria.where("managerId").is(managerId)
return mongoTemplate.find(query, Project.class);*/
* .and("status").ne("Completed")); return mongoTemplate.find(query,
List
<
Project
>
projectList
=
new
ArrayList
<>();
* Project.class);
List
<
Project
>
projects
=
projectRepo
.
findByDeliveryLeadIds
(
managerId
);
*/
for
(
Project
project
:
projects
)
{
List
<
Project
>
projectList
=
new
ArrayList
<>();
if
(!
project
.
getStatus
().
equals
(
"Completed"
))
{
List
<
Project
>
projects
=
projectRepo
.
findByDeliveryLeadIds
(
managerId
);
projectList
.
add
(
project
);
for
(
Project
project
:
projects
)
{
}
if
(!
project
.
getStatus
().
equals
(
"Completed"
))
{
projectList
.
add
(
project
);
}
}
return
projectList
;
}
return
projectList
;
}
}
@Override
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment