ZHAW-IT21b_WIN/team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
174 Commits 20 Branches 0 Tags
003f065662c0b3f9ffd66d478f2436a0c0840fb4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
schrom01 003f065662 fixed merge problem. 2022-05-13 23:29:39 +02:00
Roman SchenkandGitHub Enterprise caa21c8aa0 Merge pull request #53 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs 
Logging and docs added in several classes #27 #28
 2022-05-13 22:54:03 +02:00
schrom01 7114097601 fixed merge problem. 2022-05-13 22:53:49 +02:00
Roman SchenkandGitHub Enterprise bbaf70f9af Merge branch 'main' into logging_and_docs 2022-05-13 22:52:07 +02:00
schrom01 92360ad607 finished javadocs in Factory.java 2022-05-13 22:41:42 +02:00
schrom01 30ae77a11d java docs in Factory.java 2022-05-13 22:35:05 +02:00
schrom01 aee3549669 uploaded ClassDiagram.png 2022-05-13 22:08:20 +02:00
schrom01 a1b73e22ca removed "äöü" from error messages. 2022-05-13 17:51:04 +02:00
Roman SchenkandGitHub Enterprise 2327573581 Merge pull request #50 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs 
Logging and docs added to classes  Person, Place and Player  #27 #28
 2022-05-13 17:49:39 +02:00
schrom01 11d6ca1852 changed error Message numberOfParticipants. 2022-05-13 17:10:32 +02:00
schrom01 a78d1d9de7 changed error Message numberOfParticipants. 2022-05-13 16:51:17 +02:00
schrom01 5f6193d8b2 Merge branch 'main' into develop_footer 
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
 2022-05-13 16:50:35 +02:00
Roman SchenkandGitHub Enterprise f8d12dafa7 Merge branch 'main' into logging_and_docs 2022-05-13 16:39:36 +02:00
Roman SchenkandGitHub Enterprise 3d522dd13c Merge pull request #49 from PM2-IT21bWIN-ruiz-mach-krea/gameSchedule_Alert 
Create alert popup if user wants to create new game schedule
 2022-05-13 16:12:29 +02:00
schrom01 53cf3bdacc rmeoved tournament Type GROUPS from Tournament Enum Type. 2022-05-13 15:58:58 +02:00
schrom01 c862492be3 fixes in Layout 
solved #34
 2022-05-13 15:57:39 +02:00
Roman SchenkandGitHub Enterprise d3472017bb Merge pull request #46 from PM2-IT21bWIN-ruiz-mach-krea/closeImplementation 
Make Application close properly
 2022-05-13 15:37:31 +02:00
schrom01 0a7ca1ac3e fixed places are deleted. 
solved #45
 2022-05-13 15:36:29 +02:00
Roman SchenkandGitHub Enterprise 20903f6a69 Merge pull request #44 from PM2-IT21bWIN-ruiz-mach-krea/refactoring_of_factory 
refactoring of Factory.java
 2022-05-13 15:17:15 +02:00
Roman SchenkandGitHub Enterprise e9d42b719b Merge branch 'main' into refactoring_of_factory 2022-05-13 15:16:51 +02:00
Roman SchenkandGitHub Enterprise 1d6fcce13f Merge pull request #42 from PM2-IT21bWIN-ruiz-mach-krea/testClass 
Test class
 2022-05-13 15:16:05 +02:00
schrom01 6c761c944f refactoring of Factory.java 
added Enum View
solved #23
 2022-05-13 15:08:26 +02:00
schrom01 54a428cde2 throw PlaceExistsExceptoin if place exists already. 2022-05-13 13:48:38 +02:00
schrom01 280d2ebda3 fixed Error when IndexOutOfBoundsException in setDateofBirtch in Player.java 2022-05-12 23:21:17 +02:00
Roman SchenkandGitHub Enterprise 3315b7f9c1 Merge pull request #37 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs 
java doc and logging added to class Tournament
 2022-05-12 22:56:45 +02:00
Roman SchenkandGitHub Enterprise 1031c27650 Merge branch 'main' into logging_and_docs 2022-05-12 22:54:43 +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
Roman SchenkandGitHub Enterprise f8e4dadcfb Merge pull request #35 from PM2-IT21bWIN-ruiz-mach-krea/develop_footer 
Develop message footer
 2022-05-12 22:09:38 +02:00
Roman SchenkandGitHub Enterprise 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
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
schrom01 02456bc5bf fixed participanFormular and placesFormular 
#19
 2022-05-06 09:23:19 +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 SchenkandGitHub Enterprise 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 SchenkandGitHub Enterprise 4ae7cd2e5a Merge branch 'main' into FileIO 2022-05-01 22:42:02 +02:00
Roman SchenkandGitHub Enterprise 594299f3b2 Merge pull request #13 from PM2-IT21bWIN-ruiz-mach-krea/Participant_List 
Participant list
 2022-05-01 21:44:27 +02:00
Roman SchenkandGitHub Enterprise 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
Roman SchenkandGitHub Enterprise bd9dbef1de Merge pull request #11 from PM2-IT21bWIN-ruiz-mach-krea/TournamentList 
Tournament list
 2022-05-01 18:45:02 +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
Roman SchenkandGitHub Enterprise 2ce93cbf9b Merge pull request #8 from PM2-IT21bWIN-ruiz-mach-krea/fxml 
Fxml and Factory
 2022-04-30 18:09:54 +02:00
schrom01 6245e32f73 added pane to FXController.java 2022-04-30 18:03:11 +02:00
Roman SchenkandGitHub Enterprise a103174739 Delete app/build/tmp/compileJava directory 2022-04-30 18:01:35 +02:00
Roman SchenkandGitHub Enterprise 563c70a078 Delete .idea directory 2022-04-30 17:59:33 +02:00
Roman SchenkandGitHub Enterprise f8bf63a1d9 Delete .gradle directory 2022-04-30 17:58:39 +02:00
Roman SchenkandGitHub Enterprise 5660f85165 Delete .gradle directory 2022-04-30 17:57:29 +02:00
Roman SchenkandGitHub Enterprise c58fae060a Delete .idea directory 2022-04-30 17:56:40 +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
schrom01 cff22e9253 added file needed for FileIOTest 2022-04-29 08:29:10 +02:00
schrom01 509192b403 created FileIOTest and changed Exception Handling of File IO 2022-04-28 18:07:57 +02:00
schrom01 038030a3db Merge branch 'FileIO' into FileIO_Test 2022-04-28 14:58:49 +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 0164c286fb made Tournament not abstract. 2022-04-28 14:54:28 +02:00
schrom01 48fba22853 added Date of Birth to Player.java 2022-04-28 14:54:07 +02:00
schrom01 5d26137c8d made Tournament not abstract. 2022-04-28 14:50:45 +02:00
schrom01 61a778ad54 added Date of Birth to Player.java 2022-04-28 14:10:41 +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