lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1134 from chaotixkilla/fix-sms-notices-timezone

Browse source 
Add timezone to the SMS notices screen
This commit is contained in:
Rafael Taranto 2022-03-01 12:12:22 +00:00 • committed by GitHub
commit 1d12d20062
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.js
View file

@ -1,6 +1,5 @@
import { useQuery, useMutation } from '@apollo/react-hooks' import { useQuery, useMutation } from '@apollo/react-hooks'
import { makeStyles, Paper } from '@material-ui/core' import { makeStyles, Paper } from '@material-ui/core'
import { format } from 'date-fns/fp'
import gql from 'graphql-tag' import gql from 'graphql-tag'
import * as R from 'ramda' import * as R from 'ramda'
import React, { useState } from 'react' import React, { useState } from 'react'
@ -14,6 +13,7 @@ import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enable
import { ReactComponent as ExpandIconClosed } from 'src/styling/icons/action/expand/closed.svg' import { ReactComponent as ExpandIconClosed } from 'src/styling/icons/action/expand/closed.svg'
import { ReactComponent as ExpandIconOpen } from 'src/styling/icons/action/expand/open.svg' import { ReactComponent as ExpandIconOpen } from 'src/styling/icons/action/expand/open.svg'
import { ReactComponent as WhiteLogo } from 'src/styling/icons/menu/logo-white.svg' import { ReactComponent as WhiteLogo } from 'src/styling/icons/menu/logo-white.svg'
import { formatDate } from 'src/utils/timezones'
import styles from './SMSNotices.styles' import styles from './SMSNotices.styles'
import CustomSMSModal from './SMSNoticesModal' import CustomSMSModal from './SMSNoticesModal'
@ -30,6 +30,7 @@ const GET_SMS_NOTICES = gql`
enabled enabled
allowToggle allowToggle
} }
config
} }
` `
@ -85,12 +86,12 @@ const TOOLTIPS = {
To edit the contents of the SMS receipt, please go to the 'Receipt' tab`) To edit the contents of the SMS receipt, please go to the 'Receipt' tab`)
} }
const SMSPreview = ({ sms, coords }) => { const SMSPreview = ({ sms, coords, timezone }) => {
const classes = useStyles(coords) const classes = useStyles(coords)
const matches = { const matches = {
'#code': 123, '#code': 123,
'#timestamp': format('HH:mm', new Date()) '#timestamp': formatDate(new Date(), timezone, 'HH:mm')
} }
return ( return (
@ -108,7 +109,7 @@ const SMSPreview = ({ sms, coords }) => {
)} )}
</P> </P>
</Paper> </Paper>
<Label3>{format('HH:mm', new Date())}</Label3> <Label3>{formatDate(new Date(), timezone, 'HH:mm')}</Label3>
</div> </div>
</div> </div>
) )
@ -127,6 +128,8 @@ const SMSNotices = () => {
GET_SMS_NOTICES GET_SMS_NOTICES
) )
const timezone = R.path(['config', 'locale_timezone'])(messagesData)
const [editMessage] = useMutation(EDIT_SMS_NOTICE, { const [editMessage] = useMutation(EDIT_SMS_NOTICE, {
onError: ({ msg }) => setErrorMsg(msg), onError: ({ msg }) => setErrorMsg(msg),
refetchQueries: () => ['SMSNotices'] refetchQueries: () => ['SMSNotices']
@ -244,7 +247,13 @@ const SMSNotices = () => {
submit={editMessage} submit={editMessage}
/> />
)} )}
{previewOpen && <SMSPreview sms={selectedSMS} coords={previewCoords} />} {previewOpen && (
<SMSPreview
sms={selectedSMS}
coords={previewCoords}
timezone={timezone}
/>
)}
<DataTable <DataTable
emptyText="No SMS notices so far" emptyText="No SMS notices so far"
elements={elements} elements={elements}