Merge pull request #52 from br0xen/master

View archived jams

Author: br0xen

admin_archive.go

@@ -20,12 +20,28 @@ func handleAdminArchive(w http.ResponseWriter, req *http.Request, page *pageData
 		redirect("/admin/jam", w, req)
 	} else if id != "" {
 		// Display a specific archive
+		agj := new(ArchivedGamejam)
 		for _, v := range m.archive.Jams {
 			if id == v.UUID {
-				page.TemplateData = v
+				agj.UUID = v.UUID
+				agj.Name = v.Name
+				agj.Date = v.Date
+				agj.Rankings = v.Rankings
+				agj.Teams = v.Teams
+				agj.Votes = v.Votes
 				break
 			}
 		}
+		// We want to replace the team UUIDs in the rankings with their name
+		for k, v := range agj.Rankings {
+			for _, tv := range agj.Teams {
+				if tv.UUID == v {
+					agj.Rankings[k] = tv.Name
+					break
+				}
+			}
+		}
+		page.TemplateData = agj
 		page.SubTitle = "Archived Game Jam"
 		page.show("admin-viewarchived.html", w)
 	} else {

assets.go

@@ -286,6 +286,7 @@ func InitPageData(w http.ResponseWriter, req *http.Request) *pageData {
 	// Build the menu
 	if p.LoggedIn {
 		p.Menu = append(p.Menu, menuItem{"Admin", "/admin", "fa-key"})
+		p.Menu = append(p.Menu, menuItem{"Jam", "/admin/jam", "fa-play-circle-o"})
 		p.Menu = append(p.Menu, menuItem{"Teams", "/admin/teams", "fa-users"})
 		p.Menu = append(p.Menu, menuItem{"Games", "/admin/games", "fa-gamepad"})
 		p.Menu = append(p.Menu, menuItem{"Votes", "/admin/votes", "fa-sticky-note"})

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"time"
@@ -125,11 +126,75 @@ func NewArchivedGamejam(uuid string) (*ArchivedGamejam, error) {
 	if err != nil {
 		return nil, err
 	}
-	// Probably we want to load in the teams & votes too...
+	// Now load in all of the teams
+	var tmUUIDs []string
+	if tmUUIDs, err = bolt.GetBucketList([]string{"jam", "teams"}); err != nil {
+		return nil, err
+	}
+	for _, v := range tmUUIDs {
+		tm, err := gj.LoadTeam(bolt, v)
+		if err != nil {
+			return nil, err
+		}
+		gj.Teams = append(gj.Teams, *tm)
+	}
+
+  // And finally, the Rankings
+  var ranks []string
+  if ranks, err = bolt.GetKeyList([]string{"jam", "rankings"}); err != nil {
+    return nil, err
+  }
+  fmt.Println("Ranks:", ranks)
+  for _, v := range ranks {
+    var tmUUID string
+    tmUUID, err = bolt.GetValue([]string{"jam", "rankings"}, v)
+    if err != nil {
+      return nil, err
+    }
+    gj.Rankings = append(gj.Rankings, tmUUID)
+  }
 
+  // We could pull votes too... But I'm not right now.
 	return gj, nil
 }
 
+func (a *ArchivedGamejam) LoadTeam(openbolt *boltease.DB, uuid string) (*Team, error) {
+	tm := NewTeam(uuid)
+	var err error
+	if tm.Name, err = openbolt.GetValue(tm.mPath, "name"); err != nil {
+		return nil, errors.New("Error loading team: " + err.Error())
+	}
+
+	// Load the Team Members
+	var memberUuids []string
+	mbrsPath := append(tm.mPath, "members")
+	if memberUuids, err = openbolt.GetBucketList(mbrsPath); err == nil {
+		for _, v := range memberUuids {
+			mbr, err := NewTeamMember(uuid, v)
+			if err != nil {
+				return nil, err
+			}
+			if mbr.Name, err = openbolt.GetValue(mbr.mPath, "name"); err != nil {
+				return nil, errors.New("Error loading team member: " + err.Error())
+			}
+			tm.Members = append(tm.Members, *mbr)
+		}
+	}
+
+	// Load the Team's Game
+	tm.Game, err = NewGame(uuid)
+	if err != nil {
+		return nil, err
+	}
+	if tm.Game.Name, err = openbolt.GetValue(tm.Game.mPath, "name"); err != nil {
+		tm.Game.Name = ""
+	}
+	if tm.Game.Link, err = openbolt.GetValue(tm.Game.mPath, "link"); err != nil {
+		tm.Game.Link = ""
+	}
+	return tm, nil
+}
+
 func (a *ArchivedGamejam) Save() error {
 	bolt, err := boltease.Create(DataDir+"/gamejam_"+a.UUID+".db", 0600, nil)
 	defer bolt.CloseDB()

model_archive.go

@@ -2,26 +2,41 @@
 <div>Couldn't find the requested archive.</div>
 {{ else }}
 <div class="space">
-  <h2>{{ .TemplateData.Name }} ({{.TemplateData.UUID}})</h2>
+  <h2 style="margin-bottom:0px;">{{ .TemplateData.Name }}</h2>
+  <span style="margin-top:0px;">({{.TemplateData.UUID}})</span>
 </div>
-<div class="space">
-  <h3>Votes: {{ len .TemplateData.Votes }}</h3>
+
+<div class="results-container">
+<h2>Final Results</h2>
+{{ range $i, $v := .TemplateData.Rankings }}
+  {{ $i }}: {{ $v }}<br />
+{{ end }}
 </div>
-<h3>Teams</h3>
-<table id="archive-teams" class="sortable pure-table pure-table-bordered center">
+
+<h2>All Teams</h2>
+<table id="teams-table" class="sortable pure-table pure-table-bordered center">
   <thead>
       <tr>
           <th>Name</th>
-          <th></th>
+          <th class="only-large">Members</th>
+          <th class="only-large">Game</th>
       </tr>
   </thead>
   <tbody>
-      {{ range $i, $v := .TemplateData.Jams }} 
+  {{ range $i, $v := .TemplateData.Teams }}
       <tr>
-          <td>{{ $v.Name }}</td>
-          <td class="only-large"><a href="/admin/archive/{{ $v.UUID }}">{{ $v.UUID }}</a></td>
+          <td>{{ $v.Name }}<p class="only-small">{{ $v.Game.Name }}</p></td>
+          <td class="only-large">{{ len $v.Members }}</td>
+          <td class="only-large">
+          {{ if $v.Game.Link }}
+            <a href="{{$v.Game.Link}}">
+          {{ end }}
+            {{ $v.Game.Name }}
+          {{ if $v.Game.Link }}
+            </a>
+          {{ end }}
+          </td>
       </tr>
-      {{ end }}
-  </tbody>
+  {{ end }}
 </table>
 {{ end }}