fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Theme can be optional: exercices can be standalone

Browse source
This commit is contained in:
nemunaire 2024-03-12 10:12:40 +01:00
commit a0bc832910
8 changed files with 81 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libfic/team_my.go
View file

@ -68,7 +68,7 @@ type myTeamMCQJustifiedChoice struct {
Justification myTeamFlag `json:"justification,omitempty"`
}
type myTeamExercice struct {
ThemeId int64 `json:"theme_id"`
ThemeId int64 `json:"theme_id,omitempty"`
Disabled bool `json:"disabled,omitempty"`
WIP bool `json:"wip,omitempty"`
Statement string `json:"statement"`
@ -136,11 +136,11 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
return ret, err
} else if started {
for _, e := range exos {
if t == nil || ((!e.Disabled || !mapthemes[e.IdTheme].Locked) && t.HasAccess(e)) {
if t == nil || ((!e.Disabled || (e.IdTheme != nil && !mapthemes[*e.IdTheme].Locked)) && t.HasAccess(e)) {
exercice := myTeamExercice{}
exercice.Disabled = e.Disabled
exercice.WIP = e.WIP
exercice.ThemeId = e.IdTheme
exercice.ThemeId = *e.IdTheme
exercice.Statement = strings.Replace(e.Statement, "$FILES$", FilesDir, -1)