Skip to content

Commit

Permalink
Merge pull request #507 from ChicagoWorldcon/PLAN-534-last-logged-in
Browse files Browse the repository at this point in the history
PLAN-534 fix last logged in format
  • Loading branch information
Gailbear authored Jul 27, 2022
2 parents 4faa7cd + 951009b commit 28caf43
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions app/javascript/people/people_table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@
</tooltip-overflow>
</template>
<template #cell(current_sign_in_at)="{ item }">
<tooltip-overflow :title="item.current_sign_in_at" v-if="item.current_sign_in_at">
{{new Date(item.current_sign_in_at).toLocaleString('en', {dateStyle:'medium', timeStyle: "short", hour12: false})}}
</tooltip-overflow>
<span v-if="item.current_sign_in_at">
{{DateTime.fromISO(item.current_sign_in_at).toFormat("DDD, t ZZZZ")}}
</span>
<span v-if="!item.current_sign_in_at" class="font-italic text-muted">{{PERSON_NEVER_LOGGED_IN}}</span>
</template>
<template #cell(draft_approval)="{ item }">
<div v-if="draftSchedule">
Expand Down Expand Up @@ -149,6 +150,8 @@ import searchStateMixin from '../store/search_state.mixin'
import { formatPersonScheduleApprovalState } from '@/store/person_schedule_approval';
import { FETCH_WORKFLOWS, scheduleWorkflowMixin } from '@/store/schedule_workflow';
import { mapActions } from 'vuex';
import { PERSON_NEVER_LOGGED_IN } from '@/constants/strings';
import { DateTime } from 'luxon';
export default {
name: 'PeopleTable',
Expand All @@ -171,6 +174,8 @@ export default {
editableIds: [],
selectedConState: null,
searchEmails: null,
PERSON_NEVER_LOGGED_IN,
DateTime
}),
computed: {
declinedRejected() {
Expand Down

0 comments on commit 28caf43

Please sign in to comment.