();
+ public start(func: (timer: SurveyTimer, options: SurveyTimerEvent) => void = null): void {
if (func) {
this.onTimer.add(func);
}
+ this.prevTimeInMs = surveyTimerFunctions.now();
if (this.timerId < 0) {
this.timerId = surveyTimerFunctions.setTimeout(() => {
this.doTimer();
@@ -39,7 +46,7 @@ export class SurveyTimer {
}
this.listenerCounter++;
}
- public stop(func: () => any = null) {
+ public stop(func: (timer: SurveyTimer, options: SurveyTimerEvent) => any = null): void {
if (func) {
this.onTimer.remove(func);
}
@@ -49,13 +56,19 @@ export class SurveyTimer {
this.timerId = -1;
}
}
- public doTimer() {
+ public doTimer(): void {
if(this.onTimer.isEmpty || this.listenerCounter == 0) {
this.timerId = -1;
}
if (this.timerId < 0) return;
+ const newTimer = surveyTimerFunctions.now();
+ let seconds = Math.floor((newTimer - this.prevTimeInMs) / 1000);
+ this.prevTimeInMs = newTimer;
+ if(seconds < 0) {
+ seconds = 1;
+ }
const prevItem = this.timerId;
- this.onTimer.fire(this, {});
+ this.onTimer.fire(this, { seconds: seconds });
//We have to check that we have the same timerId
//It could be changed during events execution and it will lead to double timer events
if(prevItem !== this.timerId) return;
diff --git a/testCafe/helper.js b/testCafe/helper.js
index cea8788062..56548f3832 100644
--- a/testCafe/helper.js
+++ b/testCafe/helper.js
@@ -61,6 +61,9 @@ export const initSurvey = ClientFunction(
window["$"]("#surveyElement").Survey({
model: model
});
+ } else if (framework === "survey-ui") {
+ document.getElementById("surveyElement").innerHTML = "";
+ SurveyUI.renderSurvey(model, document.getElementById("surveyElement"));
} else if (framework === "react") {
document.getElementById("surveyElement").innerHTML = "";
const root = window["ReactDOM"].createRoot(document.getElementById("surveyElement"));
@@ -117,6 +120,13 @@ export const initSurveyPopup = ClientFunction(
allowClose: true,
allowFullScreen: true
});
+ } else if (framework === "survey-ui") {
+ document.getElementById("surveyElement").innerHTML = "";
+ SurveyUI.renderPopupSurvey(model, document.getElementById("surveyElement"), {
+ isExpanded: true,
+ allowClose: true,
+ allowFullScreen: true
+ });
} else if (framework === "react") {
document.getElementById("surveyElement").innerHTML = "";
const root = window["ReactDOM"].createRoot(document.getElementById("surveyElement"));
@@ -180,8 +190,8 @@ export const registerCustomToolboxComponent = ClientFunction(
return window["React"].createElement(CustomActionButton, props);
}
);
- } else if (framework === "jquery-ui") {
- const preact = window["SurveyJquery"]["preact"];
+ } else if (framework === "jquery-ui" || framework === "survey-ui") {
+ const preact = (window["SurveyJquery"] || window["SurveyUI"])["preact"];
window.React = { createElement: preact.createElement };
class CustomActionButton extends preact.Component {
@@ -199,7 +209,7 @@ export const registerCustomToolboxComponent = ClientFunction(
}
}
- window["SurveyJquery"].ReactElementFactory.Instance.registerElement(
+ (window["SurveyJquery"] || window["SurveyUI"]).ReactElementFactory.Instance.registerElement(
"svc-custom-action",
(props) => {
return preact.createElement(CustomActionButton, props);
@@ -267,13 +277,13 @@ export const registerCustomItemComponent = ClientFunction(
return window["React"].createElement(ItemTemplateComponent, props);
}
);
- } else if (framework === "jquery-ui") {
- const preact = window["SurveyJquery"]["preact"];
+ } else if (framework === "jquery-ui" || framework === "survey-ui") {
+ const preact = (window["SurveyJquery"] || window["SurveyUI"])["preact"];
window.React = { createElement: preact.createElement };
class ItemTemplateComponent extends preact.Component {
render() {
const item = this.props.item;
- var Survey = window["SurveyJquery"];
+ var Survey = window["SurveyJquery"] || window["SurveyUI"];
item.iconName = "icon-defaultfile";
item.hint = item.title + " - Description";
@@ -298,7 +308,7 @@ export const registerCustomItemComponent = ClientFunction(
/* eslint-enable */
}
}
- window["SurveyJquery"].ReactElementFactory.Instance.registerElement(
+ (window["SurveyJquery"] || window["SurveyUI"]).ReactElementFactory.Instance.registerElement(
"new-item",
(props) => {
return preact.createElement(ItemTemplateComponent, props);
@@ -387,6 +397,31 @@ export const registerCustomItemContentComponent = ClientFunction(
return preact.createElement(ItemContentTemplateComponent, props);
}
);
+ } else if (framework === "survey-ui") {
+ const preact = window["SurveyUI"]["preact"];
+ window.React = { createElement: preact.createElement };
+ class ItemContentTemplateComponent extends preact.Component {
+ render() {
+ const locText = this.props.item.locText;
+ const styles = {
+ "display": "flex",
+ "alignItems": "center",
+ "gap": "8px"
+ };
+ return (
+
+
+ {SurveyUI.SurveyElementBase.renderLocString(locText)}
+
+ );
+ }
+ }
+ window["SurveyUI"].ReactElementFactory.Instance.registerElement(
+ "new-item-content",
+ (props) => {
+ return preact.createElement(ItemContentTemplateComponent, props);
+ }
+ );
} else if (framework === "vue") {
Vue.component("new-item-content", {
props: {
diff --git a/testCafe/survey/customCss.js b/testCafe/survey/customCss.js
index 3c2633082c..9fa67a05fc 100644
--- a/testCafe/survey/customCss.js
+++ b/testCafe/survey/customCss.js
@@ -48,6 +48,10 @@ const initSurvey = ClientFunction((framework, json) => {
window["$"]("#surveyElement").Survey({
model: model
});
+ } else if (framework === "survey-ui") {
+ model.css = myCss;
+ document.getElementById("surveyElement").innerHTML = "";
+ window["SurveyUI"].renderSurvey(model, document.getElementById("surveyElement"));
}
window["survey"] = model;
});
diff --git a/testCafe/survey/popup.js b/testCafe/survey/popup.js
index 9269bdba6c..1423191cc2 100644
--- a/testCafe/survey/popup.js
+++ b/testCafe/survey/popup.js
@@ -48,6 +48,9 @@ const initPopupSurvey = ClientFunction(
window["$"]("#surveyElement").PopupSurvey({
model: model
});
+ } else if (framework === "survey-ui") {
+ document.getElementById("surveyElement").innerHTML = "";
+ window["SurveyUI"].renderPopupSurvey(model, document.getElementById("surveyElement"));
}
window["survey"] = model;
}
diff --git a/tests/paneltests.ts b/tests/paneltests.ts
index 5470babbc3..be1338f40d 100644
--- a/tests/paneltests.ts
+++ b/tests/paneltests.ts
@@ -2814,4 +2814,62 @@ QUnit.test("panel check title in design mode", function (assert) {
assert.equal(panel.cssTitle, "sv_p_title sv_p_title--hidden");
survey.css.panel.titleHidden = oldCss;
survey.css.root = oldRootCss;
+});
+QUnit.test("Check if errors disappered in the closest questions on changing the question, checkErrorsMode: 'onValueChanged', Bug#8539", function (assert) {
+ const survey = new SurveyModel({
+ checkErrorsMode: "onValueChanged",
+ elements: [
+ {
+ type: "text", name: "q1",
+ validators: [{ type: "expression", expression: "{q1} + {q2} <= 10" }]
+ },
+ { type: "text", name: "q3" },
+ {
+ type: "text", name: "q2",
+ validators: [{ type: "expression", expression: "{q1} + {q2} <= 10" }]
+ }
+ ]
+ });
+ const q1 = survey.getQuestionByName("q1");
+ const q2 = survey.getQuestionByName("q2");
+ q1.value = 5;
+ q2.value = 6;
+ assert.equal(q1.errors.length, 0, "q1.errors #1");
+ assert.equal(q2.errors.length, 1, "q2.errors #1");
+ q1.value = 3;
+ assert.equal(q1.errors.length, 0, "q1.errors #2");
+ assert.equal(q2.errors.length, 0, "q2.errors #2");
+ q1.value = 7;
+ assert.equal(q1.errors.length, 1, "q1.errors #3");
+ assert.equal(q2.errors.length, 0, "q2.errors #3");
+ q2.value = 2;
+ assert.equal(q1.errors.length, 0, "q1.errors #4");
+ assert.equal(q2.errors.length, 0, "q2.errors #4");
+});
+QUnit.test("Check if errors disappered in the closest questions on changing the question, Bug#8539", function (assert) {
+ const survey = new SurveyModel({
+ elements: [
+ {
+ type: "text", name: "q1",
+ validators: [{ type: "expression", expression: "{q1} + {q2} <= 10" }]
+ },
+ { type: "text", name: "q3" },
+ {
+ type: "text", name: "q2",
+ validators: [{ type: "expression", expression: "{q1} + {q2} <= 10" }]
+ }
+ ]
+ });
+ const q1 = survey.getQuestionByName("q1");
+ const q2 = survey.getQuestionByName("q2");
+ q1.value = 5;
+ q2.value = 6;
+ assert.equal(q1.errors.length, 0, "q1.errors #1");
+ assert.equal(q2.errors.length, 0, "q2.errors #1");
+ assert.equal(survey.completeLastPage(), false, "Could not complete");
+ assert.equal(q1.errors.length, 1, "q1.errors #2");
+ assert.equal(q2.errors.length, 1, "q2.errors #2");
+ q1.value = 1;
+ assert.equal(q1.errors.length, 0, "q1.errors #3");
+ assert.equal(q2.errors.length, 0, "q2.errors #3");
});
\ No newline at end of file
diff --git a/tests/question_matrixdropdownbasetests.ts b/tests/question_matrixdropdownbasetests.ts
index d8bfde60ac..45c30217e7 100644
--- a/tests/question_matrixdropdownbasetests.ts
+++ b/tests/question_matrixdropdownbasetests.ts
@@ -1496,4 +1496,38 @@ QUnit.test("showInMultipleColumns & random choices, Bug#8348", function (assert)
assert.equal(rows[0].cells[1].question.visibleChoices[0].value, "col5", "row1 question");
assert.equal(rows[1].cells[1].question.visibleChoices[0].value, "col5", "row2 question");
Helpers.randomizeArray = oldFunc;
+});
+QUnit.test("Check if errors disappered in the cells in the current row on changing cell value, Bug#8539", function (assert) {
+ const survey = new SurveyModel({
+ elements: [
+ {
+ type: "matrixdynamic",
+ name: "matrix",
+ rowCount: 1,
+ columns: [
+ {
+ name: "col1", cellType: "text",
+ validators: [{ type: "expression", expression: "{row.col1} + {row.col2} <= 10" }]
+ },
+ { name: "col3", cellType: "text" },
+ {
+ name: "col2", cellType: "text",
+ validators: [{ type: "expression", expression: "{row.col1} + {row.col2} <= 10" }]
+ }
+ ]
+ }
+ ]
+ });
+ const matrix = survey.getQuestionByName("matrix");
+ const row = matrix.visibleRows[0];
+ const q1 = row.cells[0].question;
+ const q2 = row.cells[2].question;
+ q1.value = 7;
+ q2.value = 7;
+ matrix.validate(true);
+ assert.equal(q1.errors.length, 1, "q1 errors #1");
+ assert.equal(q2.errors.length, 1, "q2 errors #1");
+ q2.value = 1;
+ assert.equal(q1.errors.length, 0, "q1 errors #2");
+ assert.equal(q2.errors.length, 0, "q2 errors #2");
});
\ No newline at end of file
diff --git a/tests/question_texttests.ts b/tests/question_texttests.ts
index 25ac80f8f5..97cfe0d552 100644
--- a/tests/question_texttests.ts
+++ b/tests/question_texttests.ts
@@ -432,4 +432,29 @@ QUnit.test("Test maxLength & getMaxLength", function (assert) {
q.inputType = "password";
assert.equal(q.isTextInput, true, "isTextInput - password");
assert.equal(q.getMaxLength(), 10, "getMaxLength() - password");
-});
\ No newline at end of file
+});
+QUnit.test("settings.storeUtcDates = true, #8542", function(assert) {
+ const survey = new SurveyModel({
+ "elements": [
+ {
+ "name": "q1",
+ "type": "text",
+ "inputType": "datetime-local"
+ }
+ ]
+ });
+ const q1 = survey.getQuestionByName("q1");
+ settings.storeUtcDates = true;
+ const locD = new Date(Date.now());
+ const utcD = new Date(locD.toISOString());
+ q1.value = locD;
+ assert.deepEqual(survey.data, { q1: utcD.toISOString() }, "#1");
+ let str = survey.data.q1;
+ assert.equal(str.indexOf("Z"), str.length - 1, "Has z symbol");
+ q1.clearValue();
+ assert.deepEqual(survey.data, { }, "#2");
+ survey.data = { q1: utcD.toISOString() };
+ assert.equal(new Date(q1.value).toTimeString(), locD.toTimeString(), "#3");
+ assert.equal(q1.value.indexOf("Z"), -1, "Has no z symbol");
+ settings.storeUtcDates = false;
+});
diff --git a/tests/surveytests.ts b/tests/surveytests.ts
index c32f7854bf..ceacc81b25 100644
--- a/tests/surveytests.ts
+++ b/tests/surveytests.ts
@@ -939,6 +939,30 @@ QUnit.test("progressText, 'requiredQuestions' type and design mode", function (
assert.equal(survey.getProgressTypeComponent(), "sv-progress-requiredquestions", "requiredQuestions component");
assert.equal(survey.progressText, "Answered 0/2 questions");
});
+QUnit.test("progressText, 'questions' type, invisible cells and data", function (
+ assert
+) {
+ var survey = new SurveyModel({
+ progressBarType: "questions",
+ elements: [
+ { type: "matrixdynamic", name: "matrix",
+ columns: [
+ { cellType: "text", name: "col1" },
+ { cellType: "boolean", name: "col2" },
+ { cellType: "text", name: "col3", visibleIf: "{row.col2}=true" },
+ ]
+ }
+ ]
+ });
+ survey.data = { matrix: [{ col1: "abc1", col2: true, col3: "edf1" }, { col1: "abc1", col2: false }] };
+ assert.equal(survey.progressText, "Answered 5/5 questions", "#1");
+ const matrix = survey.getQuestionByName("matrix");
+ const rows = matrix.visibleRows;
+ rows[1].getQuestionByName("col2").value = true;
+ assert.equal(survey.progressText, "Answered 5/6 questions", "#2");
+ rows[1].getQuestionByName("col3").value = "abc";
+ assert.equal(survey.progressText, "Answered 6/6 questions", "#3");
+});
QUnit.test("progressText, 'requiredQuestions' type and required matrix dropdown, bug#5375", function (
assert
) {
@@ -15519,16 +15543,40 @@ QUnit.test("survey.autoGrowComment", function (assert) {
]
};
let survey = new SurveyModel(json);
- let comment1 = survey.getQuestionByName("comment1");
- let comment2 = survey.getQuestionByName("comment2");
+ let comment1 = survey.getQuestionByName("comment1") as QuestionCommentModel;
+ let comment2 = survey.getQuestionByName("comment2") as QuestionCommentModel;
- assert.equal(survey.autoGrowComment, true);
- assert.equal(comment1.autoGrow, true);
- assert.equal(comment2.autoGrow, true);
+ assert.equal(survey.autoGrowComment, true, "#1");
+ assert.equal(comment1.renderedAutoGrow, true, "#2");
+ assert.equal(comment2.renderedAutoGrow, true, "#3");
survey.autoGrowComment = false;
- assert.equal(comment1.autoGrow, false);
- assert.equal(comment2.autoGrow, true);
+ assert.equal(comment1.renderedAutoGrow, false, "#4");
+ assert.equal(comment2.renderedAutoGrow, true, "#5");
+});
+QUnit.test("save comment autoGrow && autoResize", function (assert) {
+ let json = {
+ autoGrowComment: true,
+ pages: [
+ {
+ elements: [
+ {
+ type: "comment",
+ name: "q1",
+ }
+ ]
+ }
+ ]
+ };
+ let survey = new SurveyModel(json);
+ let question = survey.getQuestionByName("q1") as QuestionCommentModel;
+ assert.deepEqual(question.toJSON(), { name: "q1" }, "#1");
+ question.allowResize = false;
+ question.autoGrow = false;
+ assert.deepEqual(question.toJSON(), { name: "q1", allowResize: false, autoGrow: false }, "#2");
+ question.allowResize = true;
+ question.autoGrow = true;
+ assert.deepEqual(question.toJSON(), { name: "q1", allowResize: true, autoGrow: true }, "#3");
});
QUnit.test("survey.allowResizeComment", function (assert) {
let json = {
@@ -15550,26 +15598,79 @@ QUnit.test("survey.allowResizeComment", function (assert) {
]
};
let survey = new SurveyModel(json);
- let comment1 = survey.getQuestionByName("comment1");
- let comment2 = survey.getQuestionByName("comment2");
+ let comment1 = survey.getQuestionByName("comment1") as QuestionCommentModel;
+ let comment2 = survey.getQuestionByName("comment2") as QuestionCommentModel;
assert.equal(survey.allowResizeComment, false);
- assert.equal(comment1.renderedAllowResize, false);
- assert.equal(comment2.renderedAllowResize, false);
+ assert.equal(comment1.renderedAllowResize, false, "comment1 survey.allowResizeComment = false, #1");
+ assert.equal(comment2.renderedAllowResize, false, "comment2 survey.allowResizeComment = false, #2");
survey.allowResizeComment = true;
- assert.equal(comment1.renderedAllowResize, true);
- assert.equal(comment2.renderedAllowResize, false);
+ assert.equal(comment1.renderedAllowResize, true, "comment1 survey.allowResizeComment = true, #3");
+ assert.equal(comment2.renderedAllowResize, false, "comment2 survey.allowResizeComment = true, #4");
comment1.readOnly = true;
- assert.equal(comment1.renderedAllowResize, false);
+ assert.equal(comment1.renderedAllowResize, false, "#5");
comment1.readOnly = false;
survey.showPreview();
let comment1Preview = survey.getQuestionByName("comment1");
- assert.equal(comment1Preview.renderedAllowResize, false);
+ assert.equal(comment1Preview.renderedAllowResize, false, "#6");
+});
+QUnit.test("survey.allowResizeComment & survey.autoGrowComment override this properties for individual properties", function (assert) {
+ let json = {
+ allowResizeComment: false,
+ autoGrowComment: false,
+ pages: [
+ {
+ elements: [
+ {
+ type: "comment",
+ name: "comment1",
+ autoGrow: true,
+ allowResize: true
+ },
+ {
+ type: "comment",
+ name: "comment2",
+ },
+ {
+ type: "comment",
+ name: "comment3",
+ autoGrow: false
+ }
+ ]
+ }
+ ]
+ };
+ let survey = new SurveyModel(json);
+ let comment1 = survey.getQuestionByName("comment1") as QuestionCommentModel;
+ let comment2 = survey.getQuestionByName("comment2") as QuestionCommentModel;
+ let comment3 = survey.getQuestionByName("comment3") as QuestionCommentModel;
+
+ assert.equal(comment1.renderedAllowResize, true, "comment1 survey.allowResizeComment = false, #1");
+ assert.equal(comment1.renderedAutoGrow, true, "comment1 survey.autoGrowComment = false, #2");
+ assert.equal(comment2.renderedAllowResize, false, "comment2 survey.allowResizeComment = false, #3");
+ assert.equal(comment2.renderedAutoGrow, false, "comment2 survey.autoGrowComment = false, #4");
+ assert.equal(comment3.renderedAutoGrow, false, "comment2 survey.autoGrowComment = false, #5");
+
+ survey.allowResizeComment = true;
+ survey.autoGrowComment = true;
+ assert.equal(comment1.renderedAllowResize, true, "comment1 survey.allowResizeComment = true, #6");
+ assert.equal(comment1.renderedAutoGrow, true, "comment1 survey.autoGrowComment = true, #7");
+ assert.equal(comment2.renderedAllowResize, true, "comment2 survey.allowResizeComment = true, #8");
+ assert.equal(comment2.renderedAutoGrow, true, "comment2 survey.autoGrowComment = true, #9");
+ assert.equal(comment3.renderedAutoGrow, false, "comment2 survey.autoGrowComment = true, #10");
+});
+
+QUnit.test("getDefaultPropertyValue for comment properties autoGrow & allowResize", function (assert) {
+ let comment = new QuestionCommentModel("q1");
+
+ assert.strictEqual(comment.getDefaultPropertyValue("autoGrow"), undefined, "autoGrow");
+ assert.strictEqual(comment.getDefaultPropertyValue("allowResize"), undefined, "allowResize");
});
+
QUnit.test("utils.increaseHeightByContent", assert => {
let element = {
getBoundingClientRect: () => { return { height: 50, width: 100, x: 10, y: 10 }; },
diff --git a/tests/surveytimertests.ts b/tests/surveytimertests.ts
index 17226e18da..8017854eb4 100644
--- a/tests/surveytimertests.ts
+++ b/tests/surveytimertests.ts
@@ -1,7 +1,5 @@
-import { PageModel } from "../src/page";
import { SurveyModel } from "../src/survey";
-import { SurveyTimer, surveyTimerFunctions } from "../src/surveytimer";
-import { SurveyTimerModel } from "../src/surveyTimerModel";
+import { SurveyTimer, surveyTimerFunctions, SurveyTimerEvent } from "../src/surveytimer";
import { defaultV2Css } from "../src/defaultCss/defaultV2Css";
export default QUnit.module("SurveyTimer");
@@ -10,10 +8,12 @@ surveyTimerFunctions.setTimeout = function(func: () => any): number {
return 1;
};
surveyTimerFunctions.clearTimeout = function(timerId: number) {};
+let nowValue = 1000000000;
+surveyTimerFunctions.now = function(): number { nowValue += 1000; return nowValue; };
QUnit.test("Test timer event", function(assert) {
var counter = 0;
- var func = function() {
+ var func = function(sender: SurveyTimer, event: SurveyTimerEvent) {
counter++;
};
SurveyTimer.instance.start(func);
@@ -24,6 +24,25 @@ QUnit.test("Test timer event", function(assert) {
assert.equal(counter, 5, "Timer was stopped nothing happened");
});
+function doTimer(count: number, suspendedSeconds: number = 0) {
+ nowValue += suspendedSeconds * 1000;
+ for (var i = 0; i < count; i++) {
+ SurveyTimer.instance.doTimer();
+ }
+}
+
+QUnit.test("Test suspended timer event", function(assert) {
+ var seconds = 0;
+ var func = function(sender: SurveyTimer, options: SurveyTimerEvent) {
+ seconds += options.seconds;
+ };
+ SurveyTimer.instance.start(func);
+ doTimer(5);
+ assert.equal(seconds, 5, "#1");
+ doTimer(1, 7);
+ assert.equal(seconds, 5 + 1 + 7, "#2");
+});
+
QUnit.test("Spent time on survey", function(assert) {
var survey = new SurveyModel();
survey.startTimer();
@@ -46,6 +65,28 @@ QUnit.test("Spent time on survey", function(assert) {
survey.stopTimer();
});
+QUnit.test("Spent time on survey with suspended timer", function(assert) {
+ var survey = new SurveyModel();
+ survey.startTimer();
+ assert.equal(survey.timeSpent, 0, "Timer was not started");
+ doTimer(1, 4);
+ assert.equal(survey.timeSpent, 5, "Timer called 5 times");
+ doTimer(1, 4);
+ assert.equal(survey.timeSpent, 10, "Timer called 10 times");
+ survey.stopTimer();
+ doTimer(1, 4);
+ assert.equal(survey.timeSpent, 10, "Timer still called 10 times");
+ survey.startTimer();
+ doTimer(1, 4);
+ assert.equal(survey.timeSpent, 15, "Timer called 15 times");
+ survey.doComplete();
+ doTimer(1, 4);
+ assert.equal(survey.timeSpent, 15, "Timer called still 15 times");
+ survey.clear();
+ assert.equal(survey.timeSpent, 0, "reset value");
+ survey.stopTimer();
+});
+
QUnit.test("Spent time on pages", function(assert) {
var survey = new SurveyModel();
var page1 = survey.addNewPage();
@@ -87,6 +128,74 @@ QUnit.test("Spent time on pages", function(assert) {
survey.stopTimer();
});
+QUnit.test("Spent time on pages with suspended timer, #1", function(assert) {
+ var survey = new SurveyModel();
+ var page1 = survey.addNewPage();
+ var page2 = survey.addNewPage();
+ page1.addNewQuestion("text");
+ page2.addNewQuestion("text");
+ page1.maxTimeToFinish = 9;
+ page2.maxTimeToFinish = 8;
+ survey.startTimer();
+ assert.equal(page1.timeSpent, 0, "page1.timeSpent #1");
+ assert.equal(survey.timeSpent, 0, "survey.timeSpent #1");
+ doTimer(1, 4);
+ assert.equal(page1.timeSpent, 5, "page1.timeSpent #2");
+ assert.equal(survey.timeSpent, 5, "survey.timeSpent #2");
+ doTimer(1, 10);
+ assert.equal(page1.timeSpent, 9, "page1.timeSpent #3");
+ assert.equal(survey.timeSpent, 9, "survey.timeSpent #3");
+ assert.equal(survey.currentPageNo, 1, "survey.currentPageNo #1");
+ assert.equal(page2.timeSpent, 0, "page2, timeSpent #1");
+ doTimer(1, 20);
+ assert.equal(page2.timeSpent, 8, "page2, timeSpent #2");
+ assert.equal(survey.timeSpent, 17, "survey.timeSpent #4");
+ assert.equal(survey.state, "completed", "The survey is completed");
+ survey.stopTimer();
+});
+QUnit.test("Spent time on pages with suspended timer, #2", function(assert) {
+ var survey = new SurveyModel();
+ survey.maxTimeToFinish = 15;
+ var page1 = survey.addNewPage();
+ var page2 = survey.addNewPage();
+ page1.addNewQuestion("text");
+ page2.addNewQuestion("text");
+ page1.maxTimeToFinish = 9;
+ page2.maxTimeToFinish = 8;
+ survey.startTimer();
+ assert.equal(page1.timeSpent, 0, "page1.timeSpent #1");
+ assert.equal(survey.timeSpent, 0, "survey.timeSpent #1");
+ doTimer(1);
+ doTimer(1);
+ doTimer(1, 40);
+ assert.equal(page1.timeSpent, 9, "page1.timeSpent #2");
+ assert.equal(survey.timeSpent, 9, "survey.timeSpent #2");
+ assert.equal(survey.currentPageNo, 1, "survey.currentPageNo #1");
+ assert.equal(page2.timeSpent, 0, "page2, timeSpent #1");
+ assert.equal(survey.state, "running", "The survey is completed");
+ survey.stopTimer();
+});
+QUnit.test("Spent time on pages with suspended timer, #3", function(assert) {
+ var survey = new SurveyModel();
+ survey.maxTimeToFinish = 15;
+ survey.maxTimeToFinishPage = 10;
+ var page1 = survey.addNewPage();
+ var page2 = survey.addNewPage();
+ page1.addNewQuestion("text");
+ page2.addNewQuestion("text");
+ survey.startTimer();
+ assert.equal(page1.timeSpent, 0, "page1.timeSpent #1");
+ assert.equal(survey.timeSpent, 0, "survey.timeSpent #1");
+ doTimer(1);
+ doTimer(1);
+ doTimer(1, 40);
+ assert.equal(page1.timeSpent, 10, "page1.timeSpent #2");
+ assert.equal(survey.timeSpent, 10, "survey.timeSpent #2");
+ assert.equal(survey.currentPageNo, 1, "survey.currentPageNo #1");
+ assert.equal(page2.timeSpent, 0, "page2, timeSpent #1");
+ assert.equal(survey.state, "running", "The survey is completed");
+ survey.stopTimer();
+});
QUnit.test("Complete survey by timer", function(assert) {
var survey = new SurveyModel();
survey.addNewPage();
@@ -105,6 +214,24 @@ QUnit.test("Complete survey by timer", function(assert) {
survey.stopTimer();
});
+QUnit.test("Complete survey by timer with suspended", function(assert) {
+ var survey = new SurveyModel();
+ survey.addNewPage();
+ survey.addNewPage();
+ survey.pages[0].addNewQuestion("text");
+ survey.pages[1].addNewQuestion("text");
+ survey.maxTimeToFinish = 10;
+ survey.startTimer();
+ assert.equal(survey.state, "running", "The state is running");
+ doTimer(1, 4);
+ assert.equal(survey.state, "running", "The state is still running");
+ assert.equal(survey.timeSpent, 5, "Timer called 5 times");
+ doTimer(1, 5);
+ assert.equal(survey.state, "completed", "The state is completed");
+ assert.equal(survey.timeSpent, 10, "Timer called 10 times");
+ survey.stopTimer();
+});
+
QUnit.test("Complete pages by timer", function(assert) {
var survey = new SurveyModel();
survey.addNewPage("p1");
@@ -127,6 +254,28 @@ QUnit.test("Complete pages by timer", function(assert) {
survey.stopTimer();
});
+QUnit.test("Complete pages by timer with suspended", function(assert) {
+ var survey = new SurveyModel();
+ survey.addNewPage("p1");
+ survey.addNewPage("p2");
+ survey.pages[0].addNewQuestion("text");
+ survey.pages[1].addNewQuestion("text");
+ survey.maxTimeToFinishPage = 10;
+ survey.pages[1].maxTimeToFinish = 5;
+ survey.startTimer();
+ assert.equal(survey.state, "running", "The state is running");
+ assert.equal(survey.currentPage.name, "p1", "The first page");
+ doTimer(1, 4);
+ assert.equal(survey.state, "running", "The state is still running");
+ assert.equal(survey.currentPage.name, "p1", "The first page");
+ doTimer(1, 4);
+ assert.equal(survey.state, "running", "The state is still running");
+ assert.equal(survey.currentPage.name, "p2", "The second first page");
+ doTimer(1, 4);
+ assert.equal(survey.state, "completed", "The survey is completed");
+ survey.stopTimer();
+});
+
QUnit.test("Showing prev button", function(assert) {
var survey = new SurveyModel();
survey.addNewPage("p1");
@@ -271,12 +420,6 @@ QUnit.test("Allow to modify timeSpent property", (assert) => {
survey.stopTimer();
});
-function doTimer(count: number) {
- for (var i = 0; i < count; i++) {
- SurveyTimer.instance.doTimer();
- }
-}
-
QUnit.test("Test SurveyTimerModel", function(assert) {
const survey = new SurveyModel();
survey.addNewPage("p1");
diff --git a/visualRegressionTests/tests/defaultV2/buttongroup.ts b/visualRegressionTests/tests/defaultV2/buttongroup.ts
index f92d5a8b42..b780436481 100644
--- a/visualRegressionTests/tests/defaultV2/buttongroup.ts
+++ b/visualRegressionTests/tests/defaultV2/buttongroup.ts
@@ -25,11 +25,18 @@ const registerButtongroup = ClientFunction((framework) => {
}
if (framework === "jquery-ui") {
const SurveyJquery = (window).SurveyJquery;
- const preact = window["SurveyJquery"]["preact"];
+ const preact = SurveyJquery["preact"];
SurveyJquery.ReactQuestionFactory.Instance.registerQuestion("buttongroup", props => {
return preact.createElement(SurveyJquery.SurveyQuestionButtonGroup, props);
});
}
+ if (framework === "survey-ui") {
+ const SurveyUI = (window).SurveyUI;
+ const preact = SurveyUI["preact"];
+ SurveyUI.ReactQuestionFactory.Instance.registerQuestion("buttongroup", props => {
+ return preact.createElement(SurveyUI.SurveyQuestionButtonGroup, props);
+ });
+ }
if (framework === "knockout") {
Survey.Serializer.overrideClassCreator("buttongroup", function () {
return new Survey.QuestionButtonGroup("");
diff --git a/visualRegressionTests/tests/defaultV2/etalons/question-selectbase-zero-column-panelless.png b/visualRegressionTests/tests/defaultV2/etalons/question-selectbase-zero-column-panelless.png
new file mode 100644
index 0000000000..a4f5858c86
Binary files /dev/null and b/visualRegressionTests/tests/defaultV2/etalons/question-selectbase-zero-column-panelless.png differ
diff --git a/visualRegressionTests/tests/defaultV2/selectbase.ts b/visualRegressionTests/tests/defaultV2/selectbase.ts
index 5d0c2139d5..5b092f88b1 100644
--- a/visualRegressionTests/tests/defaultV2/selectbase.ts
+++ b/visualRegressionTests/tests/defaultV2/selectbase.ts
@@ -155,4 +155,82 @@ frameworks.forEach(framework => {
});
});
+
+ test("Check rating smileys scale colored question themes", async (t) => {
+ await wrapVisualTest(t, async (t, comparer) => {
+ await t.resizeWindow(1920, 1080);
+ const focusBody = ClientFunction(() => { document.body.focus(); });
+
+ await initSurvey(framework, {
+ "logoPosition": "right",
+ "pages": [
+ {
+ "name": "page1",
+ "elements": [
+ {
+ "type": "radiogroup",
+ "name": "question1",
+ "startWithNewLine": false,
+ "title": "question1",
+ "choices": [
+ "option1",
+ "option2",
+ "option3"
+ ],
+ "colCount": 3
+ }
+ ],
+ "title": "Personal Information"
+ }
+ ]
+ });
+
+ await ClientFunction(() => {
+ const themeJson = {
+ "themeName": "default",
+ "colorPalette": "light",
+ "isPanelless": true,
+ "cssVariables": {
+ "--sjs-corner-radius": "4px",
+ "--sjs-base-unit": "8px",
+ "--sjs-shadow-small": "0px 1px 2px 0px rgba(0, 0, 0, 0.15)",
+ "--sjs-shadow-inner": "inset 0px 1px 2px 0px rgba(0, 0, 0, 0.15)",
+ "--sjs-border-default": "rgba(0, 0, 0, 0.16)",
+ "--sjs-border-light": "rgba(0, 0, 0, 0.09)",
+ "--sjs-general-backcolor": "rgba(255, 255, 255, 1)",
+ "--sjs-general-backcolor-dark": "rgba(248, 248, 248, 1)",
+ "--sjs-general-backcolor-dim-light": "rgba(249, 249, 249, 1)",
+ "--sjs-general-backcolor-dim-dark": "rgba(243, 243, 243, 1)",
+ "--sjs-general-forecolor": "rgba(0, 0, 0, 0.91)",
+ "--sjs-general-forecolor-light": "rgba(0, 0, 0, 0.45)",
+ "--sjs-general-dim-forecolor": "rgba(0, 0, 0, 0.91)",
+ "--sjs-general-dim-forecolor-light": "rgba(0, 0, 0, 0.45)",
+ "--sjs-secondary-backcolor": "rgba(255, 152, 20, 1)",
+ "--sjs-secondary-backcolor-light": "rgba(255, 152, 20, 0.1)",
+ "--sjs-secondary-backcolor-semi-light": "rgba(255, 152, 20, 0.25)",
+ "--sjs-secondary-forecolor": "rgba(255, 255, 255, 1)",
+ "--sjs-secondary-forecolor-light": "rgba(255, 255, 255, 0.25)",
+ "--sjs-shadow-small-reset": "0px 0px 0px 0px rgba(0, 0, 0, 0.15)",
+ "--sjs-shadow-medium": "0px 2px 6px 0px rgba(0, 0, 0, 0.1)",
+ "--sjs-shadow-large": "0px 8px 16px 0px rgba(0, 0, 0, 0.1)",
+ "--sjs-shadow-inner-reset": "inset 0px 0px 0px 0px rgba(0, 0, 0, 0.15)",
+ "--sjs-border-inside": "rgba(0, 0, 0, 0.16)",
+ "--sjs-general-backcolor-dim": "rgba(255, 255, 255, 1)",
+ "--sjs-primary-backcolor": "rgba(25, 179, 148, 1)",
+ "--sjs-primary-backcolor-dark": "rgba(20, 164, 139, 1)",
+ "--sjs-primary-backcolor-light": "rgba(25, 179, 148, 0.1)",
+ "--sjs-primary-forecolor": "rgba(255, 255, 255, 1)",
+ "--sjs-primary-forecolor-light": "rgba(255, 255, 255, 0.25)",
+ "--sjs-special-red": "rgba(229, 10, 62, 1)",
+ "--sjs-special-red-light": "rgba(229, 10, 62, 0.1)"
+ },
+ };
+ window["survey"].applyTheme(themeJson);
+ })();
+
+ const questionRoot = Selector(".sd-question .sd-question__content");
+ await focusBody();
+ await takeElementScreenshot("question-selectbase-zero-column-panelless", questionRoot, t, comparer);
+ });
+ });
});
\ No newline at end of file