Justified MCQ are back!
This commit is contained in:
parent
a28f108b8a
commit
960122dfb6
@ -253,6 +253,7 @@ func buildKeyFlag(exercice *fic.Exercice, flag ExerciceFlag, flagline int, defau
|
||||
type importFlag struct {
|
||||
Line int
|
||||
Flag fic.Flag
|
||||
JustifyOf *fic.MCQ_entry
|
||||
Choices []*fic.FlagChoice
|
||||
FilesDeps []string
|
||||
FlagsDeps []int64
|
||||
@ -272,7 +273,7 @@ func iface2Number(input interface{}, output *string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// buildExerciceFlags read challenge.txt and extract all flags.
|
||||
// buildExerciceFlag read challenge.txt and extract all flags.
|
||||
func buildExerciceFlag(i Importer, exercice *fic.Exercice, flag ExerciceFlag, nline int, exceptions *CheckExceptions) (ret []importFlag, errs []error) {
|
||||
switch strings.ToLower(flag.Type) {
|
||||
case "":
|
||||
@ -395,10 +396,11 @@ func buildExerciceFlag(i Importer, exercice *fic.Exercice, flag ExerciceFlag, nl
|
||||
continue
|
||||
}
|
||||
|
||||
addedFlag.Entries = append(addedFlag.Entries, &fic.MCQ_entry{
|
||||
entry := &fic.MCQ_entry{
|
||||
Label: choice.Label,
|
||||
Response: val,
|
||||
})
|
||||
}
|
||||
addedFlag.Entries = append(addedFlag.Entries, entry)
|
||||
|
||||
if isJustified && choice.Raw != nil {
|
||||
addedFlag, choices, berrs := buildKeyFlag(exercice, choice.ExerciceFlag, nline+1, "Flag correspondant", exceptions)
|
||||
@ -407,9 +409,10 @@ func buildExerciceFlag(i Importer, exercice *fic.Exercice, flag ExerciceFlag, nl
|
||||
}
|
||||
if addedFlag != nil {
|
||||
ret = append(ret, importFlag{
|
||||
Line: nline + 1,
|
||||
Flag: *addedFlag,
|
||||
Choices: choices,
|
||||
Line: nline + 1,
|
||||
Flag: *addedFlag,
|
||||
JustifyOf: entry,
|
||||
Choices: choices,
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -422,10 +425,10 @@ func buildExerciceFlag(i Importer, exercice *fic.Exercice, flag ExerciceFlag, nl
|
||||
}
|
||||
}
|
||||
|
||||
ret = append(ret, importFlag{
|
||||
ret = append([]importFlag{importFlag{
|
||||
Line: nline + 1,
|
||||
Flag: &addedFlag,
|
||||
})
|
||||
}}, ret...)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -548,6 +551,12 @@ func SyncExerciceFlags(i Importer, exercice *fic.Exercice, exceptions *CheckExce
|
||||
// Import flags
|
||||
for _, flagid := range flagids {
|
||||
if flag, ok := flags[flagid]; ok {
|
||||
if flag.JustifyOf != nil {
|
||||
if f, ok := flag.Flag.(*fic.FlagKey); ok {
|
||||
f.Label = fmt.Sprintf("%%%d%%%s", flag.JustifyOf.Id, f.Label)
|
||||
}
|
||||
}
|
||||
|
||||
if addedFlag, err := exercice.AddFlag(flag.Flag); err != nil {
|
||||
errs = append(errs, NewFlagError(exercice, nil, flag.Line, err))
|
||||
} else {
|
||||
|
||||
@ -211,6 +211,7 @@
|
||||
/>
|
||||
{:else}
|
||||
<FlagKey
|
||||
class="mb-3"
|
||||
exercice_id={exercice.id}
|
||||
{flag}
|
||||
bind:value={responses.flags[flag.id]}
|
||||
|
||||
@ -9,8 +9,12 @@
|
||||
import { my } from '$lib/stores/my.js';
|
||||
import { settings } from '$lib/stores/settings.js';
|
||||
|
||||
export { className as class };
|
||||
let className = '';
|
||||
|
||||
export let exercice_id = 0;
|
||||
export let flag = { };
|
||||
export let no_label = false;
|
||||
export let value = "";
|
||||
let values = [""];
|
||||
|
||||
@ -99,13 +103,15 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="form-group mb-3">
|
||||
<div class={className + " form-group"}>
|
||||
{#if flag.bonus_gain}
|
||||
<div class={'float-end badge bg-' + (flag.found?'success':'danger')} title={'Ce flag est optionnel, si vous le complétez il vous rapportera ' + flag.bonus_gain + ' points supplémentaires'}>
|
||||
optionnel | {#if flag.bonus_gain > 0}+{/if}{flag.bonus_gain} pts
|
||||
</div>
|
||||
{/if}
|
||||
<label for="sol_{flag.type}{flag.id}_0">{flag.label} :</label>
|
||||
{#if !no_label}
|
||||
<label for="sol_{flag.type}{flag.id}_0">{flag.label} :</label>
|
||||
{/if}
|
||||
{#if flag.found && flag.value}
|
||||
<span>{flag.value}</span>
|
||||
{/if}
|
||||
|
||||
@ -23,19 +23,27 @@
|
||||
{#if !flag.found || flag.justify}
|
||||
{#each Object.keys(flag.choices) as cid, index}
|
||||
<div class="form-check ms-3">
|
||||
<input class="form-check-input" type="checkbox" id="mcq_{flag.id}_{cid}" bind:checked={values[Number(cid)]} disabled={flag.found}>
|
||||
<label class="form-check-label" for="mcq_{flag.id}_{cid}">
|
||||
{#if typeof flag.choices[cid] == "Object"}
|
||||
{flag.choices[cid].label}
|
||||
{:else}
|
||||
{flag.choices[cid]}
|
||||
{#if typeof flag.choices[cid] != "object"}
|
||||
<input class="form-check-input" type="checkbox" id="mcq_{flag.id}_{cid}" bind:checked={values[Number(cid)]} disabled={flag.found || flag.part_solved}>
|
||||
<label class="form-check-label" for="mcq_{flag.id}_{cid}">
|
||||
{flag.choices[cid]}{#if values[Number(cid)] && flag.justify} :{/if}
|
||||
</label>
|
||||
{#if values[Number(cid)] && flag.justify}
|
||||
<FlagKey
|
||||
class="mb-3"
|
||||
{exercice_id}
|
||||
flag={{id: cid, placeholder: "Flag correspondant"}}
|
||||
no_label={true}
|
||||
bind:value={justifications[cid]}
|
||||
/>
|
||||
{/if}
|
||||
</label>
|
||||
{#if values[Number(cid)] && flag.justify && (!flag.choices[cid].justification || !flag.choices[cid].justification.solved)}
|
||||
{:else}
|
||||
<input class="form-check-input" type="checkbox" id="mcq_{flag.id}_{cid}" checked disabled>
|
||||
<FlagKey
|
||||
class={flag.choices[cid].justification.found?"":"mb-3"}
|
||||
{exercice_id}
|
||||
flag={flag.choices[cid].justification}
|
||||
bind:values={justifications[flag.choices[cid].justification.id]}
|
||||
bind:value={justifications[cid]}
|
||||
/>
|
||||
{/if}
|
||||
{#if flag.choices[cid].justification && flag.choices[cid].justification.solved}
|
||||
|
||||
@ -141,7 +141,7 @@ func (e *Exercice) GetFlagKey(id int) (k *FlagKey, err error) {
|
||||
// GetFlagKeyByLabel returns a flag matching the given label.
|
||||
func (e *Exercice) GetFlagKeyByLabel(label string) (k *FlagKey, err error) {
|
||||
k = &FlagKey{}
|
||||
err = DBQueryRow("SELECT id_flag, id_exercice, ordre, label, type, placeholder, help, unit, ignorecase, notrim, multiline, validator_regexp, sort_re_grps, cksum, choices_cost, bonus_gain FROM exercice_flags WHERE type LIKE ? AND id_exercice = ?", label, e.Id).Scan(&k.Id, &k.IdExercice, &k.Order, &k.Label, &k.Type, &k.Placeholder, &k.Help, &k.Unit, &k.IgnoreCase, &k.NoTrim, &k.Multiline, &k.ValidatorRegexp, &k.SortReGroups, &k.Checksum, &k.ChoicesCost, &k.BonusGain)
|
||||
err = DBQueryRow("SELECT id_flag, id_exercice, ordre, label, type, placeholder, help, unit, ignorecase, notrim, multiline, validator_regexp, sort_re_grps, cksum, choices_cost, bonus_gain FROM exercice_flags WHERE label LIKE ? AND id_exercice = ?", label, e.Id).Scan(&k.Id, &k.IdExercice, &k.Order, &k.Label, &k.Type, &k.Placeholder, &k.Help, &k.Unit, &k.IgnoreCase, &k.NoTrim, &k.Multiline, &k.ValidatorRegexp, &k.SortReGroups, &k.Checksum, &k.ChoicesCost, &k.BonusGain)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user