From 18a22ee32c8259023bddfd4215ece73da25b4fcc Mon Sep 17 00:00:00 2001
From: Andrea Fazzi <andrea.fazzi@carducci-dante.gov.it>
Date: Mon, 27 Jan 2020 14:21:08 +0100
Subject: [PATCH] Add suggestions sections

---
 orm/participant.go                   |  4 ++--
 templates/participants.html.tpl      | 12 ++++++++++--
 templates/participants_show.html.tpl | 18 +++++++++++++++++-
 templates/schools_show.html.tpl      | 26 ++++++++++++--------------
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/orm/participant.go b/orm/participant.go
index a1af2ed5..c72d6978 100644
--- a/orm/participant.go
+++ b/orm/participant.go
@@ -272,12 +272,12 @@ func (model *Participant) Read(db *Database, args map[string]string, w http.Resp
 			return nil, errors.NotAuthorized
 		}
 
-		if err := db._db.Preload("User").Preload("School").Preload("Category").First(&participant, id).Error; err != nil {
+		if err := db._db.Preload("User").Preload("School").Preload("School.Participants").Preload("Category").First(&participant, id).Error; err != nil {
 			return nil, err
 		}
 
 	} else {
-		if err := db._db.Preload("User").Preload("School").Preload("Responses").Preload("Contests").Preload("Category").First(&participant, id).Error; err != nil {
+		if err := db._db.Preload("User").Preload("School").Preload("School.Participants").Preload("Responses").Preload("Contests").Preload("Category").First(&participant, id).Error; err != nil {
 			return nil, err
 		}
 
diff --git a/templates/participants.html.tpl b/templates/participants.html.tpl
index e3a09fa6..a8150083 100644
--- a/templates/participants.html.tpl
+++ b/templates/participants.html.tpl
@@ -53,15 +53,23 @@
   </div>
 
   {{if $isSchool}}
-  {{if eq (len .Data) 2}}
+  
   <div class="row">
     <div class="col-md-12">
+      <h2 class="karmen-relation-header">Suggerimenti</h2>
+      {{if eq (len .Data) 1}}
+      <p>
+	E' possibile iscrivere fino a due partecipanti alla gara (di diversa categoria). Finora hai iscritto un solo partecipante. {{(printf "Clicca %s per iscrivere il secondo." ((create "Participant")|anchor "qui")|html)}}
+      </p>
+      {{end}}
+      {{if eq (len .Data) 2}}
       <div class="alert alert-warning mt-4">
 	<strong>Iscrizione completa.</strong> Non è possibile aggiungere ulteriori partecipanti.
       </div>
+      {{end}}
     </div>
   </div>
-  {{end}}
+  
   {{end}}
   
 </div>
diff --git a/templates/participants_show.html.tpl b/templates/participants_show.html.tpl
index 92dd1b26..56c547c1 100644
--- a/templates/participants_show.html.tpl
+++ b/templates/participants_show.html.tpl
@@ -103,7 +103,23 @@
     </div>
   </div>
   {{end}}
-  
+
+  {{if or $isAdmin $isSchool}}
+  <div class="row">
+    <div class="col-md-12">
+      <h2 class="karmen-relation-header">Suggerimenti</h2>
+      {{if eq (len .Data.School.Participants) 1}}
+      <p>E' possibile iscrivere fino a due partecipanti alla gara (di diversa categoria). Finora hai iscritto un solo partecipante. {{(printf "Clicca %s per iscrivere il secondo." ((create "Participant")|anchor "qui")|html)}}
+      {{end}}
+      {{if eq (len .Data.School.Participants) 2}}
+      <div class="alert alert-warning mt-4">
+	<strong>Iscrizione completa.</strong> Non è possibile aggiungere ulteriori partecipanti.
+      </div>
+      {{end}}
+    </div>
+  </div>
+  {{end}}
+
 </div>    
 
 {{ end }}
diff --git a/templates/schools_show.html.tpl b/templates/schools_show.html.tpl
index daef622b..244ffed2 100644
--- a/templates/schools_show.html.tpl
+++ b/templates/schools_show.html.tpl
@@ -82,26 +82,24 @@
     </div>
   </div>
 
-  {{if eq (len .Data.Participants) 1}}
+  {{if or $isAdmin $isSchool}}
   <div class="row">
     <div class="col-md-12">
-      <p class="mt-4">
-	{{(printf "Clicca %s per iscrivere il secondo partecipante." ((create "Participant")|anchor "qui")|html)}}
+      <h2 class="karmen-relation-header">Suggerimenti</h2>
+      {{if eq (len .Data.Participants) 1}}
+      <p>
+	E' possibile iscrivere fino a due partecipanti alla gara (di diversa categoria). Finora hai iscritto un solo partecipante. {{(printf "Clicca %s per iscrivere il secondo." ((create "Participant")|anchor "qui")|html)}}
       </p>
+	{{end}}
+	{{if eq (len .Data.Participants) 2}}
+	<div class="alert alert-warning mt-4">
+	  <strong>Iscrizione completa.</strong> Non è possibile aggiungere ulteriori partecipanti.
+	</div>
+	{{end}}
     </div>
   </div>
   {{end}}
-
-  {{if eq (len .Data.Participants) 2}}
-  <div class="row">
-    <div class="col-md-12">
-      <div class="alert alert-warning mt-4">
-	<strong>Iscrizione completa.</strong> Non è possibile aggiungere ulteriori partecipanti.
-      </div>
-    </div>
-  </div>
-  {{end}}
-
+  
   {{end}}
 </div>