From d369cb158baa9aaf5fe2b89f4b2ed020d38e5195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:51:06 +0100 Subject: [PATCH] BATM-5812: renamed quizzes to questionnaires (#897) --- gradle.properties | 2 +- .../extensions/ITransactionPreparation.java | 8 +++---- .../extensions/ITransactionRequest.java | 10 ++++---- .../QuestionAnswer.java | 4 ++-- .../QuestionnaireResult.java} | 24 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) rename server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/{quiz => questionnaire}/QuestionAnswer.java (96%) rename server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/{quiz/QuizResult.java => questionnaire/QuestionnaireResult.java} (62%) diff --git a/gradle.properties b/gradle.properties index b23b3932f..b733dc035 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.7 +projectVersion=1.3.8 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java index 92424eaa2..9e50c7f05 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java @@ -18,7 +18,7 @@ package com.generalbytes.batm.server.extensions; -import com.generalbytes.batm.server.extensions.quiz.QuizResult; +import com.generalbytes.batm.server.extensions.questionnaire.QuestionnaireResult; import java.math.BigDecimal; import java.util.Date; @@ -205,10 +205,10 @@ public interface ITransactionPreparation { void setWithdrawalReason(int reason); /** - * Returns quiz results if any quiz has been activated. + * Returns questionnaire results if any questionnaire has been activated. * - * @return List of {@link QuizResult}. Can be null. + * @return List of {@link QuestionnaireResult}. Can be null. */ - List getQuizResults(); + List getQuestionnaireResults(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java index 9382eaf7e..09ef2c38e 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions; -import com.generalbytes.batm.server.extensions.quiz.QuizResult; +import com.generalbytes.batm.server.extensions.questionnaire.QuestionnaireResult; import java.math.BigDecimal; import java.util.Date; @@ -160,11 +160,11 @@ public interface ITransactionRequest { BigDecimal getDiscountQuotient(); /** - * Returns quiz results if any quiz has been activated. + * Returns questionnaire results if any questionnaire has been activated. * - * @return List of {@link QuizResult}. Can be null. + * @return List of {@link QuestionnaireResult}. Can be null. */ - List getQuizResults(); + List getQuestionnaireResults(); /** * Error message displayed to the customer. diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java similarity index 96% rename from server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java rename to server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java index d80f8236b..3a93e78cc 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java @@ -15,13 +15,13 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.quiz; +package com.generalbytes.batm.server.extensions.questionnaire; import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinition; import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinitionType; /** - * An object representing the question and answer data in the {@link QuizResult}. + * An object representing the question and answer data in the {@link QuestionnaireResult}. */ public class QuestionAnswer { diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java similarity index 62% rename from server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java rename to server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java index 623e6c913..07f52f7ee 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -15,34 +15,34 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.quiz; +package com.generalbytes.batm.server.extensions.questionnaire; import java.util.List; /** - * An object representing data about quiz result. + * An object representing data about questionnaire result. */ -public class QuizResult { +public class QuestionnaireResult { - private String quizName; + private String questionnaireName; private List answers; - public QuizResult() { + public QuestionnaireResult() { } - public QuizResult(String quizName, List answers) { - this.quizName = quizName; + public QuestionnaireResult(String questionnaireName, List answers) { + this.questionnaireName = questionnaireName; this.answers = answers; } - public String getQuizName() { - return quizName; + public String getQuestionnaireName() { + return questionnaireName; } - public void setQuizName(String quizName) { - this.quizName = quizName; + public void setQuestionnaireName(String questionnaireName) { + this.questionnaireName = questionnaireName; } public List getAnswers() {