From 209ab40e42f6a5c6d6caca09263d0e66c06b82e6 Mon Sep 17 00:00:00 2001 From: Andrea Fazzi Date: Tue, 1 Feb 2022 18:32:03 +0100 Subject: [PATCH] Rename OEF in OIEF and change date; add new participant and school fields --- config/config.aws.yaml | 2 +- config/config.regression_test.yaml | 2 +- config/config.test.yaml | 2 +- config/config.yaml | 2 +- config/config_dev.yaml | 4 ++-- docker/oef_dev/config/config.yaml | 2 +- handlers/testdata/config.yaml | 2 +- orm/participant.go | 3 +++ orm/school.go | 8 +++++--- templates/layout/error.html.tpl | 2 +- templates/layout/login.html.tpl | 2 +- templates/login.html.tpl | 2 +- templates/login_subscribe.html.tpl | 2 +- templates/participants_add_update.html.tpl | 17 ++++++++++++++--- templates/participants_show.html.tpl | 4 ++++ templates/schools_add_update.html.tpl | 12 ++++++++++-- templates/schools_show.html.tpl | 2 +- 17 files changed, 49 insertions(+), 21 deletions(-) diff --git a/config/config.aws.yaml b/config/config.aws.yaml index 375fc5eb..e9ba3dc1 100644 --- a/config/config.aws.yaml +++ b/config/config.aws.yaml @@ -1,4 +1,4 @@ -url: "https://gara.olimpiadi-economiaefinanza.it" +url: "https://piattaforma.oief.it" port: "80" domain: "olimpiadi-economiaefinanza.it" log_level: 2 diff --git a/config/config.regression_test.yaml b/config/config.regression_test.yaml index 925d333e..b997ac96 100644 --- a/config/config.regression_test.yaml +++ b/config/config.regression_test.yaml @@ -25,6 +25,6 @@ smtp: port: 25 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" subject: "[OEF2020] - Credenziali di accesso della scuola" diff --git a/config/config.test.yaml b/config/config.test.yaml index a04959fa..80161247 100644 --- a/config/config.test.yaml +++ b/config/config.test.yaml @@ -29,5 +29,5 @@ smtp: port: 1025 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" diff --git a/config/config.yaml b/config/config.yaml index 546f33a4..1b2bd858 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -25,6 +25,6 @@ smtp: port: 1025 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" subject: "[OEF2020] - Credenziali di accesso della scuola" diff --git a/config/config_dev.yaml b/config/config_dev.yaml index 3d8eedf5..24bae60e 100644 --- a/config/config_dev.yaml +++ b/config/config_dev.yaml @@ -24,6 +24,6 @@ smtp: port: 1025 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" - subject: "[OEF2020] - Credenziali di accesso della scuola" \ No newline at end of file + subject: "[OEF2020] - Credenziali di accesso della scuola" diff --git a/docker/oef_dev/config/config.yaml b/docker/oef_dev/config/config.yaml index 2a32e55f..5fbf499c 100644 --- a/docker/oef_dev/config/config.yaml +++ b/docker/oef_dev/config/config.yaml @@ -29,5 +29,5 @@ smtp: port: 1025 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" diff --git a/handlers/testdata/config.yaml b/handlers/testdata/config.yaml index 6c3a9fac..c1d8c2d4 100644 --- a/handlers/testdata/config.yaml +++ b/handlers/testdata/config.yaml @@ -24,7 +24,7 @@ smtp: port: 1025 username: "" password: "" - from: "no-reply@olimpiadi-economiaefinanza.it" + from: "no-reply@oief.it" bcc: "bcc@fake.org" subject: "[OEF2020] - Credenziali di accesso della scuola" diff --git a/orm/participant.go b/orm/participant.go index a5edcf1e..3f4d45ba 100644 --- a/orm/participant.go +++ b/orm/participant.go @@ -29,6 +29,9 @@ type Participant struct { FiscalCode string + Year int + StudyField string + CategoryID uint `schema:"category_id"` SchoolID uint `schema:"school_id"` diff --git a/orm/school.go b/orm/school.go index f2f184f3..c08ac169 100644 --- a/orm/school.go +++ b/orm/school.go @@ -28,7 +28,7 @@ password: {{.Password}} Per accedere alla pagina di login occorrerà seguire questo link -https://piattaforma.olimpiadi-economiaefinanza.it/ +https://piattaforma.oief.it/ ed inserire le credenziali riportate sopra (si consiglia di effettuare un copia/incolla). @@ -49,8 +49,10 @@ type School struct { Code string EmailSentDate time.Time - SchoolContactPersonLastname string - SchoolContactPersonFirstname string + SchoolContactPersonLastname string + SchoolContactPersonFirstname string + SchoolContactPersonEmail string + SchoolContactPersonTelephoneNumber string ContestDirectorLastname string ContestDirectorFirstname string diff --git a/templates/layout/error.html.tpl b/templates/layout/error.html.tpl index e4c92f50..e4a08a1c 100644 --- a/templates/layout/error.html.tpl +++ b/templates/layout/error.html.tpl @@ -24,7 +24,7 @@ {{- $homeURL := "" -}} - OEF 2020 + OIEF 2022