Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add copyDisplayValue property into copyvalue trigger fix #6534 #6535

Merged
merged 1 commit into from
Jul 17, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/survey.ts
Original file line number Diff line number Diff line change
@@ -6852,10 +6852,15 @@ export class SurveyModel extends SurveyElementCore
}
}
}
copyTriggerValue(name: string, fromName: string) {
copyTriggerValue(name: string, fromName: string, copyDisplayValue: boolean): void {
if (!name || !fromName) return;
var processor = new ProcessValue();
var value = processor.getValue(fromName, this.getFilteredValues());
let value;
if(copyDisplayValue) {
value = this.processText("{" + fromName + "}", true);
} else {
const processor = new ProcessValue();
value = processor.getValue(fromName, this.getFilteredValues());
}
this.setTriggerValue(name, value, false);
}
triggerExecuted(trigger: Trigger): void {
15 changes: 11 additions & 4 deletions src/trigger.ts
Original file line number Diff line number Diff line change
@@ -224,7 +224,7 @@ export interface ISurveyTriggerOwner {
canBeCompleted(trigger: Trigger, isCompleted: boolean): void;
triggerExecuted(trigger: Trigger): void;
setTriggerValue(name: string, value: any, isVariable: boolean): any;
copyTriggerValue(name: string, fromName: string): any;
copyTriggerValue(name: string, fromName: string, copyDisplayValue: boolean): void;
focusQuestion(name: string): boolean;
}

@@ -443,12 +443,18 @@ export class SurveyTriggerCopyValue extends SurveyTrigger {
public set fromName(val: string) {
this.setPropertyValue("fromName", val);
}
public get copyDisplayValue(): boolean {
return this.getPropertyValue("copyDisplayValue");
}
public set copyDisplayValue(val: boolean) {
this.setPropertyValue("copyDisplayValue", val);
}
public getType(): string {
return "copyvaluetrigger";
}
protected onSuccess(values: HashTable<any>, properties: HashTable<any>) {
protected onSuccess(values: HashTable<any>, properties: HashTable<any>): void {
if (!this.setToName || !this.owner) return;
this.owner.copyTriggerValue(this.setToName, this.fromName);
this.owner.copyTriggerValue(this.setToName, this.fromName, this.copyDisplayValue);
}
}

@@ -499,7 +505,8 @@ Serializer.addClass(
);
Serializer.addClass(
"copyvaluetrigger",
[{ name: "!fromName:questionvalue" }, { name: "!setToName:questionvalue" }],
[{ name: "!fromName:questionvalue" }, { name: "!setToName:questionvalue" },
{ name: "copyDisplayValue:boolean", visible: false }],
function() {
return new SurveyTriggerCopyValue();
},
30 changes: 29 additions & 1 deletion tests/surveytriggertests.ts
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class SurveyTriggerVisibleOwnerTester implements ISurveyTriggerOwner {
canBeCompleted(trigger: Trigger, isCompleted: boolean) {}
triggerExecuted(trigger: Trigger): void {}
setTriggerValue(name: string, value: any, isVariable: boolean) {}
copyTriggerValue(name: string, fromName: string) {}
copyTriggerValue(name: string, fromName: string, copyDisplayValue: boolean): void {}
focusQuestion(name: string): boolean {
return true;
}
@@ -364,6 +364,34 @@ QUnit.test("Do not execute copy and set trigger on page changed", function(
survey.doComplete();
assert.deepEqual(survey.data, data, "We do not change anything");
});
QUnit.test("copyvalue from checkbox", function(assert) {
const survey = new SurveyModel({
pages: [
{
elements: [
{ type: "checkbox", name: "q1",
choices: [{ value: 1, text: "Item1" }, { value: 2, text: "Item2" }, { value: 3, text: "Item3" }] },
{ type: "text", name: "q2" },
]
}
],
"triggers": [
{
"type": "copyvalue",
"expression": "{q1} notempty",
"fromName": "q1",
"setToName": "q2",
"copyDisplayValue": true
}
],
});
const q1 = survey.getQuestionByName("q1");
const q2 = survey.getQuestionByName("q2");
q1.value = [1, 3];
assert.deepEqual(q2.value, "Item1, Item3", "Copy value correctly");
q1.value = [1, 2];
assert.deepEqual(q2.value, "Item1, Item2", "Copy value correctly");
});

QUnit.test("Execute trigger on complete", function(assert) {
class TriggerExprssionTester extends SurveyTriggerRunExpression {