midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Add indication if a mapping cannot be chosen by a contributor

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-15 01:22:06 +01:00
parent 087bbf7acc
commit 109a4f1f95
42 changed files with 208 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -429,9 +429,10 @@ export default class TagRenderingConfig {
try {
const key = this.freeform?.key
const answerMappings = this.mappings?.filter(m => m.hideInAnswer !== true)
if (key === undefined) {
let values: { k: string, v: string }[][] = Utils.NoNull(this.mappings?.map(m => m.if.asChange({})) ?? [])
let values: { k: string, v: string }[][] = Utils.NoNull(answerMappings?.map(m => m.if.asChange({})) ?? [])
if (values.length === 0) {
return;
}
@ -452,7 +453,7 @@ export default class TagRenderingConfig {
}
let values = Utils.NoNull(this.mappings?.map(m => m.if.asChange({}).filter(item => item.k === key)[0]?.v) ?? [])
let values = Utils.NoNull(answerMappings?.map(m => m.if.asChange({}).filter(item => item.k === key)[0]?.v) ?? [])
if (values.length === undefined) {
values = undefined
}
@ -482,8 +483,17 @@ export default class TagRenderingConfig {
let mappings: BaseUIElement = undefined;
if (this.mappings !== undefined) {
mappings = new List(
this.mappings.map(m =>
"**" + m.then.txt + "** corresponds with " + m.if.asHumanString(true, false, {})
this.mappings.map(m => {
let txt = "**" + m.then.txt + "** corresponds with " + m.if.asHumanString(true, false, {});
if(m.hideInAnswer === true)
{
txt += "_This option cannot be chosen as answer_"
}
if(m.ifnot !== undefined){
txt += "Unselecting this answer will add "+m.ifnot.asHumanString(true, false, {})
}
return txt;
}
)
)
}