fix: potential null query
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
35ca021649
commit
e33a64db96
@ -314,22 +314,22 @@ SELECT
|
|||||||
|
|
||||||
CAST(SUM(total_words_read) AS INTEGER) AS total_words_read,
|
CAST(SUM(total_words_read) AS INTEGER) AS total_words_read,
|
||||||
CAST(SUM(total_time_seconds) AS INTEGER) AS total_seconds,
|
CAST(SUM(total_time_seconds) AS INTEGER) AS total_seconds,
|
||||||
ROUND(CAST(SUM(total_words_read) AS REAL) / (SUM(total_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(total_words_read) AS REAL) / (SUM(total_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS total_wpm,
|
AS total_wpm,
|
||||||
|
|
||||||
CAST(SUM(yearly_words_read) AS INTEGER) AS yearly_words_read,
|
CAST(SUM(yearly_words_read) AS INTEGER) AS yearly_words_read,
|
||||||
CAST(SUM(yearly_time_seconds) AS INTEGER) AS yearly_seconds,
|
CAST(SUM(yearly_time_seconds) AS INTEGER) AS yearly_seconds,
|
||||||
ROUND(CAST(SUM(yearly_words_read) AS REAL) / (SUM(yearly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(yearly_words_read) AS REAL) / (SUM(yearly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS yearly_wpm,
|
AS yearly_wpm,
|
||||||
|
|
||||||
CAST(SUM(monthly_words_read) AS INTEGER) AS monthly_words_read,
|
CAST(SUM(monthly_words_read) AS INTEGER) AS monthly_words_read,
|
||||||
CAST(SUM(monthly_time_seconds) AS INTEGER) AS monthly_seconds,
|
CAST(SUM(monthly_time_seconds) AS INTEGER) AS monthly_seconds,
|
||||||
ROUND(CAST(SUM(monthly_words_read) AS REAL) / (SUM(monthly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(monthly_words_read) AS REAL) / (SUM(monthly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS monthly_wpm,
|
AS monthly_wpm,
|
||||||
|
|
||||||
CAST(SUM(weekly_words_read) AS INTEGER) AS weekly_words_read,
|
CAST(SUM(weekly_words_read) AS INTEGER) AS weekly_words_read,
|
||||||
CAST(SUM(weekly_time_seconds) AS INTEGER) AS weekly_seconds,
|
CAST(SUM(weekly_time_seconds) AS INTEGER) AS weekly_seconds,
|
||||||
ROUND(CAST(SUM(weekly_words_read) AS REAL) / (SUM(weekly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(weekly_words_read) AS REAL) / (SUM(weekly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS weekly_wpm
|
AS weekly_wpm
|
||||||
|
|
||||||
FROM document_user_statistics
|
FROM document_user_statistics
|
||||||
|
@ -977,22 +977,22 @@ SELECT
|
|||||||
|
|
||||||
CAST(SUM(total_words_read) AS INTEGER) AS total_words_read,
|
CAST(SUM(total_words_read) AS INTEGER) AS total_words_read,
|
||||||
CAST(SUM(total_time_seconds) AS INTEGER) AS total_seconds,
|
CAST(SUM(total_time_seconds) AS INTEGER) AS total_seconds,
|
||||||
ROUND(CAST(SUM(total_words_read) AS REAL) / (SUM(total_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(total_words_read) AS REAL) / (SUM(total_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS total_wpm,
|
AS total_wpm,
|
||||||
|
|
||||||
CAST(SUM(yearly_words_read) AS INTEGER) AS yearly_words_read,
|
CAST(SUM(yearly_words_read) AS INTEGER) AS yearly_words_read,
|
||||||
CAST(SUM(yearly_time_seconds) AS INTEGER) AS yearly_seconds,
|
CAST(SUM(yearly_time_seconds) AS INTEGER) AS yearly_seconds,
|
||||||
ROUND(CAST(SUM(yearly_words_read) AS REAL) / (SUM(yearly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(yearly_words_read) AS REAL) / (SUM(yearly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS yearly_wpm,
|
AS yearly_wpm,
|
||||||
|
|
||||||
CAST(SUM(monthly_words_read) AS INTEGER) AS monthly_words_read,
|
CAST(SUM(monthly_words_read) AS INTEGER) AS monthly_words_read,
|
||||||
CAST(SUM(monthly_time_seconds) AS INTEGER) AS monthly_seconds,
|
CAST(SUM(monthly_time_seconds) AS INTEGER) AS monthly_seconds,
|
||||||
ROUND(CAST(SUM(monthly_words_read) AS REAL) / (SUM(monthly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(monthly_words_read) AS REAL) / (SUM(monthly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS monthly_wpm,
|
AS monthly_wpm,
|
||||||
|
|
||||||
CAST(SUM(weekly_words_read) AS INTEGER) AS weekly_words_read,
|
CAST(SUM(weekly_words_read) AS INTEGER) AS weekly_words_read,
|
||||||
CAST(SUM(weekly_time_seconds) AS INTEGER) AS weekly_seconds,
|
CAST(SUM(weekly_time_seconds) AS INTEGER) AS weekly_seconds,
|
||||||
ROUND(CAST(SUM(weekly_words_read) AS REAL) / (SUM(weekly_time_seconds) / 60.0), 2)
|
ROUND(COALESCE(CAST(SUM(weekly_words_read) AS REAL) / (SUM(weekly_time_seconds) / 60.0), 0.0), 2)
|
||||||
AS weekly_wpm
|
AS weekly_wpm
|
||||||
|
|
||||||
FROM document_user_statistics
|
FROM document_user_statistics
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
{{template "base" .}} {{define "title"}}Home{{end}} {{define "header"}}
|
{{template "base" .}}
|
||||||
<a href="./">Home</a>
|
{{define "title"}}Home{{end}}
|
||||||
{{end}} {{define "content"}}
|
{{define "header"}}<a href="./">Home</a>{{end}}
|
||||||
|
|
||||||
|
{{define "content"}}
|
||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
<div class="w-full">
|
<div class="w-full">
|
||||||
<div
|
<div
|
||||||
@ -159,6 +161,62 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
|
{{ range $item := .Data.Streaks }}
|
||||||
|
<div class="w-full">
|
||||||
|
<div
|
||||||
|
class="relative w-full px-4 py-6 bg-white shadow-lg dark:bg-gray-700 rounded"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="text-sm font-semibold text-gray-700 border-b border-gray-200 w-max dark:text-white dark:border-gray-500"
|
||||||
|
>
|
||||||
|
{{ if eq $item.Window "WEEK" }}
|
||||||
|
Weekly Read Streak
|
||||||
|
{{ else }}
|
||||||
|
Daily Read Streak
|
||||||
|
{{ end }}
|
||||||
|
</p>
|
||||||
|
<div class="flex items-end my-6 space-x-2">
|
||||||
|
<p class="text-5xl font-bold text-black dark:text-white">
|
||||||
|
{{ $item.CurrentStreak }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="dark:text-white">
|
||||||
|
<div
|
||||||
|
class="flex items-center justify-between pb-2 mb-2 text-sm border-b border-gray-200"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
{{ if eq $item.Window "WEEK" }} Current Weekly Streak {{ else }}
|
||||||
|
Current Daily Streak {{ end }}
|
||||||
|
</p>
|
||||||
|
<div class="flex items-end text-sm text-gray-400">
|
||||||
|
{{ $item.CurrentStreakStartDate }} ➞ {{ $item.CurrentStreakEndDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-end font-bold">{{ $item.CurrentStreak }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between pb-2 mb-2 text-sm">
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
{{ if eq $item.Window "WEEK" }}
|
||||||
|
Best Weekly Streak
|
||||||
|
{{ else }}
|
||||||
|
Best Daily Streak
|
||||||
|
{{ end }}
|
||||||
|
</p>
|
||||||
|
<div class="flex items-end text-sm text-gray-400">
|
||||||
|
{{ $item.MaxStreakStartDate }} ➞ {{ $item.MaxStreakEndDate }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-end font-bold">{{ $item.MaxStreak }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{ end }}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||||
{{ template "component/leaderboard-card" (
|
{{ template "component/leaderboard-card" (
|
||||||
dict
|
dict
|
||||||
@ -180,61 +238,6 @@
|
|||||||
"Data" .Data.UserStatistics.Words
|
"Data" .Data.UserStatistics.Words
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
|
|
||||||
{{ range $item := .Data.Streaks }}
|
|
||||||
<div class="w-full">
|
|
||||||
<div
|
|
||||||
class="relative w-full px-4 py-6 bg-white shadow-lg dark:bg-gray-700 rounded"
|
|
||||||
>
|
|
||||||
<p
|
|
||||||
class="text-sm font-semibold text-gray-700 border-b border-gray-200 w-max dark:text-white dark:border-gray-500"
|
|
||||||
>
|
|
||||||
{{ if eq $item.Window "WEEK" }} Weekly Read Streak {{ else }} Daily
|
|
||||||
Read Streak {{ end }}
|
|
||||||
</p>
|
|
||||||
<div class="flex items-end my-6 space-x-2">
|
|
||||||
<p class="text-5xl font-bold text-black dark:text-white">
|
|
||||||
{{ $item.CurrentStreak }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="dark:text-white">
|
|
||||||
<div
|
|
||||||
class="flex items-center justify-between pb-2 mb-2 text-sm border-b border-gray-200"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
{{ if eq $item.Window "WEEK" }} Current Weekly Streak {{ else }}
|
|
||||||
Current Daily Streak {{ end }}
|
|
||||||
</p>
|
|
||||||
<div class="flex items-end text-sm text-gray-400">
|
|
||||||
{{ $item.CurrentStreakStartDate }} ➞ {{
|
|
||||||
$item.CurrentStreakEndDate }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-end font-bold">
|
|
||||||
{{ $item.CurrentStreak }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between pb-2 mb-2 text-sm">
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
{{ if eq $item.Window "WEEK" }} Best Weekly Streak {{ else }}
|
|
||||||
Best Daily Streak {{ end }}
|
|
||||||
</p>
|
|
||||||
<div class="flex items-end text-sm text-gray-400">
|
|
||||||
{{ $item.MaxStreakStartDate }} ➞ {{ $item.MaxStreakEndDate }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-end font-bold">{{ $item.MaxStreak }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user