Compare commits
5 Commits
1b17dd845a
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| b211cd538a | |||
| d643788919 | |||
| 96fbb71c87 | |||
| bf5546c48b | |||
| 44ca92ac91 |
@@ -178,7 +178,7 @@ export default function ResultsTable({
|
|||||||
<TableCell>
|
<TableCell>
|
||||||
<Trans
|
<Trans
|
||||||
i18nKey={
|
i18nKey={
|
||||||
resultsReceived === elementsInOrder
|
resultsReceived >= elementsInOrder
|
||||||
? 'doctor:resultsTable.responsesReceived'
|
? 'doctor:resultsTable.responsesReceived'
|
||||||
: 'doctor:resultsTable.waitingForNr'
|
: 'doctor:resultsTable.waitingForNr'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { PageBody, PageHeader } from '@kit/ui/page';
|
|||||||
import { Trans } from '@kit/ui/trans';
|
import { Trans } from '@kit/ui/trans';
|
||||||
import { formatDateAndTime } from '@kit/shared/utils';
|
import { formatDateAndTime } from '@kit/shared/utils';
|
||||||
|
|
||||||
|
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||||
import { loadCurrentUserAccount } from '~/home/(user)/_lib/server/load-user-account';
|
import { loadCurrentUserAccount } from '~/home/(user)/_lib/server/load-user-account';
|
||||||
import { loadUserAnalysis } from '~/home/(user)/_lib/server/load-user-analysis';
|
import { loadUserAnalysis } from '~/home/(user)/_lib/server/load-user-analysis';
|
||||||
import {
|
import {
|
||||||
@@ -22,7 +23,7 @@ import {
|
|||||||
|
|
||||||
import Analysis from '../_components/analysis';
|
import Analysis from '../_components/analysis';
|
||||||
|
|
||||||
export default async function AnalysisResultsPage({
|
async function AnalysisResultsPage({
|
||||||
params,
|
params,
|
||||||
}: {
|
}: {
|
||||||
params: Promise<{
|
params: Promise<{
|
||||||
@@ -150,3 +151,5 @@ export default async function AnalysisResultsPage({
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default withI18n(AnalysisResultsPage);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
|
|
||||||
import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
|
import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
|
||||||
|
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||||
import { PageBody, PageHeader } from '@/packages/ui/src/makerkit/page';
|
import { PageBody, PageHeader } from '@/packages/ui/src/makerkit/page';
|
||||||
|
|
||||||
import { toArray } from '@kit/shared/utils';
|
import { toArray } from '@kit/shared/utils';
|
||||||
@@ -17,7 +18,7 @@ export async function generateMetadata() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function MontonioCheckoutCallbackErrorPage({
|
async function MontonioCheckoutCallbackErrorPage({
|
||||||
searchParams,
|
searchParams,
|
||||||
}: {
|
}: {
|
||||||
searchParams: Promise<{ reasonFailed: string }>;
|
searchParams: Promise<{ reasonFailed: string }>;
|
||||||
@@ -61,3 +62,5 @@ export default async function MontonioCheckoutCallbackErrorPage({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default withI18n(MontonioCheckoutCallbackErrorPage);
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||||
|
|
||||||
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
|
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
|
||||||
import AccountPreferencesForm from '../_components/account-preferences-form';
|
import AccountPreferencesForm from '../_components/account-preferences-form';
|
||||||
import SettingsSectionHeader from '../_components/settings-section-header';
|
import SettingsSectionHeader from '../_components/settings-section-header';
|
||||||
|
|
||||||
export default async function PreferencesPage() {
|
async function PreferencesPage() {
|
||||||
const { account } = await loadCurrentUserAccount();
|
const { account } = await loadCurrentUserAccount();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -17,3 +19,5 @@ export default async function PreferencesPage() {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default withI18n(PreferencesPage);
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { MultiFactorAuthFactorsList } from '@kit/accounts/components';
|
import { MultiFactorAuthFactorsList } from '@kit/accounts/components';
|
||||||
|
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||||
|
|
||||||
import SettingsSectionHeader from '../_components/settings-section-header';
|
import SettingsSectionHeader from '../_components/settings-section-header';
|
||||||
|
|
||||||
export default function SecuritySettingsPage() {
|
async function SecuritySettingsPage() {
|
||||||
return (
|
return (
|
||||||
<div className="mx-auto w-full bg-white p-6">
|
<div className="mx-auto w-full bg-white p-6">
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -15,3 +16,5 @@ export default function SecuritySettingsPage() {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default withI18n(SecuritySettingsPage);
|
||||||
|
|||||||
@@ -247,12 +247,13 @@ export async function getUserInProgressResponses({
|
|||||||
`,
|
`,
|
||||||
{ count: 'exact' },
|
{ count: 'exact' },
|
||||||
)
|
)
|
||||||
.neq('status', 'ON_HOLD')
|
.eq('order_status', 'COMPLETED')
|
||||||
.in('analysis_order_id', analysisOrderIds)
|
.in('analysis_order_id', analysisOrderIds)
|
||||||
.range(offset, offset + pageSize - 1)
|
.range(offset, offset + pageSize - 1)
|
||||||
.order('created_at', { ascending: false });
|
.order('created_at', { ascending: false });
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
|
console.error("Failed to get analysis responses", error);
|
||||||
throw new Error('Something went wrong');
|
throw new Error('Something went wrong');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user