From 973a33135735f95c7cd260a68a7a696fee3327c4 Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:03:57 +0100
Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20Change=20project=20?=
 =?UTF-8?q?location=20to=20a=20string=20(from=20int64)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CSV import now supports a 15th column (index 14, column O in Excel)
with the location of a team (e.g. 14.3).
String is flexible for any format that logistics chooses.
---
 client/src/enums.ts      |  2 +-
 server/funcs/csv.go      | 80 ++++++++++++++--------------------------
 server/models/flag.go    |  2 +-
 server/models/judge.go   |  2 +-
 server/models/project.go |  4 +-
 server/router/project.go | 27 +++-----------
 6 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/client/src/enums.ts b/client/src/enums.ts
index 9a025ae..bac6b55 100644
--- a/client/src/enums.ts
+++ b/client/src/enums.ts
@@ -9,7 +9,7 @@ export enum JudgeSortField {
 
 export enum ProjectSortField {
     Name,
-    TableNumber,
+    Location,
     Score,
     Seen,
     Updated,
diff --git a/server/funcs/csv.go b/server/funcs/csv.go
index a29b2b3..7fc036d 100644
--- a/server/funcs/csv.go
+++ b/server/funcs/csv.go
@@ -3,12 +3,10 @@ package funcs
 import (
 	"archive/zip"
 	"bytes"
-	"context"
 	"encoding/csv"
 	"fmt"
 	"io"
 	"net/http"
-	"server/database"
 	"server/models"
 	"server/util"
 	"strings"
@@ -26,12 +24,6 @@ func ParseProjectCsv(content string, hasHeader bool, db *mongo.Database) ([]*mod
 		return []*models.Project{}, nil
 	}
 
-	// Get the options from the database
-	options, err := database.GetOptions(db)
-	if err != nil {
-		return nil, err
-	}
-
 	// If the CSV file has a header, skip the first line
 	if hasHeader {
 		r.Read()
@@ -48,15 +40,15 @@ func ParseProjectCsv(content string, hasHeader bool, db *mongo.Database) ([]*mod
 			return nil, err
 		}
 
-		// Make sure the record has at least 3 elements (name, description, URL)
-		if len(record) < 3 {
-			return nil, fmt.Errorf("record contains less than 3 elements: '%s'", strings.Join(record, ","))
+		// Make sure the record has at least 4 elements (name, location, description, URL)
+		if len(record) < 4 {
+			return nil, fmt.Errorf("record contains less than 4 elements: '%s'", strings.Join(record, ","))
 		}
 
 		// Get the challenge list
-		challengeList := []string{}
-		if len(record) > 5 && record[5] != "" {
-			challengeList = strings.Split(record[5], ",")
+		var challengeList []string
+		if len(record) > 5 && record[6] != "" {
+			challengeList = strings.Split(record[6], ",")
 		}
 		for i := range challengeList {
 			challengeList[i] = strings.TrimSpace(challengeList[i])
@@ -64,25 +56,16 @@ func ParseProjectCsv(content string, hasHeader bool, db *mongo.Database) ([]*mod
 
 		// Optional fields
 		var tryLink string
-		if len(record) > 3 && record[3] != "" {
+		if len(record) > 3 && record[4] != "" {
 			tryLink = record[3]
 		}
 		var videoLink string
-		if len(record) > 4 && record[4] != "" {
+		if len(record) > 4 && record[5] != "" {
 			videoLink = record[4]
 		}
 
-		// Increment the table number
-		database.GetNextTableNum(options)
-
 		// Add project to slice
-		projects = append(projects, models.NewProject(record[0], options.CurrTableNum, record[1], record[2], tryLink, videoLink, challengeList))
-	}
-
-	// Update the options table number in the database
-	err = database.UpdateCurrTableNum(db, context.Background(), options.CurrTableNum)
-	if err != nil {
-		return nil, err
+		projects = append(projects, models.NewProject(record[0], record[1], record[2], record[3], tryLink, videoLink, challengeList))
 	}
 
 	return projects, nil
@@ -105,7 +88,8 @@ func ParseProjectCsv(content string, hasHeader bool, db *mongo.Database) ([]*mod
 //  11. Notes - ignore
 //  12. Team Colleges/Universities - ignore
 //  13. Additional Team Member Count - ignore
-//  14. (and remiaining rows) Custom questions - custom_questions (ignore for now)
+//  14. !!Table number - location
+//  15. (and remiaining columns) Custom questions - custom_questions (ignore for now)
 func ParseDevpostCSV(content string, db *mongo.Database) ([]*models.Project, error) {
 	r := csv.NewReader(strings.NewReader(content))
 
@@ -115,10 +99,7 @@ func ParseDevpostCSV(content string, db *mongo.Database) ([]*models.Project, err
 	}
 
 	// Skip the first line
-	r.Read()
-
-	// Get the options from the database
-	options, err := database.GetOptions(db)
+	_, err := r.Read()
 	if err != nil {
 		return nil, err
 	}
@@ -135,8 +116,8 @@ func ParseDevpostCSV(content string, db *mongo.Database) ([]*models.Project, err
 		}
 
 		// Make sure the record has 14 or more elements (see above)
-		if len(record) < 13 {
-			return nil, fmt.Errorf("record does not contain 14 or more elements (invalid devpost csv): '%s'", strings.Join(record, ","))
+		if len(record) < 14 {
+			return nil, fmt.Errorf("record does not contain 15 or more elements (invalid devpost csv): '%s'", strings.Join(record, ","))
 		}
 
 		// If the project is a Draft, skip it
@@ -153,13 +134,18 @@ func ParseDevpostCSV(content string, db *mongo.Database) ([]*models.Project, err
 			challengeList[i] = strings.TrimSpace(challengeList[i])
 		}
 
-		// Increment table number
-		database.GetNextTableNum(options)
+		// Interpret location string
+		location := ""
+		if record[14] == "" {
+			location = "No location given."
+		} else {
+			location = record[14]
+		}
 
 		// Add project to slice
 		projects = append(projects, models.NewProject(
 			record[0],
-			options.CurrTableNum,
+			location,
 			record[6],
 			record[1],
 			record[7],
@@ -168,12 +154,6 @@ func ParseDevpostCSV(content string, db *mongo.Database) ([]*models.Project, err
 		))
 	}
 
-	// Update the options table number in the database
-	err = database.UpdateCurrTableNum(db, context.Background(), options.CurrTableNum)
-	if err != nil {
-		return nil, err
-	}
-
 	return projects, nil
 }
 
@@ -210,7 +190,7 @@ func CreateJudgeRankingCSV(judges []*models.Judge) []byte {
 		}
 
 		// Create a list of all ranked projects (just their location)
-		ranked := make([]int64, 0, len(judge.CurrentRankings))
+		ranked := make([]string, 0, len(judge.CurrentRankings))
 		for _, projId := range judge.CurrentRankings {
 			idx := util.IndexFunc(judge.SeenProjects, func(p models.JudgedProject) bool {
 				return p.ProjectId == projId
@@ -223,20 +203,16 @@ func CreateJudgeRankingCSV(judges []*models.Judge) []byte {
 		}
 
 		// Create a list of all unranked projects (filter using ranked projects)
-		unranked := make([]int64, 0, len(judge.SeenProjects)-len(judge.CurrentRankings))
+		unranked := make([]string, 0, len(judge.SeenProjects)-len(judge.CurrentRankings))
 		for _, proj := range judge.SeenProjects {
-			if util.ContainsFunc(ranked, func(table int64) bool { return table == proj.Location }) {
+			if util.ContainsFunc(ranked, func(location string) bool { return location == proj.Location }) {
 				unranked = append(unranked, proj.Location)
 			}
 		}
 
-		// Convert arrays to strings
-		rankedStr := util.IntToString(ranked)
-		unrankedStr := util.IntToString(unranked)
-
 		// Write line to CSV
 		// lucatodo: get judge info (from gocloak using admin api) to write to csv
-		w.Write([]string{judge.KeycloakUserId, strings.Join(rankedStr, ","), strings.Join(unrankedStr, ",")})
+		w.Write([]string{judge.KeycloakUserId, strings.Join(ranked, ","), strings.Join(unranked, ",")})
 	}
 
 	// Flush the writer
@@ -253,11 +229,11 @@ func CreateProjectCSV(projects []*models.Project) []byte {
 	w := csv.NewWriter(csvBuffer)
 
 	// Write the header
-	w.Write([]string{"Name", "Table", "Description", "URL", "TryLink", "VideoLink", "ChallengeList", "Seen", "Active", "LastActivity"})
+	w.Write([]string{"Name", "Location", "Description", "URL", "TryLink", "VideoLink", "ChallengeList", "Seen", "Active", "LastActivity"})
 
 	// Write each project
 	for _, project := range projects {
-		w.Write([]string{project.Name, fmt.Sprintf("Table %d", project.Location), project.Description, project.Url, project.TryLink, project.VideoLink, strings.Join(project.ChallengeList, ","), fmt.Sprintf("%d", project.Seen), fmt.Sprintf("%t", project.Active), fmt.Sprintf("%d", project.LastActivity)})
+		w.Write([]string{project.Name, project.Location, project.Description, project.Url, project.TryLink, project.VideoLink, strings.Join(project.ChallengeList, ","), fmt.Sprintf("%d", project.Seen), fmt.Sprintf("%t", project.Active), fmt.Sprintf("%d", project.LastActivity)})
 	}
 
 	// Flush the writer
diff --git a/server/models/flag.go b/server/models/flag.go
index f87034e..3b83f5f 100644
--- a/server/models/flag.go
+++ b/server/models/flag.go
@@ -28,7 +28,7 @@ type Flag struct {
 	JudgeId         *primitive.ObjectID `json:"judge_id" bson:"judge_id"`
 	Time            primitive.DateTime  `json:"time" bson:"time"`
 	ProjectName     string              `json:"project_name" bson:"project_name"`
-	ProjectLocation int64               `json:"project_location" bson:"project_location"`
+	ProjectLocation string              `json:"project_location" bson:"project_location"`
 	JudgeName       string              `json:"judge_name" bson:"judge_name"`
 	Reason          string              `json:"reason" bson:"reason"`
 }
diff --git a/server/models/judge.go b/server/models/judge.go
index d86ec7e..cf2522f 100644
--- a/server/models/judge.go
+++ b/server/models/judge.go
@@ -24,7 +24,7 @@ type JudgedProject struct {
 	Categories  map[string]int     `bson:"categories" json:"categories"`
 	Notes       string             `bson:"notes" json:"notes"`
 	Name        string             `bson:"name" json:"name"`
-	Location    int64              `bson:"location" json:"location"`
+	Location    string             `bson:"location" json:"location"`
 	Description string             `bson:"description" json:"description"`
 }
 
diff --git a/server/models/project.go b/server/models/project.go
index f9da72a..99bc8a4 100644
--- a/server/models/project.go
+++ b/server/models/project.go
@@ -9,7 +9,7 @@ import (
 type Project struct {
 	Id            primitive.ObjectID `bson:"_id,omitempty" json:"id"`
 	Name          string             `bson:"name" json:"name"`
-	Location      int64              `bson:"location" json:"location"`
+	Location      string             `bson:"location" json:"location"`
 	Description   string             `bson:"description" json:"description"`
 	Url           string             `bson:"url" json:"url"`
 	TryLink       string             `bson:"try_link" json:"try_link"`
@@ -20,7 +20,7 @@ type Project struct {
 	LastActivity  primitive.DateTime `bson:"last_activity" json:"last_activity"`
 }
 
-func NewProject(name string, location int64, description string, url string, tryLink string, videoLink string, challengeList []string) *Project {
+func NewProject(name string, location string, description string, url string, tryLink string, videoLink string, challengeList []string) *Project {
 	return &Project{
 		Name:          name,
 		Location:      location,
diff --git a/server/router/project.go b/server/router/project.go
index c9950c3..3943801 100644
--- a/server/router/project.go
+++ b/server/router/project.go
@@ -1,12 +1,10 @@
 package router
 
 import (
-	"context"
 	"net/http"
 	"server/database"
 	"server/funcs"
 	"server/models"
-	"sort"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -61,6 +59,7 @@ func AddDevpostCsv(ctx *gin.Context) {
 
 type AddProjectRequest struct {
 	Name          string `json:"name"`
+	Location      string `json:"location"`
 	Description   string `json:"description"`
 	Url           string `json:"url"`
 	TryLink       string `json:"tryLink"`
@@ -82,15 +81,8 @@ func AddProject(ctx *gin.Context) {
 	}
 
 	// Make sure name, description, and url are defined
-	if projectReq.Name == "" || projectReq.Description == "" || projectReq.Url == "" {
-		ctx.JSON(http.StatusBadRequest, gin.H{"error": "name, description, and url are required"})
-		return
-	}
-
-	// Get the options from the database
-	options, err := database.GetOptions(db)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error getting options from database: " + err.Error()})
+	if projectReq.Name == "" || projectReq.Description == "" || projectReq.Url == "" || projectReq.Location == "" {
+		ctx.JSON(http.StatusBadRequest, gin.H{"error": "name, description, url and a location are required"})
 		return
 	}
 
@@ -103,22 +95,13 @@ func AddProject(ctx *gin.Context) {
 		challengeList[i] = strings.TrimSpace(challengeList[i])
 	}
 
-	// Increment table num
-	database.GetNextTableNum(options)
-
 	// Create the project
-	project := models.NewProject(projectReq.Name, options.CurrTableNum, projectReq.Description, projectReq.Url, projectReq.TryLink, projectReq.VideoLink, challengeList)
+	project := models.NewProject(projectReq.Name, projectReq.Location, projectReq.Description, projectReq.Url, projectReq.TryLink, projectReq.VideoLink, challengeList)
 
 	// Insert project and update the next table num field in options
 	err = database.WithTransaction(db, func(ctx mongo.SessionContext) (interface{}, error) {
 		// Insert project
 		err := database.InsertProject(db, ctx, project)
-		if err != nil {
-			return nil, err
-		}
-
-		// Update next table num in options doc
-		err = database.UpdateCurrTableNum(db, ctx, options.CurrTableNum)
 		return nil, err
 	})
 	if err != nil {
@@ -148,7 +131,7 @@ func ListProjects(ctx *gin.Context) {
 
 type PublicProject struct {
 	Name          string `json:"name"`
-	Location      int64  `json:"location"`
+	Location      string `json:"location"`
 	Description   string `json:"description"`
 	Url           string `json:"url"`
 	TryLink       string `json:"tryLink"`

From 0d1b2bde01c2b8a3c24494677da5aac204a85fbd Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:06:32 +0100
Subject: [PATCH 2/6] =?UTF-8?q?=E2=9A=B0=20Remove=20old=20current=20table?=
 =?UTF-8?q?=20number=20functionality?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was used when table numbers were assigned automatically based on
import order and is no longer needed now that location has to be
specified.
---
 server/database/options.go |  6 ------
 server/database/util.go    | 10 ----------
 server/models/options.go   |  2 --
 server/models/project.go   |  4 ----
 4 files changed, 22 deletions(-)

diff --git a/server/database/options.go b/server/database/options.go
index f2cf043..1ae03cc 100644
--- a/server/database/options.go
+++ b/server/database/options.go
@@ -23,12 +23,6 @@ func GetOptions(db *mongo.Database) (*models.Options, error) {
 	return &options, err
 }
 
-// UpdateOptions updates the current table number in the database
-func UpdateCurrTableNum(db *mongo.Database, ctx context.Context, currTableNum int64) error {
-	_, err := db.Collection("options").UpdateOne(ctx, gin.H{}, gin.H{"$set": gin.H{"curr_table_num": currTableNum}})
-	return err
-}
-
 // UpdateOptions updates the clock in the database
 func UpdateClock(db *mongo.Database, clock *models.ClockState) error {
 	_, err := db.Collection("options").UpdateOne(context.Background(), gin.H{}, gin.H{"$set": gin.H{"clock": clock}})
diff --git a/server/database/util.go b/server/database/util.go
index 4b72bcf..1a78630 100644
--- a/server/database/util.go
+++ b/server/database/util.go
@@ -2,8 +2,6 @@ package database
 
 import (
 	"context"
-	"server/models"
-
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/writeconcern"
@@ -22,11 +20,3 @@ func WithTransaction(db *mongo.Database, fn func(mongo.SessionContext) (interfac
 	_, err = session.WithTransaction(context.Background(), fn, txnOptions)
 	return err
 }
-
-// GetNextTableNum increments the table number and returns the new table number
-// TODO: Are we updating the current table number in the database?
-func GetNextTableNum(o *models.Options) int64 {
-	// Increment table number
-	o.CurrTableNum++
-	return o.CurrTableNum
-}
diff --git a/server/models/options.go b/server/models/options.go
index 80ce53b..fa0e6b9 100644
--- a/server/models/options.go
+++ b/server/models/options.go
@@ -5,7 +5,6 @@ import "go.mongodb.org/mongo-driver/bson/primitive"
 type Options struct {
 	Id               primitive.ObjectID `bson:"_id,omitempty" json:"id"`
 	Ref              int64              `bson:"ref" json:"ref"`
-	CurrTableNum     int64              `bson:"curr_table_num" json:"curr_table_num"`
 	Clock            ClockState         `bson:"clock" json:"clock"`
 	JudgingTimer     int64              `bson:"judging_timer" json:"judging_timer"`
 	MinViews         int64              `bson:"min_views" json:"min_views"`
@@ -16,7 +15,6 @@ type Options struct {
 func NewOptions() *Options {
 	return &Options{
 		Ref:              0,
-		CurrTableNum:     0,
 		JudgingTimer:     300,
 		MinViews:         3,
 		Clock:            *NewClockState(),
diff --git a/server/models/project.go b/server/models/project.go
index 99bc8a4..b388d19 100644
--- a/server/models/project.go
+++ b/server/models/project.go
@@ -35,10 +35,6 @@ func NewProject(name string, location string, description string, url string, tr
 	}
 }
 
-func DefaultProject() *Project {
-	return NewProject("", 0, "", "", "", "", []string{})
-}
-
 // Create custom marshal function to change the format of the primitive.DateTime to a unix timestamp
 func (p *Project) MarshalJSON() ([]byte, error) {
 	type Alias Project

From 9bf29bc366143d0c25b48ea1e2f4478fdfd762e0 Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:12:33 +0100
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=92=84=20Rename=20table=20to=20locati?=
 =?UTF-8?q?on=20on=20frontend=20and=20handle=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change previous number type to string in line with backend.
---
 .../admin/add-projects/NewProjectForm.tsx     |  2 ++
 .../components/admin/tables/ProjectRow.tsx    |  2 +-
 .../components/admin/tables/ProjectsTable.tsx |  8 ++---
 .../src/components/judge/ProjectDisplay.tsx   |  2 +-
 client/src/components/judge/ProjectEntry.tsx  |  5 ++-
 client/src/pages/admin/settings.tsx           | 36 -------------------
 client/src/pages/judge/project.tsx            |  2 +-
 client/src/types.d.ts                         | 10 +++---
 8 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/client/src/components/admin/add-projects/NewProjectForm.tsx b/client/src/components/admin/add-projects/NewProjectForm.tsx
index 9dc04e3..b0c8d33 100644
--- a/client/src/components/admin/add-projects/NewProjectForm.tsx
+++ b/client/src/components/admin/add-projects/NewProjectForm.tsx
@@ -7,6 +7,7 @@ import { errorAlert } from '../../../util';
 
 interface NewProjectData {
     name: string;
+    location: string;
     description: string;
     url: string;
     link: string;
@@ -45,6 +46,7 @@ const NewProjectForm = () => {
                 <h1 className="text-3xl mb-4">Add Project</h1>
                 <form className="flex flex-col w-full space-y-4" onSubmit={handleSubmit(onSubmit)}>
                     <TextInput name="name" placeholder="Name" register={register} />
+                    <TextInput name="location" placeholder="Team location" register={register} />
                     <TextArea
                         name="description"
                         placeholder="Description"
diff --git a/client/src/components/admin/tables/ProjectRow.tsx b/client/src/components/admin/tables/ProjectRow.tsx
index 9c6ba07..b52cfdd 100644
--- a/client/src/components/admin/tables/ProjectRow.tsx
+++ b/client/src/components/admin/tables/ProjectRow.tsx
@@ -88,7 +88,7 @@ const ProjectRow = ({ project, idx, checked, handleCheckedChange }: ProjectRowPr
                 </td>
                 <td>{project.name}</td>
                 <td className="text-center py-1">
-                    Table {project.location} {checked}
+                    {project.location} {checked}
                 </td>
                 <td className="text-center">{project.score}</td>
                 <td className="text-center">{project.seen}</td>
diff --git a/client/src/components/admin/tables/ProjectsTable.tsx b/client/src/components/admin/tables/ProjectsTable.tsx
index d695399..d9a88ed 100644
--- a/client/src/components/admin/tables/ProjectsTable.tsx
+++ b/client/src/components/admin/tables/ProjectsTable.tsx
@@ -63,8 +63,8 @@ const ProjectsTable = () => {
             case ProjectSortField.Name:
                 sortFunc = (a, b) => a.name.localeCompare(b.name) * asc;
                 break;
-            case ProjectSortField.TableNumber:
-                sortFunc = (a, b) => (a.location - b.location) * asc;
+            case ProjectSortField.Location:
+                sortFunc = (a, b) => a.location.localeCompare(b.location) * asc;
                 break;
             case ProjectSortField.Score:
                 sortFunc = (a, b) => (a.score - b.score) * asc;
@@ -94,9 +94,9 @@ const ProjectsTable = () => {
                             align='left'
                         />
                         <HeaderEntry
-                            name="Table"
+                            name="Location"
                             updateSort={updateSort}
-                            sortField={ProjectSortField.TableNumber}
+                            sortField={ProjectSortField.Location}
                             sortState={sortState}
                         />
                         <HeaderEntry
diff --git a/client/src/components/judge/ProjectDisplay.tsx b/client/src/components/judge/ProjectDisplay.tsx
index 8d931b7..4c1c255 100644
--- a/client/src/components/judge/ProjectDisplay.tsx
+++ b/client/src/components/judge/ProjectDisplay.tsx
@@ -46,7 +46,7 @@ const ProjectDisplay = (props: ProjectDisplayProps) => {
                     {project.name}
                 </a>
             </h1>
-            <h2 className="text-xl mb-1">Table {project.location}</h2>
+            <h2 className="text-xl mb-1">Location: {project.location}</h2>
             <Paragraph className="text-light" text={project.description} />
         </div>
     );
diff --git a/client/src/components/judge/ProjectEntry.tsx b/client/src/components/judge/ProjectEntry.tsx
index 43fccd8..6d78933 100644
--- a/client/src/components/judge/ProjectEntry.tsx
+++ b/client/src/components/judge/ProjectEntry.tsx
@@ -43,9 +43,8 @@ const ProjectEntry = ({ project, ranking }: ProjectEntryProps) => {
                     <div>
                         <h3 className="text-xl grow">
                             <a href={`/judge/project/${project.project_id}`}>
-                                <b>Table {project.location}</b>
-                                {': '}
-                                {project.name}
+                                <b>{project.name}</b>
+                                &nbsp;({project.location})
                             </a>
                         </h3>
                         <p className="text-light text-xs line-clamp-1">{project.notes}</p>
diff --git a/client/src/pages/admin/settings.tsx b/client/src/pages/admin/settings.tsx
index c2f657e..e56dffe 100644
--- a/client/src/pages/admin/settings.tsx
+++ b/client/src/pages/admin/settings.tsx
@@ -64,16 +64,6 @@ const AdminSettings = () => {
         getOptions();
     }, []);
 
-    const reassignTables = async () => {
-        const res = await postRequest<OkResponse>('/project/reassign', null);
-        if (res.status !== 200 || res.data?.ok !== 1) {
-            errorAlert(res);
-            return;
-        }
-        alert('Table numbers reassigned!');
-        setReassignPopup(false);
-    };
-
     const updateTimer = async () => {
         // Convert judging timer to time
         const [minutes, seconds] = judgingTimer.split(':');
@@ -320,21 +310,6 @@ const AdminSettings = () => {
 
                 <Section>Judging Parameters</Section>
 
-                <SubSection>Reassign Project Numbers</SubSection>
-                <Description>
-                    Reassign all project numbers to the projects. This will keep the relative order
-                    but reassign the project numbers starting from the first project.
-                </Description>
-                <Button
-                    type="primary"
-                    onClick={() => {
-                        setReassignPopup(true);
-                    }}
-                    className="mt-4 mb-8 w-auto md:w-auto px-4 py-2 bg-gold text-black"
-                >
-                    Reassign
-                </Button>
-
                 <SubSection>Set Minimum Project Views</SubSection>
                 <Description>
                     Set the minimum amount of times that a project should be seen during judging.
@@ -417,17 +392,6 @@ const AdminSettings = () => {
                     Drop Database
                 </Button>
             </div>
-            <TextPopup
-                enabled={reassignPopup}
-                setEnabled={setReassignPopup}
-                onSubmit={reassignTables}
-                submitText="Reassign"
-                title="Heads Up!"
-                red
-            >
-                Are you sure you want to reassign project numbers? This should NOT be done DURING
-                judging; only beforehand!!
-            </TextPopup>
             <TextPopup
                 enabled={clockResetPopup}
                 setEnabled={setClockResetPopup}
diff --git a/client/src/pages/judge/project.tsx b/client/src/pages/judge/project.tsx
index e052bd0..96ff538 100644
--- a/client/src/pages/judge/project.tsx
+++ b/client/src/pages/judge/project.tsx
@@ -66,7 +66,7 @@ const Project = () => {
                         {project.name}
                     </a>
                 </h1>
-                <h2 className="text-xl font-bold text-light mb-2">Table {project.location}</h2>
+                <h2 className="text-xl font-bold text-light mb-2">Location: {project.location}</h2>
                 <Ratings
                     prior={project.categories}
                     project={project}
diff --git a/client/src/types.d.ts b/client/src/types.d.ts
index b6f027e..ccad679 100644
--- a/client/src/types.d.ts
+++ b/client/src/types.d.ts
@@ -1,7 +1,7 @@
 interface Project {
     id: string;
     name: string;
-    location: number;
+    location: string;
     description: string;
     url: string;
     try_link: string;
@@ -59,9 +59,9 @@ type VotePopupState = 'vote' | 'skip' | 'flag';
 
 interface VotingProjectInfo {
     curr_name: string;
-    curr_location: number;
+    curr_location: string;
     prev_name: string;
-    prev_location: number;
+    prev_location: string;
 }
 
 interface OkResponse {
@@ -77,7 +77,7 @@ interface JudgedProject {
     categories: { [name: string]: number };
     notes: string;
     name: string;
-    location: number;
+    location: string;
     description: string;
 }
 
@@ -109,7 +109,7 @@ interface Flag {
     time: number;
     project_name: string;
     judge_name: string;
-    project_location: number;
+    project_location: string;
     reason: string;
 }
 

From e06a8719b8aa0ca3439784177533a45c78d48833 Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:45:22 +0100
Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=90=9B=20Handle=20long=20project=20na?=
 =?UTF-8?q?mes=20around=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Involved stabbing me repeatedly with frontend flex-box shaped knives.
But it works now I think 😀
(in Chrome at least)
---
 .../components/admin/tables/ProjectRow.tsx    |  2 +-
 .../src/components/judge/ProjectDisplay.tsx   |  2 +-
 client/src/components/judge/ProjectEntry.tsx  | 21 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/src/components/admin/tables/ProjectRow.tsx b/client/src/components/admin/tables/ProjectRow.tsx
index b52cfdd..4a88b9e 100644
--- a/client/src/components/admin/tables/ProjectRow.tsx
+++ b/client/src/components/admin/tables/ProjectRow.tsx
@@ -86,7 +86,7 @@ const ProjectRow = ({ project, idx, checked, handleCheckedChange }: ProjectRowPr
                         className="cursor-pointer hover:text-primary duration-100"
                     ></input>
                 </td>
-                <td>{project.name}</td>
+                <td className="[&:not(:hover)]:truncate hover:break-words hover:text-wrap">{project.name}</td>
                 <td className="text-center py-1">
                     {project.location} {checked}
                 </td>
diff --git a/client/src/components/judge/ProjectDisplay.tsx b/client/src/components/judge/ProjectDisplay.tsx
index 4c1c255..1caa511 100644
--- a/client/src/components/judge/ProjectDisplay.tsx
+++ b/client/src/components/judge/ProjectDisplay.tsx
@@ -41,7 +41,7 @@ const ProjectDisplay = (props: ProjectDisplayProps) => {
 
     return (
         <div className={twMerge('px-2', props.className)}>
-            <h1 className="text-3xl mb-1 font-bold">
+            <h1 className="text-3xl mb-1 font-bold break-words text-wrap">
                 <a href={project.url} target="_blank" rel="noopener noreferrer">
                     {project.name}
                 </a>
diff --git a/client/src/components/judge/ProjectEntry.tsx b/client/src/components/judge/ProjectEntry.tsx
index 6d78933..0ffdc10 100644
--- a/client/src/components/judge/ProjectEntry.tsx
+++ b/client/src/components/judge/ProjectEntry.tsx
@@ -11,11 +11,11 @@ const ProjectEntry = ({ project, ranking }: ProjectEntryProps) => {
         return null;
     }
 
-    // Will truncate a string to 8 characters,
-    // adding a dot at the end if the length is > than 8 chars
-    const truncate = (s: string) => {
-        if (s.length <= 8) return s;
-        return s.substring(0, 4) + '.';
+    // Will truncate a string to width characters exactly,
+    // adding a dot at the end if the length is > than width chars
+    const truncate = (s: string, width: number = 8) => {
+        if (s.length <= width) return s;
+        return s.substring(0, width-1) + '.';
     };
 
     let rankColor = 'text-lightest';
@@ -38,21 +38,20 @@ const ProjectEntry = ({ project, ranking }: ProjectEntryProps) => {
             {ranking !== -1 && (
                 <p className={twMerge('font-bold text-xl text-center w-6 shrink-0', rankColor)}>{ranking}</p>
             )}
-            <div className="m-1 pl-2 py-1 bg-background border-solid border-2 border-lightest rounded-md grow">
+            <div className="m-1 pl-2 py-1 bg-background border-solid border-2 border-lightest rounded-md grow min-w-0">
                 <div className="flex flex-row">
-                    <div>
+                    <div className="min-w-0">
                         <h3 className="text-xl grow">
                             <a href={`/judge/project/${project.project_id}`}>
-                                <b>{project.name}</b>
-                                &nbsp;({project.location})
+                                <b>{truncate(project.name, 20)}</b>&nbsp;({truncate(project.location, 20)})
                             </a>
                         </h3>
                         <p className="text-light text-xs line-clamp-1">{project.notes}</p>
-                        <div className="text-light flex flex-row">
+                        <div className="text-light flex flex-wrap">
                             {Object.entries(project.categories).map(([name, score], i) => (
                                 <div key={i}>
                                     <span className="text-lighter text-xs mr-1">
-                                        {truncate(name)}
+                                        {truncate(name, 15)}
                                     </span>
                                     <span className="mr-2">{score}</span>
                                 </div>

From 36392e51e7d6a151616127afc541e8caee3544c5 Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:34:37 +0100
Subject: [PATCH 5/6] =?UTF-8?q?=E2=9A=B0=20Remove=20ReassignProjectNums=20?=
 =?UTF-8?q?legacy=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The incremental table number concept no longer exists
so this can be removed.
---
 server/router/init.go    |  1 -
 server/router/project.go | 53 ----------------------------------------
 2 files changed, 54 deletions(-)

diff --git a/server/router/init.go b/server/router/init.go
index 4ce4cbb..af306b3 100644
--- a/server/router/init.go
+++ b/server/router/init.go
@@ -119,7 +119,6 @@ func NewRouter(db *mongo.Database) *gin.Engine {
 	adminRouter.PUT("/judge/:id", EditJudge)
 	defaultRouter.GET("/admin/started", IsClockPaused)
 	adminRouter.GET("/admin/flags", GetFlags)
-	adminRouter.POST("/project/reassign", ReassignProjectNums)
 	adminRouter.GET("/admin/options", GetOptions)
 	adminRouter.GET("/admin/export/projects", ExportProjects)
 	adminRouter.GET("/admin/export/challenges", ExportProjectsByChallenge)
diff --git a/server/router/project.go b/server/router/project.go
index 3943801..273144c 100644
--- a/server/router/project.go
+++ b/server/router/project.go
@@ -427,56 +427,3 @@ func UnprioritizeProject(ctx *gin.Context) {
 	// Send OK
 	ctx.JSON(http.StatusOK, gin.H{"ok": 1})
 }
-
-func ReassignProjectNums(ctx *gin.Context) {
-	// Get the database from the context
-	db := ctx.MustGet("db").(*mongo.Database)
-
-	// Get all the projects from the database
-	projects, err := database.FindAllProjects(db)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error getting projects from database: " + err.Error()})
-		return
-	}
-
-	// If projects is empty, send OK
-	if len(projects) == 0 {
-		ctx.JSON(http.StatusOK, gin.H{"ok": 1})
-		return
-	}
-
-	// Sort projets by table num
-	sort.Sort(models.ByTableNumber(projects))
-
-	// Get the options from the database
-	options, err := database.GetOptions(db)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error getting options from database: " + err.Error()})
-		return
-	}
-
-	// Set init table num to 0
-	options.CurrTableNum = 0
-
-	// Loop through all projects
-	for _, project := range projects {
-		project.Location = database.GetNextTableNum(options)
-	}
-
-	// Update the options in the database
-	err = database.UpdateCurrTableNum(db, context.Background(), options.CurrTableNum)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error updating options in database: " + err.Error()})
-		return
-	}
-
-	// Update all projects in the database
-	err = database.UpdateProjects(db, projects)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error updating projects in database: " + err.Error()})
-		return
-	}
-
-	// Send OK
-	ctx.JSON(http.StatusOK, gin.H{"ok": 1})
-}

From 8d95f009e4a9f2b5c002847783099e8da67c5aec Mon Sep 17 00:00:00 2001
From: Luca <30503695+tameTNT@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:13:31 +0100
Subject: [PATCH 6/6] =?UTF-8?q?=E2=9C=A8=20Allow=20admins=20to=20edit=20lo?=
 =?UTF-8?q?cations=20on=20the=20admin=20dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NB: uses new YesNoResponse type from handle-early-ranking-end branch.
---
 .../components/admin/tables/ProjectRow.tsx    | 25 ++++++++++-----
 server/database/project.go                    |  5 +++
 server/models/types.go                        |  5 +++
 server/router/init.go                         |  1 +
 server/router/project.go                      | 32 +++++++++++++++++++
 5 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/client/src/components/admin/tables/ProjectRow.tsx b/client/src/components/admin/tables/ProjectRow.tsx
index 4a88b9e..80a187c 100644
--- a/client/src/components/admin/tables/ProjectRow.tsx
+++ b/client/src/components/admin/tables/ProjectRow.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import {useEffect, useRef, useState} from 'react';
 import { errorAlert, fixIfFloatDigits, timeSince } from '../../../util';
 import DeletePopup from './DeletePopup';
 import EditProjectPopup from './EditProjectPopup';
@@ -63,6 +63,15 @@ const ProjectRow = ({ project, idx, checked, handleCheckedChange }: ProjectRowPr
         }
     };
 
+    const onLocationChange = async (e) => {
+        const res = await postRequest<YesNoResponse>('/project/update-location', {id: project.id, location: e.target.value});
+        if (res.status === 200) {
+            fetchProjects();
+        } else {
+            errorAlert(res);
+        }
+    }
+
     return (
         <>
             <tr
@@ -88,7 +97,13 @@ const ProjectRow = ({ project, idx, checked, handleCheckedChange }: ProjectRowPr
                 </td>
                 <td className="[&:not(:hover)]:truncate hover:break-words hover:text-wrap">{project.name}</td>
                 <td className="text-center py-1">
-                    {project.location} {checked}
+                    <input
+                        className="w-full md:w-2/3"
+                        name="location"
+                        defaultValue={project.location}
+                        type="text"
+                        onBlur={(e) => onLocationChange(e)}
+                    />
                 </td>
                 <td className="text-center">{project.score}</td>
                 <td className="text-center">{project.seen}</td>
@@ -99,12 +114,6 @@ const ProjectRow = ({ project, idx, checked, handleCheckedChange }: ProjectRowPr
                             className="absolute flex flex-col bg-background rounded-md border-lightest border-2 font-normal text-sm"
                             ref={ref}
                         >
-                            <div
-                                className="py-1 pl-4 pr-2 cursor-pointer hover:bg-primary/20 duration-150"
-                                onClick={() => doAction('edit')}
-                            >
-                                Edit
-                            </div>
                             <div
                                 className="py-1 pl-4 pr-2 cursor-pointer hover:bg-primary/20 duration-150"
                                 onClick={() => doAction('hide')}
diff --git a/server/database/project.go b/server/database/project.go
index 4b9b7c1..39cd362 100644
--- a/server/database/project.go
+++ b/server/database/project.go
@@ -198,6 +198,11 @@ func SetProjectPrioritized(db *mongo.Database, id *primitive.ObjectID, prioritiz
 	return err
 }
 
+func UpdateProjectLocationValue(db *mongo.Database, id *primitive.ObjectID, location string) error {
+	_, err := db.Collection("projects").UpdateOne(context.Background(), gin.H{"_id": id}, gin.H{"$set": gin.H{"location": location}})
+	return err
+}
+
 // UpdateProjects will update ALL projects in the database
 func UpdateProjects(db *mongo.Database, projects []*models.Project) error {
 	models := make([]mongo.WriteModel, 0, len(projects))
diff --git a/server/models/types.go b/server/models/types.go
index a591ac8..30b9216 100644
--- a/server/models/types.go
+++ b/server/models/types.go
@@ -27,6 +27,11 @@ type IdRequest struct {
 	Id string `json:"id"`
 }
 
+type ProjectLocationRequest struct {
+	IdRequest
+	Location string `json:"location"`
+}
+
 type EditJudgeRequest struct {
 	Notes string `json:"notes"`
 }
diff --git a/server/router/init.go b/server/router/init.go
index af306b3..1cfc9ad 100644
--- a/server/router/init.go
+++ b/server/router/init.go
@@ -116,6 +116,7 @@ func NewRouter(db *mongo.Database) *gin.Engine {
 	adminRouter.POST("/project/unhide", UnhideProject)
 	adminRouter.POST("/project/prioritize", PrioritizeProject)
 	adminRouter.POST("/project/unprioritize", UnprioritizeProject)
+	adminRouter.POST("/project/update-location", UpdateProjectLocation) // should really be a PATCH I think :(
 	adminRouter.PUT("/judge/:id", EditJudge)
 	defaultRouter.GET("/admin/started", IsClockPaused)
 	adminRouter.GET("/admin/flags", GetFlags)
diff --git a/server/router/project.go b/server/router/project.go
index 273144c..e629d92 100644
--- a/server/router/project.go
+++ b/server/router/project.go
@@ -427,3 +427,35 @@ func UnprioritizeProject(ctx *gin.Context) {
 	// Send OK
 	ctx.JSON(http.StatusOK, gin.H{"ok": 1})
 }
+
+func UpdateProjectLocation(ctx *gin.Context) {
+	// Get the database from the context
+	db := ctx.MustGet("db").(*mongo.Database)
+
+	// Get ID from body
+	var projLocReq models.ProjectLocationRequest
+
+	err := ctx.BindJSON(&projLocReq)
+	if err != nil {
+		ctx.JSON(http.StatusBadRequest, gin.H{"error": "error reading request body: " + err.Error()})
+		return
+	}
+	id := projLocReq.Id
+
+	// Convert project ID string to ObjectID
+	projectObjectId, err := primitive.ObjectIDFromHex(id)
+	if err != nil {
+		ctx.JSON(http.StatusBadRequest, gin.H{"error": "invalid project ID"})
+		return
+	}
+
+	// Update the project in the database
+	err = database.UpdateProjectLocationValue(db, &projectObjectId, projLocReq.Location)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, gin.H{"error": "error updating project location in database: " + err.Error()})
+		return
+	}
+
+	// Send OK
+	ctx.JSON(http.StatusOK, gin.H{"yes_no": 1})
+}