Skip to content

Email digest local timezone #550

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

Merged
gaspergrom merged 1 commit into from
Feb 20, 2023
Merged

Email digest local timezone #550

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
14 changes: 11 additions & 3 deletions frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</el-radio>
</el-radio-group>
</app-form-item>
<app-form-item class="mb-6" label="Time (UTC)">
<app-form-item class="mb-6" label="Time">
<div class="w-36">
<el-time-select
v-model="form.time"
Expand Down Expand Up @@ -247,6 +247,7 @@ import useVuelidate from '@vuelidate/core'
import AppFormItem from '@/shared/form/form-item.vue'
import formChangeDetector from '@/shared/form/form-change'
import elementChangeDetector from '@/shared/form/element-change'
import moment from 'moment'

const props = defineProps({
modelValue: {
Expand Down Expand Up @@ -340,7 +341,12 @@ const fillForm = (user) => {
eagleEyeSettings.emailDigest?.email || user.email
form.frequency =
eagleEyeSettings.emailDigest?.frequency || 'daily'
form.time = eagleEyeSettings.emailDigest?.time || '09:00'
form.time = eagleEyeSettings.emailDigest?.time
? moment
.utc(eagleEyeSettings.emailDigest?.time, 'hh:mm')
.local()
.format('hh:mm')
: '09:00'
form.updateResults = !eagleEyeSettings.emailDigest
? true
: eagleEyeSettings.emailDigest?.matchFeedSettings
Expand All @@ -357,7 +363,9 @@ const doSubmit = async () => {
const data = {
email: form.email,
frequency: form.frequency,
time: form.time,
time: moment(form.time, 'hh:mm')
.utc()
.format('hh:mm'),
matchFeedSettings: form.updateResults,
feed: !form.updateResults ? feed.value : undefined
}
Expand Down