Rename OEF in OIEF and change date; add new participant and school fields

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

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"

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"

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"

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"

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"

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"
   

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"`
 

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
+	SchoolContactPersonLastname        string
-	SchoolContactPersonFirstname string
+	SchoolContactPersonFirstname       string
+	SchoolContactPersonEmail           string
+	SchoolContactPersonTelephoneNumber string
 
 	ContestDirectorLastname  string
 	ContestDirectorFirstname string

templates/layout/error.html.tpl

@@ -24,7 +24,7 @@
       {{- $homeURL := "" -}}
       <a class="navbar-brand" href="{{$homeURL}}">
 	<span class="fa fa-landmark"></span>
-	OEF 2020
+	OIEF 2022
       </a>
       <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
         <span class="navbar-toggler-icon"></span>

templates/layout/login.html.tpl

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css">
 
     <link rel="stylesheet" href="/styles.css" />
-    <title>OEF 2021</title>
+    <title>OIEF 2022</title>
     <style>
       html {
 	  position: relative;

templates/login.html.tpl

@@ -2,7 +2,7 @@
 <div class="container">
   <h1 class="text-center karmen-title">
     <span class="fa fa-landmark"></span>
-    OEF 2021
+    OIEF 2022
     <small>La piattaforma di gara</small>
   </h1>
   <div class="login">

templates/login_subscribe.html.tpl

@@ -2,7 +2,7 @@
 <div class="container">
   <h1 class="text-center karmen-title">
     <span class="fa fa-landmark"></span>
-    OEF 2021
+    OIEF 2022
     <small>La piattaforma di gara</small>
   </h1>
   <div class="login">

templates/participants_add_update.html.tpl

@@ -29,8 +29,8 @@
       {{template "input" dict "options" ($options|yaml) "value" (.Data|field "Firstname") "update" $update}}
     </div>
     <div class="col">
-      {{$options := ` { name: "Lastname",id: "participant_lastname",label: "Cognome del partecipante",placeholder: "Inserire il cognome del partecipante",type: "text",required: "true"} `}}
+	{{$options := ` { name: "Lastname",id: "participant_lastname",label: "Cognome del partecipante",placeholder: "Inserire il cognome del partecipante",type: "text",required: "true"} `}}
-      {{template "input" dict "options" ($options|yaml) "value" (.Data|field "Lastname") "update" $update}}
+	{{template "input" dict "options" ($options|yaml) "value" (.Data|field "Lastname") "update" $update}}
     </div>
   </div>
 
@@ -46,6 +46,17 @@
   {{template "input" dict "options" ($options|yaml) "value" (.Data|field "FiscalCode") "update" $update}}
   {{end}}
 
+  <div class="form-row">
+      <div class="col">
+	  {{$options := ` { name: "Year",id: "participant_year",label: "Anno di corso",placeholder: "Inserire l'anno di corso",type: "number",required: "true"} `}}
+	  {{template "input" dict "options" ($options|yaml) "value" (.Data|field "Year") "update" $update}}
+      </div>
+      <div class="col">
+	  {{$options := ` { name: "StudyField",id: "participant_study_field",label: "Indirizzo del corso di studi",placeholder: "Inserire l'indirizzo frequentato",type: "text",required: "true"} `}}
+	  {{template "input" dict "options" ($options|yaml) "value" (.Data|field "StudyField") "update" $update}}
+      </div>
+  </div>
+
   {{$options := `
   name: "category_id"
   id: "category_id"

templates/participants_show.html.tpl

@@ -20,6 +20,10 @@
     <dd class="col-sm-9"><span class="text-monospace">{{.Data.User.Password}}</span></dd>
     <dt class="col-sm-3">Categoria</dt>
     <dd class="col-sm-9">{{.Data.Category}}</dd>
+    <dt class="col-sm-3">Anno di corso</dt>
+    <dd class="col-sm-9">{{.Data.Year}}</dd>
+    <dt class="col-sm-3">Indirizzo di studi</dt>
+    <dd class="col-sm-9">{{.Data.StudyField}}</dd>
     
     {{if $isAdmin}}
     {{if $creatorUser:=.Data.CreatedBy}}

templates/schools_add_update.html.tpl

@@ -85,8 +85,16 @@
       {{template "input" dict "options" ($options|yaml) "value" (.Data|field "SchoolContactPersonFirstname") "update" $update}}
     </div>
     <div class="col">
-            {{$options := ` { name: "SchoolContactPersonLastname",id: "school_contact_person_lastname",label: "Cognome del referente di sede",placeholder: "Inserire il cognome del referente di sede",type: "text",required: "true"} `}}
+        {{$options := ` { name: "SchoolContactPersonLastname",id: "school_contact_person_lastname",label: "Cognome del referente di sede",placeholder: "Inserire il cognome del referente di sede",type: "text",required: "true"} `}}
-      {{template "input" dict "options" ($options|yaml) "value" (.Data|field "SchoolContactPersonLastname") "update" $update}}
+	{{template "input" dict "options" ($options|yaml) "value" (.Data|field "SchoolContactPersonLastname") "update" $update}}
+    </div>
+    <div class="col">
+        {{$options := ` { name: "SchoolContactPersonEmail",id: "school_contact_person_email",label: "Email del referente di sede",placeholder: "Inserire l'email del referente di sede",type: "email",required: "true"} `}}
+	{{template "input" dict "options" ($options|yaml) "value" (.Data|field "SchoolContactPersonEmail") "update" $update}}
+    </div>
+    <div class="col">
+        {{$options := ` { name: "SchoolContactPersonTelephoneNumber",id: "school_contact_person_telephone_number",label: "Telefono del referente di sede",placeholder: "Inserire il n. di telefono del referente di sede",type: "telephone_number",required: "true"} `}}
+	{{template "input" dict "options" ($options|yaml) "value" (.Data|field "SchoolContactPersonTelephoneNumber") "update" $update}}
     </div>
   </div>
 

templates/schools_show.html.tpl

@@ -58,7 +58,7 @@
     <dt class="col-sm-3">Password</dt>
     <dd class="col-sm-9"><span class="text-monospace">{{.Data.User.Password}}</span></dd>
 
-    <dt class="col-sm-3">Referente di sede</dt><dd class="col-sm-9">{{.Data.SchoolContactPersonLastname}} {{.Data.SchoolContactPersonFirstname}}</dd>
+    <dt class="col-sm-3">Referente di sede</dt><dd class="col-sm-9">{{.Data.SchoolContactPersonLastname}} {{.Data.SchoolContactPersonFirstname}} (<a href="mailto:{{.Data.SchoolContactPersonEmail}}">{{.Data.SchoolContactPersonEmail}}</a>, {{.Data.SchoolContactPersonTelephoneNumber}})</dd>
     <dt class="col-sm-3">Responsabile di gara</dt><dd class="col-sm-9">{{.Data.ContestDirectorLastname}} {{.Data.ContestDirectorFirstname}}</dd>
     
     {{if $isAdmin}}