From 01368dd6f45f114fcd3b9451301ab74f33b73a54 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 28 Nov 2018 04:37:08 +0100
Subject: [PATCH] frontend: expose UCQ choices

---
 frontend/static/views/defi.html |  3 ++-
 libfic/team_my.go               | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/frontend/static/views/defi.html b/frontend/static/views/defi.html
index f41ab3d8..2d0d6f47 100644
--- a/frontend/static/views/defi.html
+++ b/frontend/static/views/defi.html
@@ -83,7 +83,8 @@
 	      <form ng-controller="SubmissionController" ng-submit="ssubmit()">
 		<div class="form-group" ng-repeat="(kid,key) in my.exercices[current_exercice].flags">
 		  <label for="sol_{{ kid }}">{{ key.label }}&nbsp;:</label>
-		  <input type="text" class="form-control" id="sol_{{ kid }}" autocomplete="off" name="sol_{{ kid }}" ng-model="key.value" ng-if="!key.found">
+		  <input type="text" class="form-control" id="sol_{{ kid }}" autocomplete="off" name="sol_{{ kid }}" ng-model="key.value" ng-if="!key.found && !key.choices">
+		  <select class="custom-select" id="sol_{{ kid }}" name="sol_{{ kid }}" ng-model="key.value" ng-if="!key.found && key.choices" ng-options="l as v for (l, v) in key.choices"></select>
 		  <small class="form-text text-muted" ng-if="!key.found && key.help.length > 0" ng-bind="key.help"></small>
 		  <span class="glyphicon glyphicon-ok form-control-feedback text-success" aria-hidden="true" ng-if="key.found" title="Flag trouvé à {{ key.found | date:'mediumTime'}}"></span>
 		</div>
diff --git a/libfic/team_my.go b/libfic/team_my.go
index 85ff3f36..3d4fa78c 100644
--- a/libfic/team_my.go
+++ b/libfic/team_my.go
@@ -33,6 +33,7 @@ type myTeamFlag struct {
 	Help        string            `json:"help,omitempty"`
 	Solved      *time.Time        `json:"found,omitempty"`
 	Soluce      string            `json:"soluce,omitempty"`
+	Choices     map[string]string `json:"choices,omitempty"`
 }
 type myTeamExercice struct {
 	ThemeId      int          `json:"theme_id"`
@@ -173,7 +174,18 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
 						}
 
 						flag.Label = k.Label
-						flag.Help = k.Help
+
+						if flag.Solved == nil {
+							flag.Help = k.Help
+							if choices, err := k.GetChoices(); err != nil {
+								return nil, err
+							} else {
+								flag.Choices = map[string]string{}
+								for _, c := range choices {
+									flag.Choices[c.Value] = c.Label
+								}
+							}
+						}
 
 						exercice.Flags[k.Id] = flag
 					}