diff --git a/src/app/controller/attendies_controller.go b/src/app/controller/attendies_controller.go index ce7cbdc..fc1fb9e 100644 --- a/src/app/controller/attendies_controller.go +++ b/src/app/controller/attendies_controller.go @@ -89,6 +89,16 @@ func GetAttendiesByEventPublicTable(c *fiber.Ctx) error { "WaitinglistDesc": localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: "WaitinglistDesc", }), + "Restaurant": localizer.MustLocalize(&i18n.LocalizeConfig{ + MessageID: "Restaurant", + PluralCount: 1, + }), + "Yes": localizer.MustLocalize(&i18n.LocalizeConfig{ + MessageID: "Yes", + }), + "No": localizer.MustLocalize(&i18n.LocalizeConfig{ + MessageID: "No", + }), } sort.Sort(entities.ByRegistrationTime(attendies)) roleSuiter, _ := service.GetRoleByName("Suiter") @@ -106,5 +116,6 @@ func GetAttendiesByEventPublicTable(c *fiber.Ctx) error { "Attendies": attendies, "SuiterWaitingList": suiterWaitingList, "Locals": localizations, + "EventType": *(event).EventType, }) } diff --git a/src/app/static/styles/style.css b/src/app/static/styles/style.css index 9e90461..087b1d7 100644 --- a/src/app/static/styles/style.css +++ b/src/app/static/styles/style.css @@ -33,4 +33,12 @@ tbody>tr:nth-child(even) { tbody>tr:nth-child(odd) { background-color: #e9e9e9; +} + +.tdgreen { + background-color: #8bff6e; +} + +.tdred { + background-color: #ff6e6e; } \ No newline at end of file diff --git a/src/app/util/pretix.go b/src/app/util/pretix.go index a6bc844..e1aa249 100644 --- a/src/app/util/pretix.go +++ b/src/app/util/pretix.go @@ -80,7 +80,6 @@ func GetAttendieListFromPretixJson(pretixEvent entities.Pretix_Event, event enti func GetAttendiesFromPretixJsonWithRoleQuestion(pretixEvent *entities.Pretix_Event, event *entities.Db_Event) ([]entities.Db_Attendies, error) { var attendies []entities.Db_Attendies for _, order := range pretixEvent.Results { - fmt.Println("Here") if order.Status == "c" || order.Status == "e" { continue } diff --git a/src/app/views/table.html b/src/app/views/table.html index f3e9073..b6b1e2e 100644 --- a/src/app/views/table.html +++ b/src/app/views/table.html @@ -6,6 +6,9 @@ {{ .Locals.Name }} {{ .Locals.Role }} + {{ if eq .EventType "Suitwalk" }} + {{ .Locals.Restaurant }} + {{ end }} @@ -23,6 +26,11 @@ {{ else if eq $suiter.Role.Name "Guest" }} {{ $.Locals.Guest }} {{ end }} + {{ if $suiter.AttendsRestaurant }} + ✓ {{ $.Locals.Yes }} + {{ else }} + ❌ {{ $.Locals.No }} + {{ end }} {{end}} @@ -35,6 +43,9 @@ {{ .Locals.Name }} {{ .Locals.Role }} + {{ if eq .EventType "Suitwalk" }} + Restaurant + {{ end }} diff --git a/src/config/localization.go b/src/config/localization.go index 3c93b63..13b55c5 100644 --- a/src/config/localization.go +++ b/src/config/localization.go @@ -76,4 +76,17 @@ var defaultMessages = []i18n.Message{ One: "#SpecialAnimal", Other: "#SpecialAnimals", }, + { + ID: "Restaurant", + One: "Restaurant", + Other: "Restaurantes", + }, + { + ID: "Yes", + Other: "Yes", + }, + { + ID: "No", + Other: "No", + }, } diff --git a/src/localization/active.de.json b/src/localization/active.de.json index 63298e6..d6ad04f 100644 --- a/src/localization/active.de.json +++ b/src/localization/active.de.json @@ -18,6 +18,10 @@ "one": "Name", "other": "Namen" }, + "No": { + "hash": "sha1-816c52fd2bdd94a63cd0944823a6c0aa9384c103", + "other": "Nein" + }, "Photographer": { "hash": "sha1-dc41992cfe878fe6744f94c3a3fc5843d9f1bc11", "one": "Pfotograph*in", @@ -27,6 +31,11 @@ "hash": "sha1-a844fcf834e7d026e7936e042c0ce2777b7fb4d9", "other": "Angemeldet" }, + "Restaurant": { + "hash": "sha1-2b8fd2cb645ab1f1b09fbecda98978ec3518a9d9", + "one": "Restaurant", + "other": "Restaurnts" + }, "Role": { "hash": "sha1-47dcc27d6e87ece8baebe7e3877a261a5467093d", "one": "Rolle", @@ -52,7 +61,11 @@ "other": "Suiter Warteliste" }, "WaitinglistDesc": { - "hash": "sha1-aadc433a212fca8d927e9134520f5a10aa7e4263", + "hash": "sha1-295479637ef85418e233d16735fdba609595dee7", "other": "Wir setzen für jedes Event ein Verhältnis von Suitern pro Spotter fest, damit die Spotter auch noch alle versorgen können. Falls du hier gelistet bist, haben sich noch nicht genügend Spotter angemeldet." + }, + "Yes": { + "hash": "sha1-5397e0583f14f6c88de06b1ef28f460a1fb5b0ae", + "other": "Ja" } } diff --git a/src/localization/active.en.json b/src/localization/active.en.json index c6e83cf..e431c39 100644 --- a/src/localization/active.en.json +++ b/src/localization/active.en.json @@ -12,11 +12,16 @@ "one": "Name", "other": "Names" }, + "No": "No", "Photographer": { "one": "Photographer", "other": "Photographers" }, "Registered": "Registered", + "Restaurant": { + "one": "Restaurant", + "other": "Restaurnts" + }, "Role": { "one": "Role", "other": "Roles" @@ -34,5 +39,6 @@ "other": "Suiters" }, "SuiterWaitinglist": "Suiter Watinglist", - "WaitinglistDesc": "We set a ratio of Suiters per Spotter for each event in order to keep the count of suiters manageble for them. If you are listed here we don't have enough spotters yet." + "WaitinglistDesc": "We set a ratio of Suiters per Spotter for each event in order to keep the count of suiters manageble for them. If you are listed here we don't have enough spotters yet.", + "Yes": "Yes" } diff --git a/src/translate.de.json b/src/translate.de.json deleted file mode 100644 index a36c1da..0000000 --- a/src/translate.de.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Attendie": { - "hash": "sha1-4c29d6c952ccd2b114d1792c7b18fa7f7052ebed", - "one": "Attendie", - "other": "Attendies" - }, - "HelloWorld": { - "hash": "sha1-6225ffc638ce81e53cdf7868fe0c7435594f11e4", - "other": "Hello newer World" - }, - "Name": { - "hash": "sha1-2b7c08c3ab75f37e2da656c1aab228f5f3a793b1", - "one": "Name", - "other": "Names" - }, - "Role": { - "hash": "sha1-47dcc27d6e87ece8baebe7e3877a261a5467093d", - "one": "Role", - "other": "Roles" - } -} diff --git a/src/translate.de.toml b/src/translate.de.toml deleted file mode 100644 index e491b0d..0000000 --- a/src/translate.de.toml +++ /dev/null @@ -1,18 +0,0 @@ -[Attendie] -hash = "sha1-4c29d6c952ccd2b114d1792c7b18fa7f7052ebed" -one = "Attendie" -other = "Attendies" - -[HelloWorld] -hash = "sha1-6225ffc638ce81e53cdf7868fe0c7435594f11e4" -other = "Hello newer World" - -[Name] -hash = "sha1-2b7c08c3ab75f37e2da656c1aab228f5f3a793b1" -one = "Name" -other = "Names" - -[Role] -hash = "sha1-47dcc27d6e87ece8baebe7e3877a261a5467093d" -one = "Role" -other = "Roles"