Skip to content

Ankurlucknowi patch 1 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankurlucknowi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ankurlucknowi patch 1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab914af
Update PlanningService.java
ankurlucknowi Jun 14, 2024
19e2dc9
Update PlannerResource.java
ankurlucknowi Jun 18, 2024
f177ff9
Merge pull request #19 from ankurlucknowi/testBranch
ankurlucknowi Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions backend/src/main/java/planner/core/resource/PlannerResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ public String addOkr(@PathParam("team") String team, @PathParam("quarter") Strin
@Path("/clearPlanForOkr/{okrId}")
@UnitOfWork
public String removeOkr(@PathParam("team") String team, @PathParam("quarter") String quarter, @PathParam("okrId")Integer okrId) {
planningService.removeOkr(team, quarter,okrId);
// planningService.removeOkr(team, quarter,okrId);
planningService.removeOkr(team, quarter,okrId);
return "done";
}

Expand Down Expand Up @@ -247,4 +248,4 @@ public void setParam(Map<PARAMS, String> param) {
}
}

}
}
2 changes: 1 addition & 1 deletion backend/src/main/java/planner/core/service/PlanningService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ public List<Week> createWeeks(String quarter, int startYear, int endYear) {
List<Week> weeks = Lists.newArrayList();
int startingMonth = getStartingMonth(quarter);
LocalDate startDate = new LocalDate().withYear(startYear).withMonthOfYear(startingMonth + 1).dayOfMonth().withMinimumValue();
// LocalDate endDate = new LocalDate().withYear(endYear).withMonthOfYear((startingMonth + quarter.length())%12).dayOfMonth().withMaximumValue();
LocalDate endDate = new LocalDate().withYear(endYear).withMonthOfYear((startingMonth + quarter.length())%12).dayOfMonth().withMaximumValue();

int weekNumber = 1;
while (startDate.isBefore(endDate.plusDays(7))) {
Week e = new Week();
Expand Down