Merge pull request #257 from hpi-swa-teaching/feature/prio_vote

prio feature fertig nach 3 wochen
hpi-swa-teaching · Jun 23, 2024 · 6b60fd0 · 6b60fd0
2 parents 8a99adf + 2ded1e2
commit 6b60fd0
Show file tree

Hide file tree

Showing 208 changed files with 593 additions and 239 deletions.
diff --git a/docs/class-diagram.wsd b/docs/class-diagram.wsd
@@ -69,26 +69,26 @@ package Core {
     LQPoll "1" <- "*" LQAnswerSet
     LQAnswerSet "1" <- "*" LQAnswer
     interface LQAnswer
-    class LQChoicesAnswer {
+    class LQAnswer {
         votedChoice
     }
-    LQAnswer <|-- LQChoicesAnswer
+    LQAnswer <|-- LQAnswer
 
     interface LQQuestion {
         choiceList
     }
     ' I chose * instead of 1 bcLdatastructure is there'
     LQPollDraft "1" <- "*" LQQuestion
-    class LQChoicesQuestion  {
+    class LQMultiChoiceQuestion  {
         maxNumberOfChoices
     }
-    LQQuestion <|-- LQChoicesQuestion
+    LQQuestion <|-- LQMultiChoiceQuestion
     LQAnswer "*" -- "1" LQQuestion
     class LQChoice {
       description
       excludedGroups
     }
-    LQChoicesQuestion "1" -> "*" LQChoice
+    LQMultiChoiceQuestion "1" -> "*" LQChoice
     class LQUser {
       id
       name
@@ -137,12 +137,12 @@ package UI {
     class LQPollDraftBuilder {
         runPoll()
     }
-    class LQQuestionBuilder{
+    class LQMultiChoiceQuestionBuilder{
 
       }
-    LQPollDraftBuilder "1" <- "*" LQQuestionBuilder
+    LQPollDraftBuilder "1" <- "*" LQMultiChoiceQuestionBuilder
     LQPollDraftBuilder --|> LQModel
-    LQQuestionBuilder --|> LQModel
+    LQMultiChoiceQuestionBuilder --|> LQModel
 
     LQStartMenu -- LQHostMenu
     LQStartMenu -- LQParticipantMenu

diff --git a/packages/Liquid-Core.package/LQAnswer.class/README.md b/packages/Liquid-Core.package/LQAnswer.class/README.md
@@ -0,0 +1,3 @@
+Answers belonging currently all Questions have this type. However, this might be later split up into different question modes.
+Notable Instance Variables:
+- choicesRanking: An OrderedCollection of all the choices the participant voted.
diff --git a/....class/class/newWithQuestion.andVotes..st → ....class/class/newWithQuestion.andVotes..st b/....class/class/newWithQuestion.andVotes..st → ....class/class/newWithQuestion.andVotes..st
@@ -1,7 +1,7 @@
 class initialization
 newWithQuestion: aQuestion andVotes: anOrderedCollection
 
-	^ LQChoicesAnswer new
+	^ LQAnswer new
 			questionId: aQuestion id;
-			votedChoiceList: (anOrderedCollection collect: [:each | each description]) ;
+			choicesRanking: (anOrderedCollection collect: [:each | each description]) ;
 			yourself
diff --git a/packages/Liquid-Core.package/LQAnswer.class/instance/choicesRanking..st b/packages/Liquid-Core.package/LQAnswer.class/instance/choicesRanking..st
@@ -0,0 +1,4 @@
+accessing
+choicesRanking: aChoiceList
+
+	choicesRanking := aChoiceList
diff --git a/packages/Liquid-Core.package/LQAnswer.class/instance/choicesRanking.st b/packages/Liquid-Core.package/LQAnswer.class/instance/choicesRanking.st
@@ -0,0 +1,4 @@
+accessing
+choicesRanking
+
+	^ choicesRanking
diff --git a/packages/Liquid-Core.package/LQAnswer.class/instance/containsVoteForChoice..st b/packages/Liquid-Core.package/LQAnswer.class/instance/containsVoteForChoice..st
@@ -0,0 +1,4 @@
+evaluation
+containsVoteForChoice: aChoice
+
+	^ self choicesRanking includes: aChoice description
diff --git a/...age/LQChoicesAnswer.class/instance/id..st → ...re.package/LQAnswer.class/instance/id..st b/...age/LQChoicesAnswer.class/instance/id..st → ...re.package/LQAnswer.class/instance/id..st
diff --git a/...kage/LQChoicesAnswer.class/instance/id.st → ...ore.package/LQAnswer.class/instance/id.st b/...kage/LQChoicesAnswer.class/instance/id.st → ...ore.package/LQAnswer.class/instance/id.st
diff --git a/...hoicesAnswer.class/instance/initialize.st → ...age/LQAnswer.class/instance/initialize.st b/...hoicesAnswer.class/instance/initialize.st → ...age/LQAnswer.class/instance/initialize.st
@@ -3,4 +3,4 @@ initialize
 
 	super initialize.
 	self id: UUID new asString.
-	self votedChoiceList: OrderedCollection new
+	self choicesRanking: OrderedCollection new
diff --git a/packages/Liquid-Core.package/LQAnswer.class/instance/printDataOn..st b/packages/Liquid-Core.package/LQAnswer.class/instance/printDataOn..st
@@ -0,0 +1,12 @@
+printing
+printDataOn: aStream
+
+	self choicesRanking ifEmpty: [^ self].
+	self choicesRanking
+		collect: [:votedChoice |
+			aStream nextPutAll: votedChoice.
+			aStream nextPutAll: ':']
+		from: 1
+		to: self choicesRanking size - 1.
+
+	aStream nextPutAll: self choicesRanking last	
diff --git a/...oicesAnswer.class/instance/questionId..st → ...ge/LQAnswer.class/instance/questionId..st b/...oicesAnswer.class/instance/questionId..st → ...ge/LQAnswer.class/instance/questionId..st
diff --git a/...hoicesAnswer.class/instance/questionId.st → ...age/LQAnswer.class/instance/questionId.st b/...hoicesAnswer.class/instance/questionId.st → ...age/LQAnswer.class/instance/questionId.st
diff --git a/packages/Liquid-Core.package/LQAnswer.class/methodProperties.json b/packages/Liquid-Core.package/LQAnswer.class/methodProperties.json
@@ -0,0 +1,13 @@
+{
+	"class" : {
+		"newWithQuestion:andVotes:" : "Anton Eichstädt 6/5/2024 17:28" },
+	"instance" : {
+		"choicesRanking" : "Anton Eichstädt 5/24/2024 15:23",
+		"choicesRanking:" : "Anton Eichstädt 5/24/2024 15:24",
+		"containsVoteForChoice:" : "Anton Eichstädt 5/24/2024 15:23",
+		"id" : "JT 8/2/2022 16:59",
+		"id:" : "JT 8/2/2022 16:59",
+		"initialize" : "Anton Eichstädt 5/24/2024 15:24",
+		"printDataOn:" : "Anton Eichstädt 5/24/2024 15:23",
+		"questionId" : "JT 8/2/2022 17:01",
+		"questionId:" : "JT 8/2/2022 17:01" } }
diff --git a/...age/LQChoicesAnswer.class/properties.json → ...re.package/LQAnswer.class/properties.json b/...age/LQChoicesAnswer.class/properties.json → ...re.package/LQAnswer.class/properties.json
@@ -4,12 +4,12 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "bwe 8/5/2022 15:11",
+	"commentStamp" : "Anton Eichstädt 6/5/2024 17:29",
 	"instvars" : [
 		"id",
 		"questionId",
-		"votedChoiceList" ],
-	"name" : "LQChoicesAnswer",
+		"choicesRanking" ],
+	"name" : "LQAnswer",
 	"pools" : [
 		 ],
 	"super" : "Object",

diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/README.md b/packages/Liquid-Core.package/LQChoicesAnswer.class/README.md
diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/containsVoteForChoice..st b/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/containsVoteForChoice..st
diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/printDataOn..st b/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/printDataOn..st
diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/votedChoiceList..st b/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/votedChoiceList..st
diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/votedChoiceList.st b/packages/Liquid-Core.package/LQChoicesAnswer.class/instance/votedChoiceList.st
diff --git a/packages/Liquid-Core.package/LQChoicesAnswer.class/methodProperties.json b/packages/Liquid-Core.package/LQChoicesAnswer.class/methodProperties.json
diff --git a/...package/LQChoicesQuestion.class/README.md → ...age/LQMultiChoiceQuestion.class/README.md b/...package/LQChoicesQuestion.class/README.md → ...age/LQMultiChoiceQuestion.class/README.md
@@ -1,4 +1,4 @@
-A specific type of LQQuestion for Single- and Multiple-Choice-Questions. A LQChoicesQuestion contains a number of choices as well as the maximum number of choices one participant can choose when answering the question.
+A specific type of LQQuestion for Single- and Multiple-Choice-Questions. A LQMultiChoiceQuestion contains a number of choices as well as the maximum number of choices one participant can choose when answering the question.
 
 Notable Instance Variables:
 - choiceList: An OrderedCollection of Strings containing the Choices participants are presented.

diff --git a/...icesQuestion.class/instance/addChoice..st → ...oiceQuestion.class/instance/addChoice..st b/...icesQuestion.class/instance/addChoice..st → ...oiceQuestion.class/instance/addChoice..st
diff --git a/...hoicesQuestion.class/instance/asString.st → ...ChoiceQuestion.class/instance/asString.st b/...hoicesQuestion.class/instance/asString.st → ...ChoiceQuestion.class/instance/asString.st
diff --git a/...estion.class/instance/buildEmptyAnswer.st → ...estion.class/instance/buildEmptyAnswer.st b/...estion.class/instance/buildEmptyAnswer.st → ...estion.class/instance/buildEmptyAnswer.st
@@ -1,4 +1,4 @@
 initialize-release
 buildEmptyAnswer
 
-	^ LQChoicesAnswer new
+	^ LQAnswer new
diff --git a/...tion.class/instance/choiceDescriptions.st → ...tion.class/instance/choiceDescriptions.st b/...tion.class/instance/choiceDescriptions.st → ...tion.class/instance/choiceDescriptions.st
diff --git a/...cesQuestion.class/instance/choiceList..st → ...iceQuestion.class/instance/choiceList..st b/...cesQuestion.class/instance/choiceList..st → ...iceQuestion.class/instance/choiceList..st
diff --git a/...icesQuestion.class/instance/choiceList.st → ...oiceQuestion.class/instance/choiceList.st b/...icesQuestion.class/instance/choiceList.st → ...oiceQuestion.class/instance/choiceList.st
diff --git a/...e/LQChoicesQuestion.class/instance/id..st → ...MultiChoiceQuestion.class/instance/id..st b/...e/LQChoicesQuestion.class/instance/id..st → ...MultiChoiceQuestion.class/instance/id..st
diff --git a/...ge/LQChoicesQuestion.class/instance/id.st → ...QMultiChoiceQuestion.class/instance/id.st b/...ge/LQChoicesQuestion.class/instance/id.st → ...QMultiChoiceQuestion.class/instance/id.st
diff --git a/...icesQuestion.class/instance/initialize.st → ...oiceQuestion.class/instance/initialize.st b/...icesQuestion.class/instance/initialize.st → ...oiceQuestion.class/instance/initialize.st
diff --git a/...lass/instance/isVotedChoice.ValidFrom..st → ...lass/instance/isVotedChoice.ValidFrom..st b/...lass/instance/isVotedChoice.ValidFrom..st → ...lass/instance/isVotedChoice.ValidFrom..st
diff --git a/...ion.class/instance/maxNumberOfChoices..st → ...ion.class/instance/maxNumberOfChoices..st b/...ion.class/instance/maxNumberOfChoices..st → ...ion.class/instance/maxNumberOfChoices..st
diff --git a/...tion.class/instance/maxNumberOfChoices.st → ...tion.class/instance/maxNumberOfChoices.st b/...tion.class/instance/maxNumberOfChoices.st → ...tion.class/instance/maxNumberOfChoices.st
diff --git a/...QChoicesQuestion.class/instance/title..st → ...tiChoiceQuestion.class/instance/title..st b/...QChoicesQuestion.class/instance/title..st → ...tiChoiceQuestion.class/instance/title..st
diff --git a/...LQChoicesQuestion.class/instance/title.st → ...ltiChoiceQuestion.class/instance/title.st b/...LQChoicesQuestion.class/instance/title.st → ...ltiChoiceQuestion.class/instance/title.st
diff --git a/...ChoicesQuestion.class/instance/toolTip.st → ...iChoiceQuestion.class/instance/toolTip.st b/...ChoicesQuestion.class/instance/toolTip.st → ...iChoiceQuestion.class/instance/toolTip.st
diff --git a/packages/Liquid-Core.package/LQMultiChoiceQuestion.class/instance/type.st b/packages/Liquid-Core.package/LQMultiChoiceQuestion.class/instance/type.st
@@ -0,0 +1,4 @@
+accessing
+type
+
+	^ 'multiChoice'
diff --git a/...oicesQuestion.class/methodProperties.json → ...hoiceQuestion.class/methodProperties.json b/...oicesQuestion.class/methodProperties.json → ...hoiceQuestion.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"addChoice:" : "bwe 6/5/2022 22:20",
 		"asString" : "JT 8/2/2022 17:01",
-		"buildEmptyAnswer" : "CG 7/30/2021 19:06",
+		"buildEmptyAnswer" : "Anton Eichstädt 6/5/2024 17:28",
 		"choiceDescriptions" : "kge 8/1/2022 18:51",
 		"choiceList" : "JT 8/2/2022 17:01",
 		"choiceList:" : "CG 7/30/2021 19:06",
@@ -17,4 +17,4 @@
 		"title" : "JT 8/2/2022 17:02",
 		"title:" : "JT 8/2/2022 17:02",
 		"toolTip" : "bn 5/12/2022 22:11",
-		"type" : "CG 7/30/2021 19:06" } }
+		"type" : "Anton Eichstädt 6/5/2024 17:37" } }
diff --git a/...e/LQChoicesQuestion.class/properties.json → ...MultiChoiceQuestion.class/properties.json b/...e/LQChoicesQuestion.class/properties.json → ...MultiChoiceQuestion.class/properties.json
@@ -10,7 +10,7 @@
 		"title",
 		"maxNumberOfChoices",
 		"choiceList" ],
-	"name" : "LQChoicesQuestion",
+	"name" : "LQMultiChoiceQuestion",
 	"pools" : [
 		 ],
 	"super" : "Object",

diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/README.md b/packages/Liquid-Core.package/LQPriorityQuestion.class/README.md
@@ -0,0 +1,4 @@
+A specific type of LQQuestion for Prioritisation-Questions. A LQPrioQuestion contains the choices the participant has to rank 
+
+Notable Instance Variables:
+- choiceList: An OrderedCollection of Strings containing the Choices participants are presented.
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/addChoice..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/addChoice..st
@@ -0,0 +1,4 @@
+modifying
+addChoice: aChoice
+
+	self choiceList add: aChoice.
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/asString.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/asString.st
@@ -0,0 +1,5 @@
+converting
+asString
+
+	self title ifNil: [^ 'Untitled Question'].
+	^ self title 
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/buildEmptyAnswer.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/buildEmptyAnswer.st
@@ -0,0 +1,4 @@
+initialize-release
+buildEmptyAnswer
+
+	^ LQAnswer new
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceDescriptions.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceDescriptions.st
@@ -0,0 +1,4 @@
+accessing
+choiceDescriptions
+
+	^ self choiceList collect: [:choice | choice description]
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceList..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceList..st
@@ -0,0 +1,4 @@
+accessing
+choiceList: aListOfChoices
+
+	choiceList := aListOfChoices
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceList.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/choiceList.st
@@ -0,0 +1,4 @@
+accessing
+choiceList
+
+	^ choiceList
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/id..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/id..st
@@ -0,0 +1,4 @@
+accessing
+id: aString
+
+	id := aString
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/id.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/id.st
@@ -0,0 +1,4 @@
+accessing
+id
+
+	^ id
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/initialize.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/initialize.st
@@ -0,0 +1,7 @@
+initialize-release
+initialize
+
+	super initialize.
+	self id: UUID new asString.
+	self choiceList: OrderedCollection new.
+	self numberOfChoices: (self choiceList size).
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/isVotedChoice.ValidFrom..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/isVotedChoice.ValidFrom..st
@@ -0,0 +1,4 @@
+accessing
+isVotedChoice: votedChoice ValidFrom: aUser
+
+	^ self choiceList noneSatisfy: [:choice | (choice description = votedChoice) and: [choice excludesGroup: aUser group]]
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/maxNumberOfChoices.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/maxNumberOfChoices.st
@@ -0,0 +1,3 @@
+accessing
+maxNumberOfChoices
+	^ self choiceList size
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/numberOfChoices..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/numberOfChoices..st
@@ -0,0 +1,3 @@
+accessing
+numberOfChoices: anObject
+	numberOfChoices := anObject
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/numberOfChoices.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/numberOfChoices.st
@@ -0,0 +1,3 @@
+accessing
+numberOfChoices
+	^ numberOfChoices
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/title..st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/title..st
@@ -0,0 +1,4 @@
+accessing
+title: aString
+
+	title := aString
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/title.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/title.st
@@ -0,0 +1,4 @@
+accessing
+title
+
+	^ title
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/toolTip.st b/packages/Liquid-Core.package/LQPriorityQuestion.class/instance/toolTip.st
@@ -0,0 +1,4 @@
+accessing
+toolTip
+
+	^ 'Give these options a ranking by clicking them in your favorite order! 1 should be the one you like most.'
diff --git a/.../LQChoicesQuestion.class/instance/type.st → ...LQPriorityQuestion.class/instance/type.st b/.../LQChoicesQuestion.class/instance/type.st → ...LQPriorityQuestion.class/instance/type.st
@@ -1,4 +1,4 @@
 accessing
 type
 
-	^ 'choices'
+	^ 'priority'
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/methodProperties.json b/packages/Liquid-Core.package/LQPriorityQuestion.class/methodProperties.json
@@ -0,0 +1,21 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"addChoice:" : "Anton Eichstädt 6/5/2024 11:46",
+		"asString" : "JT 8/2/2022 17:01",
+		"buildEmptyAnswer" : "Anton Eichstädt 6/5/2024 17:40",
+		"choiceDescriptions" : "kge 8/1/2022 18:51",
+		"choiceList" : "JT 8/2/2022 17:01",
+		"choiceList:" : "Anton Eichstädt 6/5/2024 11:46",
+		"id" : "JT 8/2/2022 17:01",
+		"id:" : "JT 8/2/2022 17:01",
+		"initialize" : "Anton Eichstädt 6/4/2024 11:28",
+		"isVotedChoice:ValidFrom:" : "ms 8/4/2022 21:31",
+		"maxNumberOfChoices" : "Anton Eichstädt 6/5/2024 11:33",
+		"numberOfChoices" : "Anton Eichstädt 6/4/2024 11:21",
+		"numberOfChoices:" : "Anton Eichstädt 6/4/2024 11:21",
+		"title" : "JT 8/2/2022 17:02",
+		"title:" : "JT 8/2/2022 17:02",
+		"toolTip" : "Anton Eichstädt 5/24/2024 15:15",
+		"type" : "Anton Eichstädt 5/24/2024 15:11" } }
diff --git a/packages/Liquid-Core.package/LQPriorityQuestion.class/properties.json b/packages/Liquid-Core.package/LQPriorityQuestion.class/properties.json
@@ -0,0 +1,17 @@
+{
+	"category" : "Liquid-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "Anton Eichstädt 5/24/2024 15:19",
+	"instvars" : [
+		"id",
+		"title",
+		"choiceList",
+		"numberOfChoices" ],
+	"name" : "LQPriorityQuestion",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }
diff --git a/packages/Liquid-Network.package/LQAntiCheat.class/instance/isAnswer.From.ValidFor.In..st b/packages/Liquid-Network.package/LQAntiCheat.class/instance/isAnswer.From.ValidFor.In..st
@@ -4,5 +4,5 @@ isAnswer: answer From: aUser ValidFor: questionID In: aPoll
 	| question |
 
 	question := (aPoll questionList select: [:q | q id = questionID]) first.
-	^ answer votedChoiceList allSatisfy: [:votedChoice |
+	^ answer choicesRanking allSatisfy: [:votedChoice |
 			question isVotedChoice: votedChoice ValidFrom: aUser]
diff --git a/packages/Liquid-Tests.package/LQAnswerPanelTests.class/instance/testToolTip.st b/packages/Liquid-Tests.package/LQAnswerPanelTests.class/instance/testToolTip.st
@@ -1,4 +1,4 @@
 testing
 testToolTip
 
-	self testToolTipWith: LQChoicesQuestion new
+	self testToolTipWith: LQMultiChoiceQuestion new