diff --git a/projectforge-application/src/main/resources/i18nKeys.json b/projectforge-application/src/main/resources/i18nKeys.json index 623ff2b83c..d92dd2e080 100644 --- a/projectforge-application/src/main/resources/i18nKeys.json +++ b/projectforge-application/src/main/resources/i18nKeys.json @@ -1996,7 +1996,7 @@ {"i18nKey":"poll.email-subject-field","bundleName":"I18nResources","translation":"Email Subject","translationDE":"Email Titel","usedInClasses":[],"usedInFiles":[]}, {"i18nKey":"poll.email-subject-tooltip","bundleName":"I18nResources","translation":"Here you can choose the subject of the email yourself. Use {0} to insert the survey title and {1} to set the automatic end date of the survey - which is the deadline for voting. poll.email-content-tooltip=Here you can determine the content of the email yourself. Use {0} to call the survey title. With {1}, you can display the survey creator, with {2} you create a direct link to the survey. Use {3} to retrieve the survey description, and {4} to automatically retrieve the end date of the survey, i.e., the deadline for voting.","translationDE":"Hier kannst du den Betreff der E-Mail selbst angeben. Verwende {0}, um den Titel der Umfrage einzufügen, und {1}, um das automatische Enddatum der Umfrage einzusetzen","usedInClasses":[],"usedInFiles":[]}, {"i18nKey":"poll.error.cantremoveyourself","bundleName":"I18nResources","translation":"You cannot remove yourself as a Full Access User. Please ask another Full Access User or the poll creator to do this for you.","translationDE":"Du kannst dich nicht selbst als Full Access User entfernen. Bitte einen anderen Full Access User oder den/die Ersteller:in dieser Umfrage dies für dich zu tun.","usedInClasses":[],"usedInFiles":[]}, - {"i18nKey":"poll.error.oneAttendeRequired","bundleName":"I18nResources","translation":"Please add at least one participant.","translationDE":"Bitte füge mindestens eine:n Teilnehmer:in hinzu.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, + {"i18nKey":"poll.error.oneAttendeeRequired","bundleName":"I18nResources","translation":"Please add at least one participant.","translationDE":"Bitte füge mindestens eine:n Teilnehmer:in hinzu.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.error.oneQuestionRequired","bundleName":"I18nResources","translation":"At least one question is required.","translationDE":"Mindestens eine Frage ist erforderlich.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.exception.noAttendee","bundleName":"I18nResources","translation":"This user is not part of the poll.","translationDE":"Diese:r Nutzer:in ist nicht Teil der Umfrage.","usedInClasses":["org.projectforge.rest.poll.PollResponsePageRest"],"usedInFiles":[]}, {"i18nKey":"poll.export.response.poll","bundleName":"I18nResources","translation":"Export results","translationDE":"Ergebnisse exportieren","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, @@ -2004,7 +2004,7 @@ {"i18nKey":"poll.fullAccessGroups","bundleName":"I18nResources","translation":"Full Access Groups","translationDE":"Gruppen mit Vollzugriff","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.fullAccessUser.tooltip","bundleName":"I18nResources","translation":"Full access users have the ability to close the survey, view the Excel results, and add or remove individuals (they cannot remove themselves). They are not counted as participants. If these individuals are also supposed to vote, they must be additionally registered as participants.","translationDE":"Vollzugriffsbenutzer:innen haben die Möglichkeit, die Umfrage zu schließen, die Excel-Ergebnisse anzusehen und Personen hinzuzufügen oder zu entfernen (sie können sich selbst nicht entfernen). Sie werden nicht als Teilnehmer:in gezählt.Wenn diese Personen auch abstimmen sollen, müssen sie zusätzlich als Teilnehmer:innen registriert werden.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.fullAccessUsers","bundleName":"I18nResources","translation":"Full Access User","translationDE":"Benutzer:innen mit Vollzugriff","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, - {"i18nKey":"poll.fullAccessgroups.tooltip","bundleName":"I18nResources","translation":"Full access groups include, for example, the BUs, the MUK team, or the Marketing team. Individuals with full access can close the survey prematurely, view the Excel results, or add users. If these individuals are supposed to vote, they must be added as participants.","translationDE":"Als Gruppen sind z.B. die BU's, das MUK-Team oder auch das Marketing-Team hinterlegt. Personen mit Vollzugriff können die Umfrage vorzeitig beenden, die Excel-Ergebnisse einsehen oder auch Nutzer:innen hinzufügen. Wenn diese Personen abstimmen sollen, musst du sie noch als Teilnehmer:innen hinzufügen.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, + {"i18nKey":"poll.fullAccessGroups.tooltip","bundleName":"I18nResources","translation":"Full access groups include, for example, the BUs, the MUK team, or the Marketing team. Individuals with full access can close the survey prematurely, view the Excel results, or add users. If these individuals are supposed to vote, they must be added as participants.","translationDE":"Als Gruppen sind z.B. die BU's, das MUK-Team oder auch das Marketing-Team hinterlegt. Personen mit Vollzugriff können die Umfrage vorzeitig beenden, die Excel-Ergebnisse einsehen oder auch Nutzer:innen hinzufügen. Wenn diese Personen abstimmen sollen, musst du sie noch als Teilnehmer:innen hinzufügen.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.groupAttendees","bundleName":"I18nResources","translation":"Attendee Groups","translationDE":"Teilnehmergruppen","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.groupAttendees.tooltip","bundleName":"I18nResources","translation":"Group attendees are a convenient way to add entire groups, such as BUs, all at once instead of individually. Attendees can only vote.","translationDE":"Teilnehmergruppen bieten dir die Möglichkeit, nicht jede Person einzeln hinzufügen zu müssen, sondern ganze Gruppen wie BUs auf einmal angeben zu können. Teilnehmer:innen können nur abstimmen.","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, {"i18nKey":"poll.guide","bundleName":"I18nResources","translation":"Poll Guide","translationDE":"Anleitung","usedInClasses":["org.projectforge.rest.poll.PollPageRest"],"usedInFiles":[]}, diff --git a/projectforge-business/src/main/resources/I18nResources.properties b/projectforge-business/src/main/resources/I18nResources.properties index 2bebf71211..a65c062811 100644 --- a/projectforge-business/src/main/resources/I18nResources.properties +++ b/projectforge-business/src/main/resources/I18nResources.properties @@ -1976,9 +1976,12 @@ plugins.teamcal.title.list=List of calendars poll=Poll poll.access=Access poll.Annotations=Annotations -poll.annotations.description=In the annotation field, you can add information that you believe is not clearly defined in the responses or if you wish to provide important information, such as allergies. poll.answer=Option poll.assignment=Assignment +poll.headline.userConfiguration=User management +poll.headline.mailConfiguration=Mail settings +poll.headline.questionConfiguration=Question settings +poll.headline.generalConfiguration=General settings poll.attendee=Attendee poll.attendees=Attendees poll.attendees.tooltip=Attendees can only vote. @@ -2002,13 +2005,14 @@ poll.email-subject-tooltip=Here you can choose the subject of the email yourself poll.email-content-tooltip=Here you can determine the content of the email yourself. Use {0} to call the survey title. With {1}, you can display the survey creator, with {2} you create a direct link to the survey.\ \ Use {3} to retrieve the survey description, and {4} to automatically retrieve the end date of the survey, i.e., the deadline for voting. poll.error.cantremoveyourself=You cannot remove yourself as a Full Access User. Please ask another Full Access User or the poll creator to do this for you. -poll.error.oneAttendeRequired=Please add at least one participant. +poll.error.oneAttendeeRequired=Please add at least one participant. poll.error.oneQuestionRequired=At least one question is required. +poll.error.ownerRequired=No creator of the survey was specified. Please contact an admin. poll.exception.noAttendee=This user is not part of the poll. poll.export.response.poll=Export results poll.finished=Finished poll.fullAccessGroups=Full Access Groups -poll.fullAccessgroups.tooltip=Full access groups include, for example, the BUs, the MUK team, or the Marketing team. Individuals with full access can close the survey prematurely, view the Excel results, or add users. \ +poll.fullAccessGroups.tooltip=Full access groups include, for example, the BUs, the MUK team, or the Marketing team. Individuals with full access can close the survey prematurely, view the Excel results, or add users. \ If these individuals are supposed to vote, they must be added as participants. poll.fullAccessUser.tooltip=Full access users have the ability to close the survey, view the Excel results, and add or remove individuals (they cannot remove themselves). They are not counted as participants.\ \ If these individuals are also supposed to vote, they must be additionally registered as participants. @@ -2072,19 +2076,15 @@ poll.premadeQuestion.tooltip=In this menu, you will find frequently used templat \ you have the option to revise or correct questions if they do not apply to your situation in the template. poll.question=Question poll.question.multi=Question -poll.question.MultiResponseQuestion=Question -poll.question.multititle= Multiple Choice Questions +poll.question.multiResponseQuestionTitle=Multiple choice question poll.question.single=Question -poll.question.SingleResponseQuestion=Question -poll.question.singletitel= Singel response Question +poll.question.singleResponseQuestionTitle=Single choice question poll.question.text=Question poll.question.TextQuestion=Answer +poll.question.textQuestionTitle=Question with text answer poll.question.texttitle= Text Questions poll.questionTemplate=Templates poll.questionType=Question Type -poll.questionType.PollMultiResponseQuestion=Multiple choice questions -poll.questionType.PollSingleResponseQuestion=Single response question -poll.questionType.PollTextQuestion=Text question poll.questionType.tooltip=Question types offer various options for questions, including single-choice questions, multiple-choice questions, and text questions. You can easily add them if a question is missing\ \ in the template or if you want to create your own survey without using a template. poll.respond=Send responses @@ -2105,8 +2105,8 @@ poll.templateTypeNeujahrsfeier=New Year's Party poll.templateTypeSommerfest=Summer Party poll.templateTypeTeamessen=Team Dinner poll.title=Title -poll.title.add=Create new Poll -poll.title.edit=Edit Poll +poll.title.add=Create new poll +poll.title.edit=Administrate poll poll.title.list=Polls poll.userDelegation=User delegation poll.yourAnswers=Your answers diff --git a/projectforge-business/src/main/resources/I18nResources_de.properties b/projectforge-business/src/main/resources/I18nResources_de.properties index 532c9b44d8..6581f184ec 100644 --- a/projectforge-business/src/main/resources/I18nResources_de.properties +++ b/projectforge-business/src/main/resources/I18nResources_de.properties @@ -2070,9 +2070,12 @@ plugins.teamcal.title.list=Kalenderliste poll=Umfrage poll.access=Zugriff poll.Annotations=Anmerkungen -poll.annotations.description=Im Anmerkungsfeld kannst du Informationen hinzufügen, die deiner Meinung nach in den Antworten nicht klar definiert wurden, oder wenn du wichtige Informationen wie zum Beispiel Allergien hinzufügen möchtest. poll.answer=Auswahlmöglichkeit poll.assignment=Zuordnung +poll.headline.userConfiguration=Nutzer:innen Verwaltung +poll.headline.mailConfiguration=E-Mail Einstellungen +poll.headline.questionConfiguration=Hinzufügen von Fragen +poll.headline.generalConfiguration=Allgemeine Einstellungen poll.attendee=Teilnehmer:in poll.attendees=Teilnehmer:innen poll.attendees.tooltip=Teilnehmer:innen können nur abstimmen. @@ -2095,13 +2098,14 @@ poll.email-content-tooltip=Du kannst den Inhalt der E-Mail individuell gestalten poll.email-subject-field=Email Titel poll.email-subject-tooltip= Hier kannst du den Betreff der E-Mail selbst angeben. Verwende {0}, um den Titel der Umfrage einzufügen, und {1}, um das automatische Enddatum der Umfrage einzusetzen poll.error.cantremoveyourself=Du kannst dich nicht selbst als Full Access User entfernen. Bitte einen anderen Full Access User oder den/die Ersteller:in dieser Umfrage dies für dich zu tun. -poll.error.oneAttendeRequired=Bitte füge mindestens eine:n Teilnehmer:in hinzu. +poll.error.oneAttendeeRequired=Bitte füge mindestens eine:n Teilnehmer:in hinzu. poll.error.oneQuestionRequired=Mindestens eine Frage ist erforderlich. +poll.error.ownerRequired=Es wurde kein/e Ersteller:in der Umfrage hinterlegt. Wende dich an einen Admin. poll.exception.noAttendee=Diese:r Nutzer:in ist nicht Teil der Umfrage. poll.export.response.poll=Ergebnisse exportieren poll.finished=Beendet poll.fullAccessGroups=Gruppen mit Vollzugriff -poll.fullAccessgroups.tooltip=Als Gruppen sind z.B. die BU's, das MUK-Team oder auch das Marketing-Team hinterlegt. Personen mit Vollzugriff können die Umfrage vorzeitig beenden,\ +poll.fullAccessGroups.tooltip=Als Gruppen sind z.B. die BU's, das MUK-Team oder auch das Marketing-Team hinterlegt. Personen mit Vollzugriff können die Umfrage vorzeitig beenden,\ \ die Excel-Ergebnisse einsehen oder auch Nutzer:innen hinzufügen. Wenn diese Personen abstimmen sollen, musst du sie noch als Teilnehmer:innen hinzufügen. poll.fullAccessUser.tooltip=Vollzugriffsbenutzer:innen haben die Möglichkeit, die Umfrage zu schließen, die Excel-Ergebnisse anzusehen und Personen hinzuzufügen oder zu entfernen (sie können sich selbst nicht entfernen). Sie werden nicht als Teilnehmer:in gezählt.\ Wenn diese Personen auch abstimmen sollen, müssen sie zusätzlich als Teilnehmer:innen registriert werden. @@ -2156,27 +2160,22 @@ poll.manual.singleResponse=Eine Frage, bei der man nur eine Antwortmöglichtkeit poll.manual.textQuestion=Eine Frage, die mit einem Freitext beantwortet werden soll. Gut geeignet für formloses Feedback. poll.manual.title=Anleitung, um eine Umfrage zu erstellen | Als Erstes muss man den poll.other=Andere -poll.owner=Ersteller +poll.owner=Ersteller:in poll.popup.closed=Umfrage wurde bereits beendet poll.premade.template=Vorlage hinzufügen poll.premadeQuestion.tooltip=In diesem Menü findest du häufig verwendete Vorlagen, die dir dabei helfen, deine Umfrage schnell zu erstellen. Falls Fragen in der Vorlage fehlen, kannst du sie auch hinzufügen. \ Außerdem hast du die Möglichkeit, Fragen zu überarbeiten oder zu korrigieren, wenn sie in der Vorlage nicht auf deine Situtation zutreffen. poll.question=Frage poll.question.multi=Frage -poll.question.MultiResponseQuestion=Mehrfachauswahlfrage -poll.question.multititle= Mehr Antwort Frage +poll.question.multiResponseQuestionTitle=Frage mit Mehrfachantwort poll.question.single=Frage -poll.question.SingleResponseQuestion=Einfachauswahlfrage -poll.question.singletitel= Einzel Antwort Frage +poll.question.singleResponseQuestionTitle=Frage mit Einzelantwort poll.question.text=Eingabe poll.question.TextQuestion=Antwort -poll.question.texttitle= Text Frage +poll.question.textQuestionTitle=Frage mit Textantwort poll.questionTemplate=Vorlagen poll.questionType=Fragetypen -poll.questionType.PollMultiResponseQuestion=Mehrfach Antwort Frage -poll.questionType.PollSingleResponseQuestion=Einzel Antwort Frage -poll.questionType.PollTextQuestion=Text Frage -poll.questionType.tooltip=Fragetypen bieten verschiedene Möglichkeiten für Fragen, darunter Einzelantwortfragen, Mehrfachantwortfragen und Textfragen. Du kannst sie einfach hinzufügen, \ +poll.questionType.tooltip=Die Fragetypen bieten verschiedene Möglichkeiten: Fragen mit Einzelantwort, Mehrfachantwort und Textfragen. Du kannst sie einfach hinzufügen, \ falls eine Frage in der Vorlage fehlt oder wenn du deine eigene Umfrage erstellen möchtest, ohne eine Vorlage zu verwenden. poll.respond=Antworten abschicken poll.response.mail.update.content=

Lieber {0},

\ @@ -2197,7 +2196,7 @@ poll.templateTypeSommerfest=Sommerfest poll.templateTypeTeamessen=Teamessen poll.title=Titel poll.title.add=Neue Umfrage erstellen -poll.title.edit=Umfrage bearbeiten +poll.title.edit=Umfrage administrieren poll.title.list=Umfragen poll.userDelegation=Für andere Nutzer abstimmen poll.yourAnswers=Deine Antworten diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollInfoPageRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollInfoPageRest.kt index 6c476f5763..715e569913 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollInfoPageRest.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollInfoPageRest.kt @@ -79,7 +79,7 @@ class PollInfoPageRest : AbstractDynamicPageRest() { layout.add(field) layout.add( - UIFieldset().add(UILabel(translate("poll.question.singletitel"))).add( + UIFieldset().add(UILabel(translate("poll.question.singleResponseQuestionTitle"))).add( UICol() .add( UIReadOnlyField( @@ -91,7 +91,7 @@ class PollInfoPageRest : AbstractDynamicPageRest() { ) ) layout.add( - UIFieldset().add(UILabel(translate("poll.question.multititle"))).add( + UIFieldset().add(UILabel(translate("poll.question.multiResponseQuestionTitle"))).add( UICol() .add( UIReadOnlyField( @@ -103,7 +103,7 @@ class PollInfoPageRest : AbstractDynamicPageRest() { ) ) layout.add( - UIFieldset().add(UILabel(translate("poll.question.texttitle"))).add( + UIFieldset().add(UILabel(translate("poll.question.textQuestionTitle"))).add( UICol() .add( UIReadOnlyField( diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt index 8bf5e3fb82..203b4a7f89 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt @@ -185,7 +185,7 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. val layout = super.createEditLayout(dto, userAccess) val fieldset = UIFieldset(UILength(12)) layout.add(fieldset) - if (/*dto.isFinished()*/ dto.isAlreadyCreated()) { + if (dto.isAlreadyCreated()) { layout.add( MenuItem( "export-poll-response-button", @@ -216,6 +216,9 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. val colWidth = UILength(xs = 12, sm = 12, md = 6, lg = 6) fieldset + .add(UISpacer(width = 100)) + .add(UISpacer(width = 100)) + .add(UILabel("poll.headline.userConfiguration")) .add( UIRow() .add( @@ -238,7 +241,7 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. "fullAccessGroups", true, "poll.fullAccessGroups", - tooltip = "poll.fullAccessgroups.tooltip" + tooltip = "poll.fullAccessGroups.tooltip" ) ) ) @@ -274,6 +277,28 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. if (!dto.isAlreadyCreated()) { fieldset + .add(UISpacer(width = 100)) + .add(UISpacer(width = 100)) + .add(UILabel("poll.headline.mailConfiguration")) + .add( + UIInput( + "customemailsubject", + required = false, + label = "poll.email-subject-field", + tooltip = "poll.email-subject-tooltip" + ) + ) + .add( + UITextArea( + "customemailcontent", + label = "poll.email-content-field", + tooltip = "poll.email-content-tooltip", + rows = 12, + maxRows = 60 + ) + ) + .add(UISpacer(width = 100)) + .add(UILabel("poll.headline.questionConfiguration")) .add( UIRow() .add( @@ -332,48 +357,6 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. ) ) ) - .add( - UIRow() - .add( - UICol(colWidth) - .add( - UIInput( - "customemailsubject", - required = false, - label = "poll.email-subject-field", - tooltip = "poll.email-subject-tooltip" - ) - ) - ) - .add( - UICol(colWidth) - .add( - UISpacer() - ) - ) - ) - .add( - UIRow() - .add( - UICol(colWidth) - .add( - UITextArea( - "customemailcontent", - label = "poll.email-content-field", - tooltip = "poll.email-content-tooltip", - rows = 12, - maxRows = 60 - ) - ) - ) - .add( - UICol(colWidth) - .add( - UISpacer() - ) - ) - ) - } @@ -505,13 +488,16 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. if (obj.inputFields.isNullOrEmpty() || obj.inputFields.equals("[]")) { throw AccessException("poll.error.oneQuestionRequired") } + + if(obj.owner == null) { + throw AccessException("poll.error.ownerRequired") + } if (obj.attendeeIds.isNullOrEmpty() || obj.attendeeIds.equals("[]")) { - throw AccessException("poll.error.oneAttendeRequired") + throw AccessException("poll.error.oneAttendeeRequired") } postData.data.customemailcontent = postData.data.customemailcontent?.replace("\n", "
") - super.onBeforeSaveOrUpdate(request, obj, postData) } @@ -898,33 +884,25 @@ class PollPageRest : AbstractDTOPagesRest(PollDao::class. val colWidth = UILength(xs = 12, sm = 12, md = 6, lg = 6) if (isRunning) { fieldset - .add(lc, "title", "description", "location") + .add(UILabel("poll.headline.generalConfiguration")) + .add(lc, "title", "description") .add( UIRow() .add( UICol(colWidth) - .add( - UISelect.createUserSelect( - lc, - "owner", - false, - "poll.owner", - ) - ) - ) - .add( + .add(lc, "deadline",) + ).add( UICol(colWidth) - .add( - lc, - "deadline", - ) + .add(lc, "location") ) + ) + } else { fieldset + .add(UILabel("poll.headline.generalConfiguration")) .add(UIReadOnlyField(value = pollDto.title, label = "title", dataType = UIDataType.STRING)) .add(UIReadOnlyField(value = pollDto.description, label = "description", dataType = UIDataType.STRING)) - .add(UIReadOnlyField(value = pollDto.location, label = "location", dataType = UIDataType.STRING)) .add( UIReadOnlyField( value = pollDto.deadline.toString(), diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollResponsePageRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollResponsePageRest.kt index 9a0e840f53..603e635a18 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollResponsePageRest.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollResponsePageRest.kt @@ -212,14 +212,6 @@ class PollResponsePageRest : AbstractDynamicPageRest() { ) } } - col.add( - UITextArea( - "responses[$index].annotation[0]", - label = "poll.Annotations", - additionalLabel = "poll.annotations.description" - ) - ) - } fieldSetQuestions.add(UIRow().add(col)) diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/excel/ExcelExport.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/excel/ExcelExport.kt index 349041e4bd..1e7c6c54e9 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/excel/ExcelExport.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/excel/ExcelExport.kt @@ -142,10 +142,6 @@ class ExcelExport { poll.inputFields?.forEach { question -> val answers = question.answers if (question.type == BaseType.PollMultiResponseQuestion || question.type == BaseType.PollSingleResponseQuestion) { - if (!question.answers!!.contains("Anmerkung")) { - val ind = question.answers!!.size - question.answers!!.add(ind, "Anmerkung") - } var counter = merge question.answers?.forEach { answer -> excelRow1.getCell(counter).setCellValue(answer) @@ -182,38 +178,29 @@ class ExcelExport { var largestAnswer = "" poll.inputFields?.forEachIndexed { _, question -> - val questionpossibilities = res?.responses?.find { it.questionUid == question.uid } + val choices = res?.responses?.find { it.questionUid == question.uid } var index: Int question.answers?.forEachIndexed { ind, answer -> index = question.answers!!.size - 1 cell++ - if (question.type == BaseType.PollMultiResponseQuestion || question.type == BaseType.PollSingleResponseQuestion) { - if (index == ind && questionpossibilities != null) { - excelSheet.autosize(cell) - if (questionpossibilities.annotation != null && questionpossibilities.annotation!!.size != 0) { - excelRow.getCell(cell).setCellValue(questionpossibilities.annotation?.get(0)) - } - } - } - if (question.type == BaseType.PollMultiResponseQuestion) { - questionpossibilities?.answers?.forEach { + choices?.answers?.forEach { excelSheet.autosize(cell) - if (questionpossibilities.answers?.get(ind)!!.equals(true) && ind != index) { + if (choices.answers?.get(ind)!!.equals(true) && ind != index) { excelRow.getCell(cell).setCellValue("X") } } } else if (question.type == BaseType.PollSingleResponseQuestion) { excelSheet.autosize(cell) - if (answer == questionpossibilities?.answers?.get(0) && ind != index) { + if (answer == choices?.answers?.get(0) && ind != index) { excelRow.getCell(cell).setCellValue("X") } } else { - if (questionpossibilities?.answers?.isNotEmpty() == true) { + if (choices?.answers?.isNotEmpty() == true) { excelSheet.autosize(cell) - excelRow.getCell(cell).setCellValue(questionpossibilities.answers?.get(0).toString()) + excelRow.getCell(cell).setCellValue(choices.answers?.get(0).toString()) if (countLines(answer) > countLines(largestAnswer)) { largestAnswer = answer } diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PollResponse.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PollResponse.kt index 36e83eab2f..aa274f571d 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PollResponse.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PollResponse.kt @@ -53,8 +53,6 @@ class QuestionAnswer { var uid: String? = null var questionUid: String? = "" var answers: MutableList? = mutableListOf() - var annotation: MutableList? = mutableListOf() - fun toObject(string: String): QuestionAnswer { return ObjectMapper().readValue(string, QuestionAnswer::class.java) diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PremadeQuestions.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/TemplateQuestionConfiguration.kt similarity index 80% rename from projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PremadeQuestions.kt rename to projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/TemplateQuestionConfiguration.kt index 9c6e11ffbd..80d203952b 100644 --- a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/PremadeQuestions.kt +++ b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/types/TemplateQuestionConfiguration.kt @@ -25,38 +25,31 @@ package org.projectforge.rest.poll.types import java.util.UUID - val Neujahrsfeier = mapOf( + "CAN_HAVE_COMPANIONS" to Question( + uid = UUID.randomUUID().toString(), + question = "Erscheinst du in Begleitung?", + type = BaseType.PollSingleResponseQuestion, + answers = mutableListOf("Ohne Begleitung", "Mit Begleitung") + ), "HAS_FOOD" to Question( uid = UUID.randomUUID().toString(), - question = "Was willst du essen?", + question = "Gibt es Essenspräferenzen für die Party?", type = BaseType.PollSingleResponseQuestion, - answers = mutableListOf("Fleisch", "Vegetarisch", "Vegan") + answers = mutableListOf("Vegetarisch", "Vegan", "Pescetarier (Fisch)", "Omnivor (Fleisch)") ), - "CAN_HAVE_COMPANIONS" to Question( + "SONG_REQUESTs" to Question( uid = UUID.randomUUID().toString(), - question = "Nimmst du eine Begleitung mit? (Name der Begleitung)", + question = "Hast du Musikwünsche für die Party?", type = BaseType.PollTextQuestion, answers = mutableListOf("") ), - "CAN_HAVE_CHILDREN" to Question( + "USER_COMMENT" to Question( uid = UUID.randomUUID().toString(), - question = "Nimmst du ein Kind mit? (Name des Kindes)", + question = "Hast du weitere Anmerkungen und/oder Wünsche?", type = BaseType.PollTextQuestion, answers = mutableListOf("") - ), - "CAN_STAY_OVERNIGHT" to Question( - uid = UUID.randomUUID().toString(), - question = "Willst du dort übernachten?", - type = BaseType.PollSingleResponseQuestion, - answers = mutableListOf("Ja", "Nein") - ), - "HAS_BREAKFAST" to Question( - uid = UUID.randomUUID().toString(), - question = "Willst du am nächsten Tag frühstücken?", - type = BaseType.PollSingleResponseQuestion, - answers = mutableListOf("Ja", "Nein") - ), + ) ) val Sommerfest = mapOf( @@ -101,19 +94,25 @@ val Sommerfest = mapOf( question = "Welche Art von Ernährung bevorzugst du ?", type = BaseType.PollSingleResponseQuestion, answers = mutableListOf("Omnivor (Fleisch)", "Pescetarier (Fisch)", "Vegetarisch", "Vegan") + ), + "USER_COMMENT" to Question( + uid = UUID.randomUUID().toString(), + question = "Hast du weitere Anmerkungen und/oder Wünsche?", + type = BaseType.PollTextQuestion, + answers = mutableListOf("") ) ) val Teamessen = mapOf( "IS_IN" to Question( uid = UUID.randomUUID().toString(), - question = "Hast du Zeit und Lust ?", + question = "Nimmst du am gemeinsamen Team-Essen teil?", type = BaseType.PollSingleResponseQuestion, answers = mutableListOf("Ja", "Nein") ), "WHAT_TO_EAT" to Question( uid = UUID.randomUUID().toString(), - question = "Zur Essens Auswahl gibt es", + question = "Folgende Speisen stehen zur Auswahl. Was möchtest du essen?", type = BaseType.PollSingleResponseQuestion, answers = mutableListOf("Pizza", "Pasta", "Burger") ), @@ -123,4 +122,10 @@ val Teamessen = mapOf( type = BaseType.PollMultiResponseQuestion, answers = mutableListOf("", "") ), + "USER_COMMENT" to Question( + uid = UUID.randomUUID().toString(), + question = "Hast du weitere Anmerkungen und/oder Wünsche?", + type = BaseType.PollTextQuestion, + answers = mutableListOf("") + ) )