feat(stats): display total number of people in period

components/mostWatchedPerson.templ

@@ -1,11 +1,15 @@
 package components
 
-import "fmt"
+import (
+ "fmt"
+ "strconv"
+)
 
 type MostWatchedPersonProps struct {
  Data []ListItem
  Job string
  Title string
+ Total int
  Year string
  Years []string
 }
@@ -16,6 +20,9 @@ templ MostWatchedPerson(props MostWatchedPersonProps) {
  @Dropdown(DropdownProps{Route: fmt.Sprintf("/stats/most-watched-person/%s", props.Job), Options: props.Years, Value: props.Year})
  }
  @OrderedList(props.Data, "person")
+ <div class="text-xs text-right text-neutral-500 dark:text-neutral-400">
+ { strconv.Itoa( props.Total ) } people total
+ </div>
  }
 }
 

db/queries.sql

@@ -260,6 +260,18 @@ ORDER BY
  count DESC
 LIMIT 10;
 
+-- name: total-watched-by-job-and-year
+SELECT
+ COUNT(*) AS count
+FROM
+ seen s
+ INNER JOIN movie_person mp ON mp.movie_id = s.movie_id
+WHERE
+ user_id = $1
+ AND mp.job = $2
+ AND ($3 = 'All'
+ OR EXTRACT(YEAR FROM date) = $3::int);
+
 -- name: stats-watched-by-year
 SELECT
  EXTRACT(YEAR FROM date) AS label,

handlers/stats.go

@@ -37,9 +37,11 @@ func HandleGetStats(c *fiber.Ctx) error {
  var movies []components.ListItem
  var shortestAndLongest types.Movies
  var wilhelms []int
+ var totals []components.ListItem
 
  userId := c.Locals("UserId").(string)
  now := time.Now()
+ year := now.Format("2006")
  currentYear := now.Format("2006-01-02 15:04:05")
 
  err := db.Dot.Select(db.Client, &movies, "stats-most-watched-movies", userId)
@@ -56,6 +58,12 @@ func HandleGetStats(c *fiber.Ctx) error {
  return err
  }
 
+ err = db.Dot.Select(db.Client, &totals, "total-watched-by-job-and-year", userId, "cast", year)
+
+ if err != nil {
+ return err
+ }
+
  err = db.Dot.Get(db.Client, &stats, "stats-data", userId)
 
  if err != nil {
@@ -128,7 +136,11 @@ func HandleGetStats(c *fiber.Ctx) error {
  }
  }
 
- year := now.Format("2006")
+ totalCast := 0
+
+ if len(totals) > 0 {
+ totalCast = totals[0].Count
+ }
 
  return utils.TemplRender(c, views.Stats(
  views.StatsProps{
@@ -141,6 +153,7 @@ func HandleGetStats(c *fiber.Ctx) error {
  Ratings: ratings,
  SeenThisYear: seenThisYearByMonth,
  Stats: stats,
+ TotalCast: totalCast,
  WatchedByYear: watchedByYear,
  Year: year,
  YearRatings: yearRatings,
@@ -152,6 +165,7 @@ func HandleGetStats(c *fiber.Ctx) error {
 
 func HandleGetMostWatchedByJob(c *fiber.Ctx) error {
  var persons []components.ListItem
+ var totals []components.ListItem
 
  job := c.Params("job")
  year := c.Query("year", "All")
@@ -165,14 +179,27 @@ func HandleGetMostWatchedByJob(c *fiber.Ctx) error {
  return err
  }
 
- return utils.TemplRender(c, components.MostWatchedPerson(components.MostWatchedPersonProps{
- Data: persons,
- Job: job,
- Title: cases.Title(language.English).String(job),
- Year: year,
- Years: years,
- },
- ))
+ err = db.Dot.Select(db.Client, &totals, "total-watched-by-job-and-year", userId, job, year)
+
+ if err != nil {
+ return err
+ }
+
+ totalJob := 0
+
+ if len(totals) > 0 {
+ totalJob = totals[0].Count
+ }
+
+ return utils.TemplRender(c, components.MostWatchedPerson(
+ components.MostWatchedPersonProps{
+ Data: persons,
+ Job: job,
+ Title: cases.Title(language.English).String(job),
+ Total: totalJob,
+ Year: year,
+ Years: years,
+ }))
 }
 
 func getGraphWithQuery(query string, userId string) ([]types.Bar, error) {

public/styles.323df8.css → public/styles.5709e2.css

@@ -913,6 +913,10 @@ video {
  text-align: center;
 }
 
+.text-right {
+ text-align: right;
+}
+
 .text-base {
  font-size: 1rem;
  line-height: 1.5rem;

public/styles.css

@@ -923,6 +923,10 @@ video {
  text-align: center;
 }
 
+.text-right {
+ text-align: right;
+}
+
 .text-base {
  font-size: 1rem;
  line-height: 1.5rem;

views/stats.templ

@@ -27,6 +27,7 @@ type StatsProps struct {
  SeenThisYear []types.Bar
  ShortestAndLongestMovie types.Movies
  Stats types.Stats
+ TotalCast int
  WatchedByYear []types.Bar
  WilhelmScreams int
  Year string
@@ -174,6 +175,7 @@ templ Stats(props StatsProps) {
  Job: "cast",
  Title: "Cast",
  Data: props.MostWatchedCast,
+ Total: props.TotalCast,
  Year: "All",
  Years: append([]string{"All"}, props.Years...),
  })