Skip to content
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

DTS-39590: date format fix GS #1486

Merged
merged 1 commit into from
Sep 24, 2024
Merged

DTS-39590: date format fix GS #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions .../publicissapient/kpidashboard/apis/jira/scrum/service/DevCompletionStatusServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,13 +506,18 @@ private void setKpiSpecificData(Map<String, IterationKpiModalValue> modalObjectM
Map<String, Object> jiraIssueData, Map<String, Object> actualCompletionData) {
IterationKpiModalValue jiraIssueModalObject = modalObjectMap.get(jiraIssue.getNumber());
String markerValue = Constant.BLANK;
jiraIssueModalObject.setDevCompletionDate((String) jiraIssueData.get(DEV_COMPLETION_DATE));
jiraIssueModalObject.setDevCompletionDate(DateUtil.dateTimeConverter(
(String) jiraIssueData.get(DEV_COMPLETION_DATE), DateUtil.DATE_FORMAT, DateUtil.DISPLAY_DATE_FORMAT));
if (actualCompletionData.get(ACTUAL_COMPLETE_DATE) != null)
jiraIssueModalObject.setActualCompletionDate(actualCompletionData.get(ACTUAL_COMPLETE_DATE).toString());
jiraIssueModalObject.setActualCompletionDate(
DateUtil.dateTimeConverter(actualCompletionData.get(ACTUAL_COMPLETE_DATE).toString(),
DateUtil.DATE_FORMAT, DateUtil.DISPLAY_DATE_FORMAT));
else
jiraIssueModalObject.setActualCompletionDate(" - ");
if (actualCompletionData.get(ACTUAL_START_DATE) != null) {
jiraIssueModalObject.setActualStartDate(actualCompletionData.get(ACTUAL_START_DATE).toString());
jiraIssueModalObject.setActualStartDate(
DateUtil.dateTimeConverter(actualCompletionData.get(ACTUAL_START_DATE).toString(),
DateUtil.DATE_FORMAT, DateUtil.DISPLAY_DATE_FORMAT));
} else
jiraIssueModalObject.setActualStartDate(" - ");
if (!jiraIssueData.get(ISSUE_DELAY).equals(Constant.DASH)) {
Expand Down
3 changes: 2 additions & 1 deletion ...va/com/publicissapient/kpidashboard/apis/jira/scrum/service/WorkRemainingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ private int checkDelay(JiraIssue jiraIssue, Map<String, IterationPotentialDelay>
private void setKpiSpecificData(SprintDetails sprintDetails, Map<String, IterationKpiModalValue> modalObjectMap,
Map<String, IterationPotentialDelay> issueWiseDelay, JiraIssue jiraIssue, String devCompletionDate) {
IterationKpiModalValue jiraIssueModalObject = modalObjectMap.get(jiraIssue.getNumber());
jiraIssueModalObject.setDevCompletionDate(devCompletionDate);
jiraIssueModalObject.setDevCompletionDate(
DateUtil.dateTimeConverter(devCompletionDate, DateUtil.DATE_FORMAT, DateUtil.DISPLAY_DATE_FORMAT));
String markerValue = Constant.BLANK;
if (issueWiseDelay.containsKey(jiraIssue.getNumber()) && StringUtils.isNotEmpty(jiraIssue.getDueDate())) {
IterationPotentialDelay iterationPotentialDelay = issueWiseDelay.get(jiraIssue.getNumber());
Expand Down