Commit Graph

147 Commits

Author SHA1 Message Date
schrom01 003f065662 fixed merge problem. 2022-05-13 23:29:39 +02:00
schrom01 7114097601 fixed merge problem. 2022-05-13 22:53:49 +02:00
Roman Schenk bbaf70f9af Merge branch 'main' into logging_and_docs 2022-05-13 22:52:07 +02:00
Leonardo Brandenberger 56030d0baa Merge remote-tracking branch 'origin/logging_and_docs' into logging_and_docs 2022-05-13 22:43:07 +02:00
Leonardo Brandenberger 52b79ed501 PlacesFormularController JavaDoc and Logger 2022-05-13 22:42:51 +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
Leonardo Brandenberger f94572c1fe Fixed small logger error 2022-05-13 22:13:50 +02:00
Leonardo Brandenberger 023cb5a99f Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:11:03 +02:00
Leonardo Brandenberger 784cbfdd76 Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:10:41 +02:00
Leonardo Brandenberger c7d9fd0908 FileIOTest Java Doc and also started with Factory and Factory Decorator 2022-05-13 21:15:31 +02:00
Andrin Fassbind ac68af3638 extend dictionary 2022-05-13 20:53:33 +02:00
Andrin Fassbind d530d89db4 edit layout 2022-05-13 19:20:07 +02:00
Andrin Fassbind ddae1e297f solve bug PlacesFormularController id name not valid 2022-05-13 19:18:51 +02:00
Leonardo Brandenberger 459cd1bec8 Code Cleanup and Java Doc and logging 2022-05-13 19:09:51 +02:00
Andrin Fassbind 1b22506047 solve bug game teilnehmername 2022-05-13 19:00:08 +02:00
Andrin Fassbind dc54eaa872 Merge remote-tracking branch 'origin/main' into language_Dev 2022-05-13 18:57:39 +02:00
Andrin Fassbind c4f0a5335d Create Language Change 2022-05-13 18:57:27 +02:00
Leonardo Brandenberger b49ca9172d Code Cleanup in fileio, invalidnameexception and observers 2022-05-13 18:36:08 +02:00
Leonardo Brandenberger 6de4978145 Java Doc, Logging and Cleanup in Log Configuration. 2022-05-13 18:21:52 +02:00
Leonardo Brandenberger 3c3c6c8510 Merge pull request #51 from PM2-IT21bWIN-ruiz-mach-krea/develop_footer
Develop footer
2022-05-13 17:52:44 +02:00
schrom01 a1b73e22ca removed "äöü" from error messages. 2022-05-13 17:51:04 +02:00
Leonardo Brandenberger 7fd058a528 CodeCleanup in Player, Tournament, Place, Person, Participant and Team 2022-05-13 17:48:42 +02:00
Leonardo Brandenberger f38b8aff16 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:16:33 +02:00
schrom01 11d6ca1852 changed error Message numberOfParticipants. 2022-05-13 17:10:32 +02:00
Leonardo Brandenberger 67003ad772 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:03:23 +02:00
schrom01 a78d1d9de7 changed error Message numberOfParticipants. 2022-05-13 16:51:17 +02:00
Leonardo Brandenberger e0a9d963f6 CodeCleanup in Participant, Person and Team 2022-05-13 16:43:33 +02:00
Roman Schenk f8d12dafa7 Merge branch 'main' into logging_and_docs 2022-05-13 16:39:36 +02:00
Leonardo Brandenberger 726410f677 Added Java Doc and Logger to Person 2022-05-13 16:12:55 +02:00
Roman Schenk 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
Andrin Fassbind 7dea7919c5 AlertDelete shortened code 2022-05-13 16:12:06 +02:00
Andrin Fassbind 55517a531e Create alert popup if user wants to create new game schedule 2022-05-13 16:04:19 +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
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