From 7d9ad18f429af83d98cb1568ea105a0485be4e0e Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Sun, 20 Jan 2019 00:14:20 +0100
Subject: [PATCH] settings: new parameter to don't respect flag dependancies

---
 admin/api/settings.go            | 1 +
 admin/static/views/settings.html | 7 +++++++
 backend/main.go                  | 3 ++-
 libfic/team_my.go                | 7 +++++--
 settings/settings.go             | 2 ++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/admin/api/settings.go b/admin/api/settings.go
index 61e33401..fbd7867d 100644
--- a/admin/api/settings.go
+++ b/admin/api/settings.go
@@ -52,6 +52,7 @@ func saveSettings(_ httprouter.Params, body []byte) (interface{}, error) {
 func ApplySettings(config settings.FICSettings) {
 	fic.PartialValidation = config.PartialValidation
 	fic.UnlockedChallengeDepth = config.UnlockedChallengeDepth
+	fic.DisplayAllFlags = config.DisplayAllFlags
 	fic.FirstBlood = config.FirstBlood
 	fic.SubmissionCostBase = config.SubmissionCostBase
 	fic.HintCoefficient = config.HintCurCoefficient
diff --git a/admin/static/views/settings.html b/admin/static/views/settings.html
index 2ab9f19b..92ec73d7 100644
--- a/admin/static/views/settings.html
+++ b/admin/static/views/settings.html
@@ -143,6 +143,13 @@
       </label>
     </div>
 
+    <div class="form-check">
+      <label class="custom-control custom-checkbox">
+	<input class="custom-control-input" type="checkbox" ng-model="config.displayAllFlags">
+	<span class="custom-control-label">Désactiver les dépendances des flags</span>
+      </label>
+    </div>
+
     <div class="form-check">
       <label class="custom-control custom-checkbox">
 	<input class="custom-control-input" type="checkbox" ng-model="config.submissionUniqueness">
diff --git a/backend/main.go b/backend/main.go
index 5aaffcf0..9a9aa5bf 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -52,9 +52,10 @@ func reloadSettings(config settings.FICSettings) {
 	fic.WChoiceCoefficient = config.WChoiceCurCoefficient
 	fic.ExerciceCurrentCoefficient = config.ExerciceCurCoefficient
 	ChStarted = time.Since(config.Start) >= 0
-	if lastRegeneration != config.Generation || fic.PartialValidation != config.PartialValidation || fic.UnlockedChallengeDepth != config.UnlockedChallengeDepth || fic.FirstBlood != config.FirstBlood || fic.SubmissionCostBase != config.SubmissionCostBase || fic.SubmissionUniqueness != config.SubmissionUniqueness {
+	if lastRegeneration != config.Generation || fic.PartialValidation != config.PartialValidation || fic.UnlockedChallengeDepth != config.UnlockedChallengeDepth || fic.DisplayAllFlags != config.DisplayAllFlags || fic.FirstBlood != config.FirstBlood || fic.SubmissionCostBase != config.SubmissionCostBase || fic.SubmissionUniqueness != config.SubmissionUniqueness {
 		fic.PartialValidation = config.PartialValidation
 		fic.UnlockedChallengeDepth = config.UnlockedChallengeDepth
+		fic.DisplayAllFlags = config.DisplayAllFlags
 
 		fic.FirstBlood = config.FirstBlood
 		fic.SubmissionCostBase = config.SubmissionCostBase
diff --git a/libfic/team_my.go b/libfic/team_my.go
index 8cf1ed4d..a471652b 100644
--- a/libfic/team_my.go
+++ b/libfic/team_my.go
@@ -9,6 +9,9 @@ import (
 	"strings"
 )
 
+// DisplayAllFlags doesn't respect the predefined constraint existing between flags.
+var DisplayAllFlags bool
+
 type myTeamFile struct {
 	Path     string `json:"path"`
 	Name     string `json:"name"`
@@ -179,7 +182,7 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
 					for _, k := range flags {
 						var flag myTeamFlag
 
-						if t != nil && !t.CanSeeFlag(k) {
+						if !DisplayAllFlags && t != nil && !t.CanSeeFlag(k) {
 							// Dependancy missing, skip the flag for now
 							continue
 						}
@@ -237,7 +240,7 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
 					return nil, err
 				} else {
 					for _, mcq := range mcqs {
-						if t != nil && !t.CanSeeFlag(mcq) {
+						if !DisplayAllFlags && t != nil && !t.CanSeeFlag(mcq) {
 							// Dependancy missing, skip the flag for now
 							continue
 						}
diff --git a/settings/settings.go b/settings/settings.go
index e6e0d373..bdbbb86d 100644
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -61,6 +61,8 @@ type FICSettings struct {
 	UnlockedChallengeDepth	int       `json:"unlockedChallengeDepth"`
 	// SubmissionUniqueness don't count multiple times identical tries.
 	SubmissionUniqueness    bool      `json:"submissionUniqueness"`
+	// DisplayAllFlags doesn't respect the predefined constraint existing between flags.
+	DisplayAllFlags         bool      `json:"displayAllFlags"`
 	// EventKindness will ask browsers to delay notification interval.
 	EventKindness           bool      `json:"eventKindness"`
 }