Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: ifnot-value would show up together with the 'if'-value

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-05 00:45:41 +02:00
parent e90101c164
commit 15f1a9362c
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Models/Constants.ts
View file

@ -2,7 +2,7 @@ import { Utils } from "../Utils";
export default class Constants { export default class Constants {
public static vNumber = "0.8.3-rc1"; public static vNumber = "0.8.3-rc2";
// The user journey states thresholds when a new feature gets unlocked // The user journey states thresholds when a new feature gets unlocked
public static userJourney = { public static userJourney = {

18
UI/Popup/TagRenderingQuestion.ts
View file

@ -53,7 +53,6 @@ export default class TagRenderingQuestion extends Combine {
const inputElement: InputElement<TagsFilter> = TagRenderingQuestion.GenerateInputElement(configuration, applicableUnit, tags) const inputElement: InputElement<TagsFilter> = TagRenderingQuestion.GenerateInputElement(configuration, applicableUnit, tags)
const save = () => { const save = () => {
const selection = inputElement.GetValue().data; const selection = inputElement.GetValue().data;
console.log("Save button clicked, the tags are is", selection)
if (selection) { if (selection) {
(State.state?.changes ?? new Changes()) (State.state?.changes ?? new Changes())
.addTag(tags.data.id, selection, tags); .addTag(tags.data.id, selection, tags);
@ -119,18 +118,27 @@ export default class TagRenderingQuestion extends Combine {
}) })
let allIfNots: TagsFilter[] = Utils.NoNull(configuration.mappings?.map(m => m.ifnot) ?? []); function allIfNotsExcept(excludeIndex: number) : TagsFilter[]{
if(configuration.mappings === undefined){
return []
}
if(configuration.multiAnswer){
// The multianswer will do the ifnot configuration themself
return []
}
return Utils.NoNull(configuration.mappings?.map((m,i) => excludeIndex === i ? undefined: m.ifnot))
}
const ff = TagRenderingQuestion.GenerateFreeform(configuration, applicableUnit, tagsSource.data); const ff = TagRenderingQuestion.GenerateFreeform(configuration, applicableUnit, tagsSource.data);
const hasImages = mappings.filter(mapping => mapping.then.ExtractImages().length > 0).length > 0 const hasImages = mappings.filter(mapping => mapping.then.ExtractImages().length > 0).length > 0
if (mappings.length < 8 || configuration.multiAnswer || hasImages) { if (mappings.length < 8 || configuration.multiAnswer || hasImages) {
inputEls = (mappings ?? []).map(mapping => TagRenderingQuestion.GenerateMappingElement(tagsSource, mapping, allIfNots)); inputEls = (mappings ?? []).map((mapping,i) => TagRenderingQuestion.GenerateMappingElement(tagsSource, mapping, allIfNotsExcept(i)));
inputEls = Utils.NoNull(inputEls); inputEls = Utils.NoNull(inputEls);
} else { } else {
const dropdown: InputElement<TagsFilter> = new DropDown("", const dropdown: InputElement<TagsFilter> = new DropDown("",
mappings.map(mapping => { mappings.map((mapping, i) => {
return { return {
value: new And([mapping.if, ...allIfNots]), value: new And([mapping.if, ...allIfNotsExcept(i)]),
shown: Translations.WT(mapping.then).Clone() shown: Translations.WT(mapping.then).Clone()
} }
}) })