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

use correct dateFormat for DateTime CustomField #21

Merged
merged 1 commit into from
Mar 11, 2024
+16 −12
Merged

use correct dateFormat for DateTime CustomField #21

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
28 changes: 16 additions & 12 deletions ...ra-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/field/SdkJiraField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ package com.linkedplanet.kotlinjiraclient.sdk.field

import com.atlassian.jira.component.ComponentAccessor
import com.atlassian.jira.config.IssueTypeManager
import com.atlassian.jira.datetime.DateTimeFormatterFactory
import com.atlassian.jira.datetime.DateTimeStyle
import com.atlassian.jira.issue.IssueInputParameters
import com.atlassian.jira.issue.context.IssueContext
import com.atlassian.jira.issue.context.IssueContextImpl
import com.atlassian.jira.issue.customfields.CustomFieldTypes
import com.atlassian.jira.issue.fields.CustomField
import com.atlassian.jira.timezone.TimeZoneManager
import com.linkedplanet.kotlinjiraclient.api.field.JiraAssigneeField
import com.linkedplanet.kotlinjiraclient.api.field.JiraCustomDateTimeField
import com.linkedplanet.kotlinjiraclient.api.field.JiraCustomField
Expand All @@ -43,12 +45,10 @@ import com.linkedplanet.kotlinjiraclient.api.field.JiraProjectField
import com.linkedplanet.kotlinjiraclient.api.field.JiraReporterField
import com.linkedplanet.kotlinjiraclient.api.field.JiraSummaryField
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter

private val customFieldManager by lazy { ComponentAccessor.getCustomFieldManager() }
private val issueTypeManager by lazy { ComponentAccessor.getComponent(IssueTypeManager::class.java) }
private val optionsManager by lazy { ComponentAccessor.getOptionsManager() }
private val timezoneManager by lazy { ComponentAccessor.getComponent(TimeZoneManager::class.java) }
private val customFieldManager = ComponentAccessor.getCustomFieldManager()
private val issueTypeManager = ComponentAccessor.getComponent(IssueTypeManager::class.java)
private val optionsManager = ComponentAccessor.getOptionsManager()

interface SdkJiraField {
fun render(issue: IssueInputParameters)
Expand Down Expand Up @@ -154,14 +154,18 @@ class SdkJiraCustomDateTimeField(
dateTime: ZonedDateTime
) : JiraCustomDateTimeField(customFieldName, dateTime), SdkJiraField {

private val dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MMM/yy h:mm a")
private val formatterFactory = ComponentAccessor.getComponent(DateTimeFormatterFactory::class.java)

override fun render(issue: IssueInputParameters) {
val dateTimeInUserTimeZone = dateTime.withZoneSameInstant(timezoneManager.loggedInUserTimeZone.toZoneId())
issue.addCustomFieldValue(
customField().id,
dateTimeInUserTimeZone.format(dateTimeFormatter)
)
val customField = customField()

val dateTimeStyle = when (customField.customFieldType.key) {
CustomFieldTypes.DATEPICKER.key -> DateTimeStyle.DATE_PICKER
else -> DateTimeStyle.DATE_TIME_PICKER
}
val dateTimeFormatter = formatterFactory.formatter().forLoggedInUser().withStyle(dateTimeStyle)
val dateInUserFormat = dateTimeFormatter.format(java.util.Date.from(dateTime.toInstant()))
issue.addCustomFieldValue(customField.id, dateInUserFormat)
}
}

Expand Down
Loading