Create release June 2024 (#254)

* tests, code to export csv into Ressources folder * test commit * csv export * fix problem with csv export * remove unused code * prettyPrint and use path constant in test * erster commit, umbenannt, neue klassen usw * weitergearbeitet * feature now works. Still buggy tho * Revert "WIP prioritization polls" This reverts commit 4263e22. * refactoring of csv export * add confirmation dialog to csv export * Feature/delete question (#251) * added removeButton with functionality * added test and refactored according to project conventions * apply prettyPrint formatting * fix replaceAll in LQStringProcessor --------- Co-authored-by: Ingmar Vogel <[email protected]> Co-authored-by: Victor.Lindow <[email protected]> * refactor exportCSV * csvExport fix * simpler ids and default url * one window for entering server and id * shorterids * prettyprint * csv export automated test * Removed StatisticsWorkbench integration * Removed legacy and linting pipeline * Re-enable CI for linting * Seperated CI/CD stages * Renamed the CI stages * Supressed linting error * random generator * refactoring large method * refactoring * Feature/poll draft (#260) * Added option to save a poll draft * Added poll draft menu (#252) * fix isse with opening a saved draft * add tests and apply prettyPrint formatting * add assertion to poll draft test * Fixed linting errors --------- Co-authored-by: Florian Strehl <[email protected]> * prio feature fertig nach 3 wochen * Renamed classes * Renamed votedChoiceList to choicesRanking * Fixed read access for votedChoiceList * Fixed LQMultiChoiceQuestionBuilder naming * Fixed class name * Fixed linting error * Fixed naming for poll drafts * Disabled "Execessive number of methods" for LQPollDraftBuilder * fix button positions in Poll Draft Builder * Feature/simple UI (#261) * started simpler ui * added structure holding the polls from the repo and first functioning buttons (still issues with updates) * added ui updates to delete, close and ID-textfield * new ui working correctly without visualization * last commit before Joan adds live stuff * push before removing garbage classes * removed unnecessary classes * changed size of save draft and run poll aswell as functionality of create another poll from saved drafts button (issues with opening saved drafts) * Re-Added SWAStatistics * Re-enabled VisualizationTests * Removed invalid char * Used old smalltalk.ston * Fixed linting --------- Co-authored-by: Ingmar Vogel <[email protected]> * Updated Readme * Updated installation * Trigger CI/CD * Trigger CI/CD --------- Co-authored-by: Lea Liekenbrock <[email protected]> Co-authored-by: vlindow <[email protected]> Co-authored-by: Anton Eichstädt <[email protected]> Co-authored-by: Ingmar Vogel <[email protected]>
hpi-swa-teaching · Jun 24, 2024 · 1ff905b · 1ff905b
1 parent 4c204cb
commit 1ff905b
Show file tree

Hide file tree

Showing 411 changed files with 1,878 additions and 1,004 deletions.
diff --git a/.github/workflows/ci-legacy.yml → .github/workflows/ci-lint.yml b/.github/workflows/ci-legacy.yml → .github/workflows/ci-lint.yml
@@ -1,4 +1,4 @@
-name: CI-Legacy
+name: CI
 
 on: [push, pull_request]
 
@@ -8,16 +8,16 @@ jobs:
     strategy:
       matrix:
         # Select platform(s)
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest ]
         # Select compatible Smalltalk image(s)
-        smalltalk: [ Squeak64-5.3, Squeak64-5.2 ]
-    name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
+        smalltalk: [ Squeak64-6.0 ]
+    name: Linting
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
-      - run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.legacy.ston
+      - run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.lint.ston
         timeout-minutes: 15
         env:
           # for uploading coverage reports

diff --git a/.github/workflows/ci-linter.yml b/.github/workflows/ci-linter.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,16 +8,16 @@ jobs:
     strategy:
       matrix:
         # Select platform(s)
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest ]
         # Select compatible Smalltalk image(s)
-        smalltalk: [ Squeak64-5.3 ]
-    name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
+        smalltalk: [ Squeak64-6.0 ]
+    name: Testing ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
-      - run: smalltalkci -s ${{ matrix.smalltalk }}
+      - run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.ston
         timeout-minutes: 15
         env:
           # for uploading coverage reports

diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -11,10 +11,15 @@ SmalltalkCISpec {
   ],
   #testing : {
     #coverage : {
-      #packages : [ 'Liquid-Core','Liquid-Network','Liquid-UI']
+      #packages : [ #Liquid-Core, #Liquid-Network, #Liquid-UI ]
     },
     #exclude : {
-      #classes : [ #LQLintTests ]
+      #classes : [ #LQLintTests,  #LQToolbuilderTests  ]
+    }
+  }
+}
+
+Tests, #LQStatisticsWorkbenchIntegrationTests ]
     }
   }
 }
diff --git a/.squot-materialize b/.squot-materialize
@@ -1,31 +1,41 @@
 [
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.smalltalk.lint.ston'
+		],
+		#encoding : 'TXT'
+	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'docs',
-			'class-diagram.wsd'
+			'userSet.md'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'workflows',
-			'ci.yml'
+			'scripts',
+			'preLoading.st'
+		],
+		#encoding : 'TXT'
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'README.md'
 		],
 		#encoding : 'TXT'
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'BaselineOfLiquid'
+			#name : 'Liquid-Tests'
 		},
 		#path : FSAbsolutePath [
 			'packages'
 		]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'docs',
-			'ObjectRepo.md'
+			'.all-contributorsrc'
 		],
 		#encoding : 'TXT'
 	},
@@ -39,34 +49,13 @@
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'docs',
-			'userSet.md'
-		],
-		#encoding : 'TXT'
-	},
-	SquotPlaintextMapper {
-		#path : FSAbsolutePath [
-			'.squot'
-		],
-		#encoding : 'TXT'
-	},
-	SquotPlaintextMapper {
-		#path : FSAbsolutePath [
-			'.smalltalk.legacy.ston'
+			'.smalltalk.ston'
 		],
 		#encoding : 'TXT'
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'Liquid-Tests'
-		},
-		#path : FSAbsolutePath [
-			'packages'
-		]
-	},
-	SquotCypressMapper {
-		#package : MCPackage {
-			#name : 'Liquid-UI'
+			#name : 'Liquid-Core'
 		},
 		#path : FSAbsolutePath [
 			'packages'
@@ -81,13 +70,21 @@
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.smalltalk.ston'
+			'docs',
+			'LQLogo.svg'
 		],
 		#encoding : 'TXT'
 	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'liquid_logo.png'
+		],
+		#encoding : Class [ #PNGReadWriter ]
+	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.all-contributorsrc'
+			'pollData',
+			'plaintext.txt'
 		],
 		#encoding : 'TXT'
 	},
@@ -97,11 +94,18 @@
 		],
 		#encoding : 'TXT'
 	},
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'Liquid-Network'
+		},
+		#path : FSAbsolutePath [
+			'packages'
+		]
+	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'workflows',
-			'ci-legacy.yml'
+			'docs',
+			'ObjectRepo.md'
 		],
 		#encoding : 'TXT'
 	},
@@ -114,56 +118,65 @@
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'Liquid-Network'
+			#name : 'BaselineOfLiquid'
 		},
 		#path : FSAbsolutePath [
 			'packages'
 		]
 	},
-	SquotPlaintextMapper {
-		#path : FSAbsolutePath [
-			'CONTRIBUTING.md'
-		],
-		#encoding : 'TXT'
-	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'docs',
-			'LQLogo.svg'
+			'class-diagram.wsd'
 		],
 		#encoding : 'TXT'
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'Liquid-Core'
+			#name : 'Liquid-UI'
 		},
 		#path : FSAbsolutePath [
 			'packages'
 		]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'docs',
-			'sequence-diagram.wsd'
+			'.github',
+			'workflows',
+			'ci-legacy.yml'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'README.md'
+			'CONTRIBUTING.md'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.smalltalk.lint.ston'
+			'.squot'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'scripts',
-			'preLoading.st'
+			'docs',
+			'sequence-diagram.wsd'
+		],
+		#encoding : 'TXT'
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.smalltalk.legacy.ston'
+		],
+		#encoding : 'TXT'
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.github',
+			'workflows',
+			'ci.yml'
 		],
 		#encoding : 'TXT'
 	}

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Liquid
 
-Group 13 SWT 2021
+Group 3 SWT 2024
 
 [![CI](https://github.com/hpi-swa-teaching/Liquid/workflows/CI/badge.svg?branch=develop)](https://github.com/hpi-swa-teaching/Liquid/actions)
 [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/Liquid/badge.svg?branch=develop)](https://coveralls.io/github/hpi-swa-teaching/Liquid?branch=develop)
@@ -15,13 +15,31 @@ Installer ensureRecentMetacello.
 
 Then run this code in your workspace:
 
+#### If you want the latest version
+
+```smalltalk
+Metacello new
+  baseline: 'Liquid';
+  repository: 'github://hpi-swa-teaching/Liquid:develop/packages';
+  load.
+```
+
+#### If you want a more stable version
+
 ```smalltalk
 Metacello new
   baseline: 'Liquid';
   repository: 'github://hpi-swa-teaching/Liquid:main/packages';
   load.
 ```
 
+#### If you want a release version
+
+0. Ensure you have the latest version of the GitBrowser
+1. Download the SAR packages for both StatisticsWorkbench and Liquid
+2. Install the SAR package for StatisticsWorkbench (the order matters)
+3. Install the SAR package for Liquid
+
 ### If you want to use Liquid, here is a quick introduction:
 
 In your Squeak Workspace run:

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/liquid_logo.png b/liquid_logo.png
diff --git a/packages/.filetree b/packages/.filetree
@@ -0,0 +1,2 @@
+{"propertyFileExtension" : ".json",
+"packageExtension" : ".package" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{"propertyFileExtension" : ".json",
		"packageExtension" : ".package" }