Updated timestamp rows
Deploy Frontend / build-and-deploy (push) Successful in 41s
Details
Deploy Frontend / build-and-deploy (push) Successful in 41s
Details
This commit is contained in:
parent
8f5055b88a
commit
4af68d31af
|
|
@ -24,6 +24,7 @@ import type { AdminActionLog } from '@/api/adminLogs'
|
|||
import AdminLogDetailModal from './components/AdminLogDetailModal'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
|
|
@ -263,7 +264,7 @@ export default function AdminLogPage() {
|
|||
<Table.Tr key={entry.id} style={{ cursor: 'pointer' }} onClick={() => setSelectedLog(entry)}>
|
||||
<Table.Td>
|
||||
<Text size="xs" c="dimmed">
|
||||
{dayjs(entry.created_at).format('DD.MM.YYYY HH:mm')}
|
||||
{formatMsk(entry.created_at)}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import EditAdminModal from './components/EditAdminModal'
|
|||
import type { Admin } from '@/types/api'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
|
|
@ -292,14 +293,14 @@ export default function AdminsPage() {
|
|||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{admin.created_at
|
||||
? dayjs(admin.created_at).format('DD.MM.YYYY')
|
||||
? formatMsk(admin.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{admin.last_login
|
||||
? dayjs(admin.last_login).format('DD.MM.YYYY HH:mm')
|
||||
? formatMsk(admin.last_login)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ export default function EditAdminModal({ admin, opened, onClose }: EditAdminModa
|
|||
telegram_id: null as number | null,
|
||||
},
|
||||
validate: {
|
||||
telegram_id: (value, values) => {
|
||||
telegram_id: (value: any, values: { is_observer: any; is_manager: any }) => {
|
||||
// Требуем Telegram ID для наблюдателя или менеджера
|
||||
if ((values.is_observer || values.is_manager) && !value) {
|
||||
return 'Для этой роли обязательно выберите Telegram-аккаунт'
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approval
|
|||
import ApprovalTaskDetailsModal from './components/ApprovalTaskDetailsModal'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
|
|
@ -211,14 +212,14 @@ export default function ApprovalTasksPage() {
|
|||
<Table.Td>
|
||||
<Text size="xs" c="dimmed">
|
||||
{task.created_at
|
||||
? dayjs(task.created_at).format('DD.MM.YYYY HH:mm')
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="xs" c="dimmed">
|
||||
{task.completed_at
|
||||
? dayjs(task.completed_at).format('DD.MM.YYYY HH:mm')
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approval
|
|||
import FilePreviewModal from '@/pages/approvals/components/FilePreviewModal'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
|
|
@ -320,7 +321,7 @@ export default function ApprovalTaskDetailsModal({
|
|||
<IconCalendar size={16} />
|
||||
<Text>
|
||||
{task.created_at
|
||||
? dayjs(task.created_at).format('DD.MM.YYYY HH:mm')
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Group>
|
||||
|
|
@ -329,7 +330,7 @@ export default function ApprovalTaskDetailsModal({
|
|||
<Text size="sm" c="dimmed">Обновлена:</Text>
|
||||
<Text>
|
||||
{task.updated_at
|
||||
? dayjs(task.updated_at).format('DD.MM.YYYY HH:mm')
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Group>
|
||||
|
|
@ -339,7 +340,7 @@ export default function ApprovalTaskDetailsModal({
|
|||
<Group gap="xs">
|
||||
<IconCheck size={16} color="green" />
|
||||
<Text c="green">
|
||||
{dayjs(task.completed_at).format('DD.MM.YYYY HH:mm')}
|
||||
{formatMsk(task.created_at)}
|
||||
</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import ApprovalDetailsModal from './components/ApprovalDetailsModal'
|
|||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import { useDebouncedValue } from '@mantine/hooks'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
|
|
@ -575,9 +576,7 @@ export default function ApprovalsPage() {
|
|||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{approval.created_at
|
||||
? dayjs(approval.created_at).format('DD.MM.YYYY HH:mm')
|
||||
: '—'}
|
||||
{approval.created_at ? formatMsk(approval.created_at) : '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue