diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/TournamentHandler.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/TournamentHandler.kt index 3e7f5e5..acd3d03 100644 --- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/TournamentHandler.kt +++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/TournamentHandler.kt @@ -64,8 +64,7 @@ object TournamentHandler: PairgothApiHandler { clear() putAll(tournament.games(round)) } - Store.replaceTournament(updated) - tournament.dispatchEvent(tournamentUpdated, tournament.toJson()) + updated.dispatchEvent(tournamentUpdated, updated.toJson()) return Json.Object("success" to true) } diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/store/FileStore.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/store/FileStore.kt index 4dd5566..684c35a 100644 --- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/store/FileStore.kt +++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/store/FileStore.kt @@ -98,8 +98,9 @@ class FileStore(pathStr: String): StoreImplementation { override fun replaceTournament(tournament: Tournament<*>) { val filename = tournament.filename() val file = path.resolve(filename).toFile() - if (!file.exists()) throw Error("File $filename does not exist") - file.renameTo(path.resolve(filename + "-${timestamp}").toFile()) + if (file.exists()) { + file.renameTo(path.resolve(filename + "-${timestamp}").toFile()) + } addTournament(tournament) } diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index 2f6ea12..170d852 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -198,6 +198,12 @@ text-align: center; } + .form-actions { + display: flex; + flex-flow: row wrap; + justify-content: space-between; + } + input[type="number"] { padding: 0.2em 0.1em 0.2em 1em; vertical-align: baseline; diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss index e69de29..fc8ef2b 100644 --- a/view-webapp/src/main/sass/tour.scss +++ b/view-webapp/src/main/sass/tour.scss @@ -0,0 +1,22 @@ +@layer pairgoth { + #tournament-infos { + input, select, .edit { + display: none; + } + &.edit { + input, select, .edit { + display: initial; + } + .info, #edit { + display: none; + } + } + } + div.field:not(.hidden) { + display: flex; + flex-flow: column nowrap; + justify-content: space-between; + margin: 1px; + background-color: #eeeeee; + } +} diff --git a/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html b/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html index 662700e..9d7ea7b 100644 --- a/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html +++ b/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html @@ -68,6 +68,9 @@ +#if($css) + +#end