Merge branch 'master' of projekte.fagott.pw:grilist

3 files changed, 59 insertions, 34 deletions

diff --git a/modules/grils/gril.go b/modules/grils/gril.go
index 9fd3be5..edf25a9 100644
--- a/modules/grils/gril.go
+++ b/modules/grils/gril.go
@@ -23,4 +23,5 @@ type Gril struct {
         Tags       []string
         ForeignIDs map[DataSource]int
         UpdatedAt  time.Time
+        Lists      []int
 }
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index e2eb543..a38f41f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -74,6 +74,26 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
         return grils, nil
 }
 
+func (m *GrilsModule) GetListsOfGril(gril *Gril) error {
+        rows, err := m.g.DB.Query(`SELECT list_id FROM grilist.lists_grils WHERE gril_id = $1`, gril.ID)
+        if err != nil {
+                return err
+        }
+
+        defer rows.Close()
+        for rows.Next() {
+                var listID int
+                if err := rows.Scan(&listID); err != nil {
+                        log.Println(err)
+                        continue
+                }
+
+                gril.Lists = append(gril.Lists, listID)
+        }
+
+        return nil
+}
+
 func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
         var categories []grilist.DashboardCategory
 
@@ -137,6 +157,10 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
                 return
         }
 
+        if err := m.GetListsOfGril(gril); err != nil {
+                log.Println(err)
+        }
+
         data := m.g.Renderer.DefaultData()
         data["user"] = user
         data["gril"] = gril
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index a7e822a..47501c2 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -143,32 +143,30 @@ func (m *Module) FromID(id int) (*List, error) {
         return lists[0], nil
 }
 
-func mkCard(title, description string, actions ...frontend.Action) frontend.Card {
-        card := frontend.Card{
-                Title:       title,
-                Description: description,
-                Size:        "medium",
-        }
-
-        for _, action := range actions {
-                card.Actions = append(card.Actions, action)
-        }
-
-        return card
-}
-
-func rowsToCard(rows *sql.Rows) []frontend.Card {
+func listsToCards(lists []*List) []frontend.Card {
         var cards []frontend.Card
 
-        for rows.Next() {
-                var id int
-                var title, description string
-                if err := rows.Scan(&id, &title, &description); err != nil {
-                        log.Println("error scanning row", err)
-                        continue
+        for _, list := range lists {
+                s := "s"
+                if len(list.Grils) == 1 {
+                        s = ""
                 }
-
-                cards = append(cards, mkCard(title, description, frontend.Action{"anguckieren", fmt.Sprintf("/list/%d", id)}))
+                cards = append(cards, frontend.Card{
+                        Title:       list.Name,
+                        Description: list.Description,
+                        Size:        "medium",
+                        Actions: []frontend.Action{
+                                frontend.Action{
+                                        Name: "anguckieren",
+                                        Link: fmt.Sprintf("/list/%d", list.ID),
+                                },
+                                frontend.Action{
+                                        Name: fmt.Sprintf(`<span class="chip">%d gril%s</span>`, len(list.Grils), s),
+                                        Link: "#",
+                                        Disabled: true,
+                                },
+                        },
+                })
         }
         return cards
 }
@@ -177,30 +175,32 @@ func rowsToCard(rows *sql.Rows) []frontend.Card {
 func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
         var categories []grilist.DashboardCategory
 
-        // Listen des Benutzers
-        rows, err := m.g.DB.Query(`SELECT id, name, description FROM grilist.lists WHERE user_id = $1`, user.ID)
+        // Neue Listen
+        lists, err := m.getLists(`1=1 ORDER BY id DESC LIMIT 5`)
         if err != nil {
                 log.Println(err)
-                return []grilist.DashboardCategory{}
+                return categories
         }
-        defer rows.Close()
 
         categories = append(categories, grilist.DashboardCategory{
-                Title: "Meine Listen",
-                Cards: rowsToCard(rows),
+                Title: "Neueste Listen",
+                Cards: listsToCards(lists),
         })
 
-        // Neue Listen
-        rows, err = m.g.DB.Query(`SELECT id, name, description FROM grilist.lists ORDER BY id DESC LIMIT 5`)
+        if user == nil {
+                return categories
+        }
+
+        // Listen des Benutzers
+        lists, err = m.getLists(`user_id = $1`, user.ID)
         if err != nil {
                 log.Println(err)
                 return categories
         }
-        defer rows.Close()
 
         categories = append(categories, grilist.DashboardCategory{
-                Title: "Neueste Listen",
-                Cards: rowsToCard(rows),
+                Title: "Meine Listen",
+                Cards: listsToCards(lists),
         })
 
         return categories