Add tournament director field

api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt

@@ -127,6 +127,7 @@ object OpenGotha {
             shortName = genParams.shortName,
             startDate = genParams.beginDate.toLocalDate(),
             endDate = genParams.endDate.toLocalDate(),
+            director = genParams.director,
             country = "fr", // no country in opengotha format
             location = genParams.location,
             online = genParams.isBInternet ?: false,
@@ -298,7 +299,7 @@ object OpenGotha {
                 TimeSystem.TimeSystemType.JAPANESE -> "STDBYOYOMI"
                 TimeSystem.TimeSystemType.CANADIAN -> "CANBYOYOMI"
                 TimeSystem.TimeSystemType.FISCHER -> "FISCHER"
-            } }" director="" endDate="${tournament.endDate}" fischerTime="${tournament.timeSystem.increment}" genCountNotPlayedGamesAsHalfPoint="false" genMMBar="${
+            } }" director="${tournament.director}" endDate="${tournament.endDate}" fischerTime="${tournament.timeSystem.increment}" genCountNotPlayedGamesAsHalfPoint="false" genMMBar="${
                 displayRank(
                     if (tournament.pairing is MacMahon) tournament.pairing.mmBar else 8
                 ).uppercase(Locale.ROOT)

api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Tournament.kt

@@ -22,6 +22,7 @@ sealed class Tournament <P: Pairable>(
     val shortName: String,
     val startDate: LocalDate,
     val endDate: LocalDate,
+    val director: String,
     val country: String,
     val location: String,
     val online: Boolean,
@@ -128,6 +129,7 @@ class StandardTournament(
     shortName: String,
     startDate: LocalDate,
     endDate: LocalDate,
+    director: String,
     country: String,
     location: String,
     online: Boolean,
@@ -137,7 +139,7 @@ class StandardTournament(
     rules: Rules = Rules.FRENCH,
     gobanSize: Int = 19,
     komi: Double = 7.5
-): Tournament<Player>(id, type, name, shortName, startDate, endDate, country, location, online, timeSystem, rounds, pairing, rules, gobanSize, komi) {
+): Tournament<Player>(id, type, name, shortName, startDate, endDate, director, country, location, online, timeSystem, rounds, pairing, rules, gobanSize, komi) {
     override val players get() = _pairables
 }
 
@@ -149,6 +151,7 @@ class TeamTournament(
     shortName: String,
     startDate: LocalDate,
     endDate: LocalDate,
+    director: String,
     country: String,
     location: String,
     online: Boolean,
@@ -158,7 +161,7 @@ class TeamTournament(
     rules: Rules = Rules.FRENCH,
     gobanSize: Int = 19,
     komi: Double = 7.5
-): Tournament<TeamTournament.Team>(id, type, name, shortName, startDate, endDate, country, location, online, timeSystem, rounds, pairing, rules, gobanSize, komi) {
+): Tournament<TeamTournament.Team>(id, type, name, shortName, startDate, endDate, director, country, location, online, timeSystem, rounds, pairing, rules, gobanSize, komi) {
     companion object {}
     override val players = mutableMapOf<ID, Player>()
     val teams: MutableMap<ID, Team> = _pairables
@@ -207,6 +210,7 @@ fun Tournament.Companion.fromJson(json: Json.Object, default: Tournament<*>? = n
                 shortName = json.getString("shortName") ?: default?.shortName ?: badRequest("missing shortName"),
                 startDate = json.getString("startDate")?.let { LocalDate.parse(it) } ?: default?.startDate ?: badRequest("missing startDate"),
                 endDate = json.getString("endDate")?.let { LocalDate.parse(it) } ?: default?.endDate ?: badRequest("missing endDate"),
+                director = json.getString("director") ?: default?.director ?: "",
                 country = (json.getString("country") ?: default?.country ?: "fr").let { if (it.isEmpty()) "fr" else it },
                 location = json.getString("location") ?: default?.location ?: badRequest("missing location"),
                 online = json.getBoolean("online") ?: default?.online ?: false,
@@ -225,6 +229,7 @@ fun Tournament.Companion.fromJson(json: Json.Object, default: Tournament<*>? = n
                 shortName = json.getString("shortName") ?: default?.shortName ?: badRequest("missing shortName"),
                 startDate = json.getString("startDate")?.let { LocalDate.parse(it) } ?: default?.startDate ?: badRequest("missing startDate"),
                 endDate = json.getString("endDate")?.let { LocalDate.parse(it) } ?: default?.endDate ?: badRequest("missing endDate"),
+                director = json.getString("director") ?: default?.director ?: "",
                 country = json.getString("country") ?: default?.country ?: badRequest("missing country"),
                 location = json.getString("location") ?: default?.location ?: badRequest("missing location"),
                 online = json.getBoolean("online") ?: default?.online ?: false,
@@ -258,6 +263,7 @@ fun Tournament<*>.toJson() = Json.Object(
     "shortName" to shortName,
     "startDate" to startDate.toString(),
     "endDate" to endDate.toString(),
+    "director" to director,
     "country" to country,
     "location" to location,
     "online" to online,

view-webapp/src/main/webapp/WEB-INF/translations/fr

@@ -32,6 +32,7 @@ Crit	Crit
 Ctr	Pays
 Dates	Dates
 Delete	Supprimer
+Director	Directeur
 Download	Télécharger
 Download the standalone web interface module which suits your need, then follow	Télécharger le module d’interface web qui correspond à vos besoins, puis suivez
 Edit	Éditer

view-webapp/src/main/webapp/js/tour-information.inc.js

@@ -160,6 +160,7 @@ onLoad(() => {
       shortName: form.val('shortName'),
       startDate: parseDate(form.val('startDate')),
       endDate: parseDate(form.val('endDate')),
+      director: form.val('director'),
       type: form.val('type'),
       rounds: form.val('rounds'),
       country: form.val('country'),

view-webapp/src/main/webapp/tour-information.inc.html

@@ -14,16 +14,21 @@
         </div>
       </div>
       <div class="fields">
-        <div class="ten wide field">
+        <div class="eight wide field">
           <label>Dates</label>
           <span id="date-range">
-          from
+            from
+            <span class="info"></span>
+            <input type="text" name="startDate" required class="date" placeholder="start date" #if($tour) value="$tour.startDate" #end/>
+            to
+            <span class="info"></span>
+            <input type="text" name="endDate" required class="date" placeholder="end date" #if($tour) value="$tour.endDate" #end/>
+          </span>
+        </div>
+        <div class="eight wide field">
+          <label>Director</label>
           <span class="info"></span>
-          <input type="text" name="startDate" required class="date" placeholder="start date" #if($tour) value="$tour.startDate" #end/>
-          to
-          <span class="info"></span>
-          <input type="text" name="endDate" required class="date" placeholder="end date" #if($tour) value="$tour.endDate" #end/>
-        </span>
+          <input type="text" name="director" placeholder="Tournament director" value="$!tour.director"/>
         </div>
       </div>
       <div class="two stackable fields">