ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
196 Commits 20 Branches 0 Tags 1.2 MiB
Commit Graph

159 Commits

Author SHA1 Message Date
schrom01 c862492be3 fixes in Layout 
solved #34
 2022-05-13 15:57:39 +02:00
fassband a6f14b94bd Merge pull request #47 from PM2-IT21bWIN-ruiz-mach-krea/fix_places_are_deleted_ 
fixed places are deleted.
 2022-05-13 15:38:42 +02:00
schrom01 0a7ca1ac3e fixed places are deleted. 
solved #45
 2022-05-13 15:36:29 +02:00
Andrin Fassbind bdb34fde31 Make Application close properly 
If exception while closing there is a proper log
 2022-05-13 15:35:41 +02:00
Roman Schenk e9d42b719b Merge branch 'main' into refactoring_of_factory 2022-05-13 15:16:51 +02:00
Andrin Fassbind b4da0b2fef Changed number of threads in executerservice to one to prevent false order to save file 2022-05-13 15:15:37 +02:00
schrom01 6c761c944f refactoring of Factory.java 
added Enum View
solved #23
 2022-05-13 15:08:26 +02:00
Andrin Fassbind 127e152637 implement TournamentTest 2022-05-13 14:52:58 +02:00
Andrin Fassbind 40cfd69436 implement TournamentTest 2022-05-13 14:23:17 +02:00
Andrin Fassbind 03c9da13a5 Merge remote-tracking branch 'origin/main' into testClass 2022-05-13 13:14:39 +02:00
Leonardo Brandenberger 7267fe590b Added Java Doc and Logger to Place.java 2022-05-13 01:48:26 +02:00
Leonardo Brandenberger befa159f90 Added Java Doc and Logger to Player 2022-05-13 01:36:54 +02:00
Leonardo Brandenberger 06003d5b54 Merge remote-tracking branch 'origin/logging_and_docs' into logging_and_docs 2022-05-13 00:07:17 +02:00
Leonardo Brandenberger 072db996dc Added Java Doc and Logger to Team 2022-05-13 00:02:31 +02:00
Andrin Fassbind f81b031555 Merge remote-tracking branch 'origin/main' into testClass 
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
 2022-05-12 23:31:42 +02:00
fassband 92d121890c Merge pull request #39 from PM2-IT21bWIN-ruiz-mach-krea/develop_footer 
Develop footer
 2022-05-12 23:26:54 +02:00
schrom01 280d2ebda3 fixed Error when IndexOutOfBoundsException in setDateofBirtch in Player.java 2022-05-12 23:21:17 +02:00
Andrin Fassbind 68080c36ff change method addPlace 
start TournamentTest implementation
 2022-05-12 23:15:42 +02:00
Roman Schenk 1031c27650 Merge branch 'main' into logging_and_docs 2022-05-12 22:54:43 +02:00
Leonardo Brandenberger e77d6cbc21 java doc and logging added to class Tournament 2022-05-12 22:51:05 +02:00
schrom01 ddfbb9bbd0 added error Message for file reading error 2022-05-12 22:45:10 +02:00
schrom01 3ebf9c5072 added Exception for Invalid Date 2022-05-12 22:41:18 +02:00
Andrin Fassbind f885092259 removed import 2022-05-12 21:08:48 +02:00
Andrin Fassbind 2784cd67fa make last file visible for user in footer 2022-05-12 19:44:45 +02:00
Andrin Fassbind 298d61eeca extent scope of FactoryDecorator for TournamentDecorator 
creat footer to show error msg if user acts not as expected
 2022-05-12 19:34:59 +02:00
fassband b0aa0ab1ad Merge pull request #33 from PM2-IT21bWIN-ruiz-mach-krea/develope_Game_branch 
Develope game branch
 2022-05-12 13:44:47 +02:00
Andrin Fassbind 84b5f2464d test performance with separete thread to save and load file 2022-05-12 13:38:53 +02:00
Andrin Fassbind d3a4b4cc87 if game points empty default value is 0 
changed to variable names
 2022-05-12 13:23:15 +02:00
Roman Schenk 4b74a8d285 Merge pull request #22 from PM2-IT21bWIN-ruiz-mach-krea/fix_participanFormular_and_placesFormular 
changed ParticipantFormular to change existing objects and don't repl…
 2022-05-12 11:39:16 +02:00
schrom01 db51f2f3cd implemented functionality to drawLines 2022-05-11 17:42:36 +02:00
schrom01 7f723fd763 implemented functionality to activate treeview 2022-05-11 16:21:38 +02:00
schrom01 b51a585167 added functionality to autosave result and place if changed. 2022-05-08 22:13:03 +02:00
schrom01 53ffa90c69 changed height of games. 2022-05-08 20:32:23 +02:00
schrom01 a44227b3f6 fixed spacing between games in GameSchedule 2022-05-08 20:20:41 +02:00
schrom01 38d1708a25 changed Alignment of VBox to center in TournamentSchedule 2022-05-08 17:28:41 +02:00
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
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 3ec776e64f created GUI Main and AddParticipant 2022-04-29 11:47:27 +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