Skip to content

chore: avg check #28

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
hmbanan666 merged 1 commit into from
Jul 30, 2025
Merged

chore: avg check #28

Show file tree
Hide file tree
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
16 changes: 12 additions & 4 deletions apps/web-app/app/components/chart/KitchenChecks.client.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
<VisLine
:x="x"
:y="y"
color="var(--ui-info)"
:color="color"
:line-dash-array="lineDashArray"
/>
<VisArea
:x="x"
:y="y"
:y="yArea"
color="var(--ui-info)"
:opacity="0.1"
/>
Expand Down Expand Up @@ -91,7 +92,14 @@ watch([() => period, () => range, () => values], () => {
}, { immediate: true })

const x = (_: DataRecord, i: number) => i
const y = (d: DataRecord) => d.averageCheck
const y = [
(d: DataRecord) => d.averageCheck,
(d: DataRecord) => d.commonAverageCheck,
]
const yArea = (d: DataRecord) => d.averageCheck

const color = (_: DataRecord, i: number) => ['var(--ui-info)', 'var(--ui-info)'][i]
const lineDashArray = (_: DataRecord, i: number) => [i === 0 ? undefined : 3]

const total = computed(() => {
const count = data.value.filter((d) => d.averageCheck).length
Expand All @@ -116,7 +124,7 @@ function xTicks(i: number) {
return formatDate(data.value[i].date)
}

const template = (d: DataRecord) => `${formatDate(d.date)}: ${formatNumber(d.averageCheck)}`
const template = (d: DataRecord) => `<strong>${formatDate(d.date)}, ${format(d.date, 'eeee', { locale: ru })}</strong><br> Средний чек: ${formatNumber(d.averageCheck)}<br> Среднее по сети: ${formatNumber(d.commonAverageCheck)}`
</script>

<style scoped>
Expand Down
4 changes: 2 additions & 2 deletions apps/web-app/app/components/chart/KitchenRevenue.client.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const y = [
const yArea = (d: DataRecord) => d.total

const color = (_: DataRecord, i: number) => ['var(--ui-secondary)', 'var(--ui-secondary)'][i]
const lineDashArray = (_: DataRecord, i: number) => [i === 0 ? undefined : 4]
const lineDashArray = (_: DataRecord, i: number) => [i === 0 ? undefined : 3]

const total = computed(() => data.value.reduce((acc: number, { total }) => acc + total, 0))

Expand All @@ -121,7 +121,7 @@ function xTicks(i: number) {
return formatDate(data.value[i].date)
}

const template = (d: DataRecord) => `${formatDate(d.date)}, ${format(d.date, 'eeeeee', { locale: ru })}: ${d.checks} ${pluralizationRu(d.checks, ['чек', 'чека', 'чеков'])}<br> Выручка: ${formatNumber(d.total)}<br> Средняя: ${formatNumber(d.commonTotal)}`
const template = (d: DataRecord) => `<strong>${formatDate(d.date)}, ${format(d.date, 'eeee', { locale: ru })}</strong><br> ${d.checks} ${pluralizationRu(d.checks, ['чек', 'чека', 'чеков'])}<br> Выручка: ${formatNumber(d.total)}<br> Среднее по сети: ${formatNumber(d.commonTotal)}`
</script>

<style scoped>
Expand Down