Merge pull request #282 from hpi-swa-teaching/develop

Final release 2024

.smalltalk.ston

@@ -14,7 +14,7 @@ SmalltalkCISpec {
       #packages : [ #Liquid-Core, #Liquid-Network, #Liquid-UI ]
     },
     #exclude : {
-      #classes : [ #LQLintTests,  #LQToolbuilderTests  ]
+      #classes : [ #LQLintTests ]
     }
   }
 }
@@ -23,3 +23,7 @@ Tests, #LQStatisticsWorkbenchIntegrationTests ]
     }
   }
 }
+ionTests ]
+    }
+  }
+}

README.md

@@ -49,16 +49,21 @@ LQStartMenu open.
 ```
 
 There you should be able to choose between the "Participant" and "Host" View.
-If you want to create a poll and run it, close a poll or show the results of a running poll choose "Host". For creating a poll, click "create poll" then type in your Question in the Header of the window.
-Every newline in the box under the question is a possible answer, so be sure to keep every answer on its own line.
-On the bottom you can run your poll and give it an id. Keep the id, it is used to access the poll and its results.
-If you want to close a poll click "close poll" in the host menu. After entering the poll id of the running poll you want to close, participants will not be able to send new answers.
-For the poll results, press "Show results" and input the respective poll id.
+If you want to create a poll and run it, close a poll or show the results of a running poll choose "Host". For creating a poll, click "create poll" then choose the type of question and type the question and if required possible answers in the according text fields. Alternatively you can create a poll from your saved drafts. When pressing the according button a new window opens showing the saved drafts.
+For MultipleChoice and Priotarization questions every newline in the box under the question represents a possible answer, so be sure to keep every answer on its own line.
+On the bottom you can run your poll and give it an id. The id is required for the participants to enter. To allow participants easy access to your poll press the copy poll link button while having the right poll selected in the host menu. Now you can send that link to participants by pasting it in.
+If you want to close a poll click "close poll" in the host menu. Now participants are not able to enter that poll anymore.
+For the poll results there is a live visualization in the host menu. You can also export the results to the DataExports directory in your squeak folder. The export file is named after your poll id. To minimize clutter press delete poll when a poll is not needed anymore.
+To stop any user from participating in any of your polls press stop server.
 
-Participants can choose the "Participant" button in the Start Menu. Enter the Poll id of the poll you want to participate in. Choose one or multiple answers and push the send button.
+Participants can choose the "Participant" button in the Start Menu. Enter the link of the poll you want to participate in. Answer every question by selecting or writing text and press send answers.
 
 ## Tests
 We tested the application via:
 - Integration Tests (can be found in `Liquid-Tests`-package)
 - Unit Tests (can be found in `Liquid-Tests`-package)
 - Use Case Tests (can be found in [Use Case Test Specification](https://github.com/hpi-swa-teaching/Liquid/blob/develop/docs/UseCases.md))
+
+
+Anmerkungen: 
+Fürs Refactoring haben wir PoppyPrint verwendet. Daher werden unter anderem die Klassen LQUserSetMenu, LQUserSetSelectionMenu, LQMailDialog, LQAntiCheat, LQDelayMessageDecorator, LQLocalObjectDummy, LQObjectRepo, LQPollRepo, LQRemoteError, LQUserSetRepo, LiquidNetworkServiceProvider, LQUserSet, LQUser, LQPasswordManager, LQPasswordGuard, LQDuplicateDetector, LQChoiceProcessor, LQChoice als geändert angezeigt. Diese Klassen haben wir allerdings weder manuell refactored noch anderweitig verändert. 

packages/BaselineOfLiquid.package/BaselineOfLiquid.class/instance/baseline..st

@@ -10,6 +10,10 @@ baseline: spec
 				baseline: 'SwaLint'
 				with: [spec repository: 'github://hpi-swa-teaching/SwaLint:release/packages'];
 
+				baseline: 'Squot'
+				with: [spec repository: 'github://hpi-swa/Squot:mapper/src'];
+
+
 				package: 'Liquid-Core'
 				with: [spec requires: #('libraries')];
 
@@ -22,7 +26,7 @@ baseline: spec
 				package: 'Liquid-Tests'
 				with: [spec requires: #('SwaLint' 'default')];
 				 yourself.
-			spec group: 'libraries' with: #('StatisticsWorkbench');
+			spec group: 'libraries' with: #('StatisticsWorkbench' 'Squot');
 				 group: 'default' with: #('Liquid-Core' 'Liquid-Network' 'Liquid-UI');
 				 group: 'tests' with: #('Liquid-Tests')];
 		 yourself

packages/BaselineOfLiquid.package/BaselineOfLiquid.class/methodProperties.json

@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "FLST 6/24/2024 09:16" } }
+		"baseline:" : "FLST 7/4/2024 10:57" } }

packages/Liquid-Core.package/LQAnswer.class/README.md

@@ -1,3 +1,4 @@
 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.
+- choicesRanking: An OrderedCollection of all the choices the participant voted.
+

packages/Liquid-Core.package/LQAnswer.class/class/newWithQuestion..st

@@ -0,0 +1,6 @@
+class initialization
+newWithQuestion: aQuestion
+
+	^ LQFreeTextAnswer new
+		questionId: aQuestion id;
+		yourself

packages/Liquid-Core.package/LQAnswer.class/instance/answer.st

@@ -0,0 +1,4 @@
+accessing
+answer
+
+	^ ''

packages/Liquid-Core.package/LQAnswer.class/instance/choicesRanking.st

@@ -1,4 +1,4 @@
 accessing
 choicesRanking
 
-	^ choicesRanking
+	^ OrderedCollection new

packages/Liquid-Core.package/LQAnswer.class/instance/initialize.st

@@ -2,5 +2,4 @@ initialize-release
 initialize
 
 	super initialize.
-	self id: UUID new asString.
-	self choicesRanking: OrderedCollection new
+	self id: UUID new asString

packages/Liquid-Core.package/LQAnswer.class/instance/printDataOn..st

@@ -1,12 +1,4 @@
 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	
+	SubclassResponsibility

packages/Liquid-Core.package/LQAnswer.class/methodProperties.json

@@ -1,13 +1,12 @@
 {
 	"class" : {
-		"newWithQuestion:andVotes:" : "Anton Eichstädt 6/5/2024 17:28" },
+		"newWithQuestion:" : "FLST 7/11/2024 20:42" },
 	"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",
+		"answer" : "FLST 7/11/2024 20:42",
+		"choicesRanking" : "FLST 7/11/2024 20:42",
 		"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",
+		"initialize" : "FLST 7/11/2024 20:42",
+		"printDataOn:" : "FLST 7/11/2024 20:42",
 		"questionId" : "JT 8/2/2022 17:01",
 		"questionId:" : "JT 8/2/2022 17:01" } }

packages/Liquid-Core.package/LQAnswer.class/properties.json

@@ -7,8 +7,7 @@
 	"commentStamp" : "Anton Eichstädt 6/5/2024 17:29",
 	"instvars" : [
 		"id",
-		"questionId",
-		"choicesRanking" ],
+		"questionId" ],
 	"name" : "LQAnswer",
 	"pools" : [
 		 ],

packages/Liquid-Core.package/LQAnswerSet.class/class/newWithAnswers.for..st

@@ -2,7 +2,6 @@ class initialization
 newWithAnswers: anOrderedCollection for: aPoll
 
 	| answerSet |
-
 	answerSet := LQAnswerSet new pollId: aPoll id.
 	anOrderedCollection do: [:answer | answerSet addAnswer: answer].
 

packages/Liquid-Core.package/LQAnswerSet.class/instance/initialize.st

@@ -1,6 +1,6 @@
 initialize-release
 initialize
-	
+
 	super initialize.
 	self answers: Dictionary new.
 	self id: UUID new asString

packages/Liquid-Core.package/LQAnswerSet.class/instance/printDataOn.for.with..st

@@ -2,5 +2,5 @@ printing
 printDataOn: aStream for: orderedQuestionIDs with: aDelimiter
 
 	orderedQuestionIDs do: [:answerId |
-								self answers at: answerId ifPresent: [:printedAnswer | printedAnswer printDataOn: aStream].
-								aStream nextPutAll: aDelimiter].
+		self answers at: answerId ifPresent: [:printedAnswer | printedAnswer printDataOn: aStream].
+		aStream nextPutAll: aDelimiter]

packages/Liquid-Core.package/LQAnswerSet.class/methodProperties.json

@@ -1,15 +1,15 @@
 {
 	"class" : {
-		"newWithAnswers:for:" : "bwe 8/5/2022 18:05" },
+		"newWithAnswers:for:" : "FLST 7/11/2024 20:42" },
 	"instance" : {
 		"addAnswer:" : "CG 7/30/2021 19:06",
 		"answers" : "JT 8/2/2022 16:51",
 		"answers:" : "bn 7/14/2022 22:40",
 		"id" : "JT 8/2/2022 16:52",
 		"id:" : "kge 6/25/2022 16:44",
-		"initialize" : "JT 8/2/2022 16:53",
+		"initialize" : "FLST 7/11/2024 20:42",
 		"pollId" : "JS 5/18/2021 18:38",
 		"pollId:" : "JS 5/18/2021 18:37",
-		"printDataOn:for:with:" : "leli 5/21/2024 11:35",
+		"printDataOn:for:with:" : "FLST 7/11/2024 20:42",
 		"token" : "JT 8/2/2022 16:55",
 		"token:" : "JT 8/2/2022 16:55" } }

packages/Liquid-Core.package/LQChoice.class/class/newFrom..st

@@ -2,11 +2,10 @@ instance creation
 newFrom: aString
 
 	| processor choice |
-
 	processor := LQChoiceProcessor new.
 	choice := LQChoice new.
 	choice
 		description: (processor extractDescription: aString);
 		excludedGroups: (processor extractGroups: aString);
 		rawString: aString.
-	^ choice
+	^ choice

packages/Liquid-Core.package/LQChoice.class/instance/excludesGroup..st

@@ -1,4 +1,4 @@
 accessing
 excludesGroup: aString
-	
+
 	^ self excludedGroups includes: aString

packages/Liquid-Core.package/LQChoice.class/instance/initialize.st

@@ -3,6 +3,6 @@ initialize
 
 	super initialize.
 
-	self 
+	self
 		description: '';
 		excludedGroups: OrderedCollection new

packages/Liquid-Core.package/LQChoice.class/instance/rawString..st

@@ -1,4 +1,4 @@
 accessing
 rawString: aString
-	
+
 	rawString := aString

packages/Liquid-Core.package/LQChoice.class/instance/rawString.st

@@ -1,4 +1,4 @@
 accessing
 rawString
-	
+
 	^ rawString

packages/Liquid-Core.package/LQChoice.class/methodProperties.json

@@ -1,12 +1,12 @@
 {
 	"class" : {
-		"newFrom:" : "JT 8/5/2022 18:20" },
+		"newFrom:" : "FLST 7/11/2024 20:42" },
 	"instance" : {
 		"description" : "JT 8/2/2022 16:55",
 		"description:" : "JT 8/2/2022 16:55",
 		"excludedGroups" : "JT 8/2/2022 16:55",
 		"excludedGroups:" : "JT 8/2/2022 16:56",
-		"excludesGroup:" : "kge 8/3/2022 20:52",
-		"initialize" : "JT 8/2/2022 16:55",
-		"rawString" : "JT 8/2/2022 16:56",
-		"rawString:" : "bn 6/12/2022 20:16" } }
+		"excludesGroup:" : "FLST 7/11/2024 20:42",
+		"initialize" : "FLST 7/11/2024 20:42",
+		"rawString" : "FLST 7/11/2024 20:42",
+		"rawString:" : "FLST 7/11/2024 20:42" } }

packages/Liquid-Core.package/LQChoiceProcessor.class/instance/extractDescription..st

@@ -1,10 +1,9 @@
 extracting
 extractDescription: aString
-
-	| firstBracketLocation rawDescription |
-
-	firstBracketLocation := aString findString: '['.		
-	(firstBracketLocation == 0) ifTrue: [^ aString withBlanksTrimmed].
 
-	rawDescription := aString copyFrom: 1 to: (firstBracketLocation - 1).
+	| firstBracketLocation rawDescription |
+	firstBracketLocation := aString findString: '['.
+	firstBracketLocation isZero ifTrue: [^ aString withBlanksTrimmed].
+
+	rawDescription := aString copyFrom: 1 to: firstBracketLocation - 1.
 	^ rawDescription withBlanksTrimmed

packages/Liquid-Core.package/LQChoiceProcessor.class/instance/extractGroups..st

@@ -2,14 +2,14 @@ extracting
 extractGroups: aString
 
 	| openingBracketLocation closingBracketLocation rawGroups splitGroups |
-
 	openingBracketLocation := aString findString: '['.
-	closingBracketLocation := aString findLastOccurrenceOfString: ']' startingAt: openingBracketLocation.
-
-	((openingBracketLocation == 0) or: [closingBracketLocation == 0])
-		ifTrue: [^ OrderedCollection new].
-
-	rawGroups := aString copyFrom: openingBracketLocation + 1 to: (closingBracketLocation - 1).
+	closingBracketLocation := aString
+		findLastOccurrenceOfString: ']'
+		startingAt: openingBracketLocation.
+
+	(openingBracketLocation isZero or: [closingBracketLocation isZero]) ifTrue: [^ OrderedCollection new].
+
+	rawGroups := aString copyFrom: openingBracketLocation + 1 to: closingBracketLocation - 1.
 	splitGroups := rawGroups subStrings: ','.
 
 	^ (splitGroups collect: [:group | group withBlanksTrimmed]) asOrderedCollection

packages/Liquid-Core.package/LQChoiceProcessor.class/methodProperties.json

@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"extractDescription:" : "JT 8/5/2022 18:21",
-		"extractGroups:" : "JT 8/2/2022 16:59" } }
+		"extractDescription:" : "FLST 7/11/2024 20:42",
+		"extractGroups:" : "FLST 7/11/2024 20:42" } }

packages/Liquid-Core.package/LQChoicesAnswer.class/class/newWithQuestion.andVotes..st

@@ -0,0 +1,7 @@
+as yet unclassified
+newWithQuestion: aQuestion andVotes: anOrderedCollection
+
+	^ LQChoicesAnswer new
+		questionId: aQuestion id;
+		choicesRanking: (anOrderedCollection collect: [:each | each description]);
+		yourself

packages/Liquid-Core.package/LQChoicesAnswer.class/instance/choicesRanking..st

@@ -0,0 +1,4 @@
+accessing
+choicesRanking: anObject
+
+	votedChoiceList := anObject

packages/Liquid-Core.package/LQChoicesAnswer.class/instance/choicesRanking.st

@@ -0,0 +1,4 @@
+accessing
+choicesRanking
+
+	^ votedChoiceList

packages/Liquid-Core.package/LQAnswer.class/instance/containsVoteForChoice..st → packages/Liquid-Core.package/LQChoicesAnswer.class/instance/containsVoteForChoice..st

@@ -1,4 +1,4 @@
-evaluation
+accessing
 containsVoteForChoice: aChoice
 
 	^ self choicesRanking includes: aChoice description

packages/Liquid-Core.package/LQChoicesAnswer.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

packages/Liquid-Core.package/LQChoicesAnswer.class/methodProperties.json

@@ -0,0 +1,8 @@
+{
+	"class" : {
+		"newWithQuestion:andVotes:" : "FLST 7/11/2024 20:42" },
+	"instance" : {
+		"choicesRanking" : "FLST 7/11/2024 20:42",
+		"choicesRanking:" : "FLST 7/11/2024 20:42",
+		"containsVoteForChoice:" : "FLST 7/11/2024 20:42",
+		"printDataOn:" : "FLST 7/11/2024 20:42" } }

packages/Liquid-Core.package/LQChoicesAnswer.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "Liquid-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"votedChoiceList" ],
+	"name" : "LQChoicesAnswer",
+	"pools" : [
+		 ],
+	"super" : "LQAnswer",
+	"type" : "normal" }