Commit Graph

128 Commits

Author SHA1 Message Date
schrom01 afab6dbee3 refactoring of GameSchedule and button "close Tournament" added.
added "informListener()" to method refreshParticipants in GameDecorator.java to be sure the new participants are saved in file.
2022-05-07 16:43:46 +02:00
schrom01 89e72a1592 solved Problem "points and places of games are not saved in file." 2022-05-07 15:45:43 +02:00
schrom01 5e88960c8a extracted Method loadGameTree to FactoryDecorator.java 2022-05-07 15:34:08 +02:00
schrom01 923be52610 refactoring of GameController.java to load content only if previous games are edited. 2022-05-07 15:23:26 +02:00
schrom01 62df1db34b refactoring of GameController.java to do it the same way as the other controllers. 2022-05-07 12:51:14 +02:00
schrom01 ecde0e6345 fixed Number of Games.
#21
2022-05-07 12:32:18 +02:00
schrom01 4d193abb64 changed GameDecorator.java to show full name of players. 2022-05-07 12:17:50 +02:00
schrom01 3d13dbcb45 changed ParticipantFormular to change existing objects and don't replace them.
changed ParticipantFormular and PlacesFormular to clear textfields after saving.
solved #19
2022-05-07 11:53:10 +02:00
Andrin Fassbind de728745f6 list all games in gameschedule
prevent nullpointer exception for empty games
2022-05-06 19:26:34 +02:00
Andrin Fassbind e5dc6a913a make createTournament create all future games with null object for participant 2022-05-06 19:12:14 +02:00
Andrin Fassbind 4dc7db7590 made GameScheduleController and GameDecorator
first gameround gets loaded in gamescheduleview
2022-05-06 18:40:13 +02:00
schrom01 9a3a9f3b53 removed Indexes from Game.java 2022-05-06 14:07:55 +02:00
schrom01 1b9e9c27a9 Merge remote-tracking branch 'origin/develope_Game_branch' into develope_Game_branch 2022-05-06 14:04:44 +02:00
schrom01 593bcdc872 added indexes to Game.java 2022-05-06 14:04:35 +02:00
Andrin Fassbind 4ef9f62124 update game with new id and new button to mark game as played 2022-05-06 13:36:49 +02:00
Andrin Fassbind ebc0b64cb7 Create gameList in Tournament
Create method to calc gameList and create random first round
Started to develope view of gameSchedule
2022-05-06 13:34:22 +02:00
fassband 47b53033c4 Merge pull request #18 from PM2-IT21bWIN-ruiz-mach-krea/LoggingFunction
Logging function
2022-05-06 10:30:41 +02:00
schrom01 02456bc5bf fixed participanFormular and placesFormular
#19
2022-05-06 09:23:19 +02:00
leobr 035b096889 finished logging and improved logging in FileIO #17 2022-05-05 23:58:42 +02:00
Leonardo Brandenberger 1ff37de1a3 Initial logging draft 2022-05-05 23:03:48 +02:00
schrom01 f3495d28d6 fixed functionality Places Formular 2022-05-01 23:35:25 +02:00
schrom01 c323ab5759 fixed Merging problem 2022-05-01 22:50:07 +02:00
Roman Schenk b2c23e158d Merge pull request #16 from PM2-IT21bWIN-ruiz-mach-krea/FileIO
FileIO completed including Java Doc and logging
2022-05-01 22:47:33 +02:00
schrom01 2f111cf1e4 implemented functionality of PlacesFormular 2022-05-01 22:43:41 +02:00
Roman Schenk 4ae7cd2e5a Merge branch 'main' into FileIO 2022-05-01 22:42:02 +02:00
Leonardo Brandenberger eb6d68e84f FileIO completed including Java Doc and logging 2022-05-01 22:30:22 +02:00
Roman Schenk 7d30c6e4e7 Merge branch 'main' into Participant_List 2022-05-01 21:44:17 +02:00
schrom01 0d482bfcac implemented Functionality to save, edit and delete participants. 2022-05-01 21:26:32 +02:00
Andrin Fassbind 0db169a771 Added GameSchedule View
when open tournament GameSchedule.fxml gets loaded
2022-05-01 20:26:33 +02:00
schrom01 90fa3a9183 changed position of button. 2022-05-01 18:06:25 +02:00
schrom01 4cb743a21a implemented functionality to save participants also in file. 2022-05-01 17:00:09 +02:00
schrom01 ff6f2bd94e created Methods to show and add Players. 2022-05-01 15:18:30 +02:00
schrom01 b09929da19 added Participant List to Tournament.java 2022-05-01 14:22:01 +02:00
schrom01 678060ecc0 extracted Method delete Tournament in TournamentDecorator.java 2022-05-01 13:46:20 +02:00
schrom01 61b943b091 extracted Method open Tournament to Class FactoryDecorator.java 2022-05-01 13:39:54 +02:00
schrom01 9f005281af created Class TournamentDecorator.java 2022-05-01 13:10:20 +02:00
schrom01 50f98b4ac1 added Type checking in Tournament.java 2022-05-01 12:33:14 +02:00
schrom01 80005d214d created Class AlertDelete.java 2022-05-01 12:19:22 +02:00
schrom01 58b1692181 implemented Button and Method deleteTournament in Tournament List 2022-05-01 11:27:54 +02:00
schrom01 a3bd207610 refactored toString Method of class TournamentFile 2022-05-01 11:17:18 +02:00
schrom01 5034203409 extracted Method tournamentExists to FileIO.java 2022-05-01 11:10:21 +02:00
schrom01 e79a38c696 Merge branch 'FileIO' into TournamentList
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
2022-05-01 10:56:22 +02:00
schrom01 672ad409ce refactoring in FileIOTest.java 2022-05-01 10:54:21 +02:00
schrom01 e8e64d435c added Method deleteTournament but not implemented yet in FileIO.java
added Test Methods for deleteTournament.
2022-05-01 10:49:29 +02:00
schrom01 171cf7ef4e implemented functionality to add new Tournament 2022-05-01 10:27:21 +02:00
schrom01 fd2e775c94 cleanCode fixes. 2022-04-30 18:22:06 +02:00
schrom01 71d13314f4 Solved Problems with Filenames ParticipantFormularController.java and TournamentListController.java 2022-04-30 18:17:01 +02:00
schrom01 6245e32f73 added pane to FXController.java 2022-04-30 18:03:11 +02:00
Roman Schenk a103174739 Delete app/build/tmp/compileJava directory 2022-04-30 18:01:35 +02:00
schrom01 6d5dd700a0 implemented functionality to show existing Tournaments. 2022-04-30 17:09:01 +02:00
schrom01 cd0c9a4773 Merge branch 'FileIO' into fxml
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java
2022-04-30 16:10:19 +02:00
schrom01 7af48449e0 created Abstract Class FXController.java 2022-04-29 17:30:26 +02:00
schrom01 9c7d62b260 created Class Factory and refactoring of MainWindow.java 2022-04-29 17:11:50 +02:00
schrom01 ca5b52541f Merge remote-tracking branch 'origin/fxml' into fxml
# Conflicts:
#	.gitignore
2022-04-29 16:18:58 +02:00
schrom01 56de1441d9 Merge branch 'main' into fxml
# Conflicts:
#	.gitignore
2022-04-29 16:18:18 +02:00
schrom01 4909bd0d7c Merge remote-tracking branch 'origin/FileIO' into FileIO 2022-04-29 16:10:50 +02:00
schrom01 90f6855a15 changed Path Separator 2022-04-29 16:09:44 +02:00
Andrin Fassbind 2413e4f8e0 refactored GUI to be able to just switch between diffrent pane in center
refactored dictionary hirarchy
2022-04-29 12:27:22 +02:00
Leonardo Brandenberger 068dc44e89 started adding logging to FileIO 2022-04-29 11:52:19 +02:00
Andrin Fassbind 89b7ac2268 created GUI Main and AddParticipant 2022-04-29 11:48:37 +02:00
Andrin Fassbind 0974af77b6 created GUI Main and AddParticipant 2022-04-29 11:48:20 +02:00
Andrin Fassbind 3ec776e64f created GUI Main and AddParticipant 2022-04-29 11:47:27 +02:00
Andrin Fassbind 96fedc3f65 created GUI Main and AddParticipant 2022-04-29 10:39:59 +02:00
Andrin Fassbind f78731951d created GUI Main and AddParticipant 2022-04-29 10:39:50 +02:00
Andrin Fassbind 2245568edf created GUI Main and AddParticipant 2022-04-29 10:39:37 +02:00
schrom01 cff22e9253 added file needed for FileIOTest 2022-04-29 08:29:10 +02:00
Andrin Fassbind d641d2f2ea created GUI 2022-04-28 19:43:42 +02:00
schrom01 509192b403 created FileIOTest and changed Exception Handling of File IO 2022-04-28 18:07:57 +02:00
schrom01 263d79ba8e removed Class Tournamenttest.java 2022-04-28 14:57:41 +02:00
schrom01 4b658b9ed9 Merge branch 'creation_of_simple_classes' into FileIO
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
2022-04-28 14:56:21 +02:00
schrom01 5d26137c8d made Tournament not abstract. 2022-04-28 14:50:45 +02:00
Leonardo Brandenberger 380250f60e changes so that savepath can be set elsewhere 2022-04-28 14:35:29 +02:00
schrom01 61a778ad54 added Date of Birth to Player.java 2022-04-28 14:10:41 +02:00
Leonardo Brandenberger e1fdc5deac finished initial draft of file io and also added some test cases to disscuss in app 2022-04-28 03:07:51 +02:00
Leonardo Brandenberger e0b1616edf Created classes to test FileIO 2022-04-24 22:06:03 +02:00
schrom01 3dfa71dab1 Created Interface Participant
changed Class Game to save Participant Objects instad of int.
2022-04-22 11:53:11 +02:00
schrom01 a399f9321b created simple classes
Issue #5
2022-04-22 11:42:39 +02:00
schrom01 32cddaac38 created gradle application 2022-04-22 10:10:20 +02:00