.editorconfig

@@ -10,9 +10,6 @@ max_line_length = 88
 [*.py]
 indent_style = space
 
-[*.{jsx,tsx}]
-indent_size = 2
-
 [*.{json,md,rst,ini,yml,yaml}]
 indent_style = space
 indent_size = 2

Makefile

@@ -25,11 +25,10 @@ build-server:
 build: build-ui build-server
 
 # Protobuf-API-Definition herunterladen und Code generieren
-download-proto:
+protoc:
 	wget "https://code.thetadev.de/TSGRain/Controller/raw/branch/main/proto/tsgrain.proto" -O ${PROTO_FILE}
 	echo 'option go_package = "code.thetadev.de/TSGRain/WebUI/src/tsgrain_rpc";' >> ${PROTO_FILE}
 
-protoc:
 	protoc --go_out ${SRC_DIR}/tsgrain_rpc --go_opt=paths=source_relative \
 	  --go-grpc_out ${SRC_DIR}/tsgrain_rpc --go-grpc_opt=paths=source_relative \
 	  ${PROTO_FILE}

proto/tsgrain.proto

@@ -6,13 +6,7 @@ import "google/protobuf/wrappers.proto";
 service TSGRain {
     // Starte eine neue Bewässerungsaufgabe (oder stoppe eine laufende, wenn
     // diese bereits läuft).
-    rpc RequestTask(TaskRequest) returns (TaskRequestResult) {}
+    rpc StartTask(TaskRequest) returns (TaskRequestResult) {}
-
-    // Starte eine Bewässerungsaufgabe
-    rpc StartTask(TaskStart) returns (google.protobuf.BoolValue) {}
-
-    // Stoppe eine Bewässerungsaufgabe
-    rpc StopTask(TaskStop) returns (google.protobuf.BoolValue) {}
 
     // Gibt sämtliche in der Warteschlange befindlichen Bewässerungsaufgaben zurück.
     rpc GetTasks(google.protobuf.Empty) returns (TaskList) {}
@@ -36,12 +30,6 @@ service TSGRain {
     // Lösche den Bewässerungsjob mit der gegebenen ID.
     rpc DeleteJob(JobID) returns (google.protobuf.Empty) {}
 
-    // Aktiviere Bewässerungsjob
-    rpc EnableJob(JobID) returns (google.protobuf.Empty) {}
-
-    // Deaktiviere Bewässerungsjob
-    rpc DisableJob(JobID) returns (google.protobuf.Empty) {}
-
     // Gibt zurück, ob der Automatikmodus aktiviert ist.
     rpc GetAutoMode(google.protobuf.Empty) returns (google.protobuf.BoolValue) {}
 
@@ -49,13 +37,10 @@ service TSGRain {
     rpc SetAutoMode(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
 
     // Datum/Uhrzeit/Zeitzone abrufen
-    rpc GetSystemTime(google.protobuf.Empty) returns (SystemTime) {}
+    rpc GetConfigTime(google.protobuf.Empty) returns (ConfigTime) {}
 
-    // Datum/Uhrzeit einstellen
+    // Datum/Uhrzeit/Zeitzone einstellen
-    rpc SetSystemTime(Timestamp) returns (google.protobuf.Empty) {}
+    rpc SetConfigTime(ConfigTime) returns (google.protobuf.Empty) {}
-
-    // Zeitzone einstellen
-    rpc SetSystemTimezone(google.protobuf.StringValue) returns (google.protobuf.Empty) {}
 
     // Standardzeit bei manueller Bewässerung abrufen
     rpc GetDefaultIrrigationTime(google.protobuf.Empty) returns (google.protobuf.Int32Value) {}
@@ -91,18 +76,6 @@ message TaskRequestResult {
     bool stopped = 2;
 }
 
-message TaskStart {
-    TaskSource source = 1;
-    int32 zone_id = 2;
-    int32 duration = 3;
-    bool queuing = 4;
-}
-
-message TaskStop {
-    TaskSource source = 1;
-    int32 zone_id = 2;
-}
-
 message Task {
     TaskSource source = 1;
     int32 zone_id = 2;
@@ -134,7 +107,7 @@ message JobList {
     repeated Job jobs = 1;
 }
 
-message SystemTime {
+message ConfigTime {
     Timestamp datetime = 1;
     string timezone = 2;
 }

src/model/options.go

@@ -7,7 +7,7 @@ package model
 //swagger:model AutoMode
 type AutoMode struct {
 	// required: true
-	State bool `json:"state"`
+	State bool `json:"state" binding:"required"`
 }
 
 // DefaultIrrigationTime model
@@ -20,32 +20,12 @@ type DefaultIrrigationTime struct {
 	Time int32 `json:"time" binding:"required"`
 }
 
-// Timestamp model
+// ConfigTime model
-//
-// Zeitstempel
-//
-//swagger:model Timestamp
-type Timestamp struct {
-	// required: true
-	Time int64 `json:"time" binding:"required"`
-}
-
-// Timezone model
-//
-// Systemzeitzone
-//
-//swagger:model Timezone
-type Timezone struct {
-	// required: true
-	Timezone string `json:"timezone" binding:"required"`
-}
-
-// SystemTime model
 //
 // Aktuelle Systemzeit/Zeitzone
 //
-//swagger:model SystemTime
+//swagger:model ConfigTime
-type SystemTime struct {
+type ConfigTime struct {
 	// Aktuelle Systemzeit
 	//
 	// required: true

src/model/task.go

@@ -54,7 +54,12 @@ type TaskList struct {
 	AutoMode bool `json:"auto_mode"`
 }
 
-//swagger:model ZoneID
+// TaskRequestResult model
-type ZoneID struct {
+//
-	Id int32 `json:"id" binding:"required"`
+// TaskRequestResult wird beim Starten eines Tasks zurückgegeben
+//
+//swagger:model TaskRequestResult
+type TaskRequestResult struct {
+	Started bool
+	Stopped bool
 }

src/server/server.go

@@ -14,7 +14,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
 	"code.thetadev.de/TSGRain/WebUI/src/config"
@@ -85,27 +84,19 @@ func (srv *WebUIServer) getRouter() *gin.Engine {
 		api.GET("/panic", srv.controllerPanic)
 	}
 
-	api.POST("/task/start", srv.controllerStartTask)
+	api.POST("/task/manual", srv.controllerStartTask)
-	api.POST("/task/stop", srv.controllerStopTask)
-
-	api.GET("/tasks", srv.controllerGetTasks)
 
 	api.GET("/jobs", srv.controllerGetJobs)
-
-	api.GET("/job", srv.controllerGetJob)
 	api.POST("/job", srv.controllerCreateJob)
 	api.PUT("/job", srv.controllerUpdateJob)
 	api.DELETE("/job", srv.controllerDeleteJob)
 
 	api.GET("config/auto", srv.controllerGetAutoMode)
 	api.POST("config/auto", srv.controllerSetAutoMode)
-
 	api.GET("config/defaultIrrigationTime", srv.controllerGetDefaultIrrigationTime)
 	api.POST("config/defaultIrrigationTime", srv.controllerSetDefaultIrrigationTime)
-
+	api.GET("config/time", srv.controllerGetConfigTime)
-	api.GET("config/time", srv.controllerGetSystemTime)
+	api.POST("config/time", srv.controllerSetConfigTime)
-	api.POST("config/time", srv.controllerSetSystemTime)
-	api.POST("config/timezone", srv.controllerSetSystemTimezone)
 
 	// UI
 	uiGroup := router.Group("/", middleware.Compression(
@@ -143,122 +134,85 @@ func (srv *WebUIServer) Run() error {
 	return err
 }
 
-// swagger:operation POST /task/start startTask
+// swagger:operation POST /task/manual startManualTask
 //
-// Starte eine neue manuelle Bewässerungsaufgabe
+// Starte/stoppe manuell eine neue Bewässerungsaufgabe
-// mit der eingestellten Standardzeit.
 //
 // ---
 // consumes: [application/json]
 // produces: [application/json]
 // parameters:
-// - name: zoneId
+// - in: body
-//   in: body
+//   name: taskRequest
-//   description: ZoneID
 //   schema:
-//     $ref: '#/definitions/ZoneID'
+//     type: object
+//     properties:
+//       zone_id:
+//         description: Nummer der Bewässerungszone
+//         type: integer
+//       duration:
+//         description: "Bewässerungsdauer in Sekunden (0: Standarddauer)"
+//         type: integer
+//       queuing:
+//         description: |
+//           Aufgabe in die Warteschlange einreihen,
+//           wenn sie nicht sofort ausgeführt werden kann.
+//         type: boolean
+//       cancelling:
+//         description: |
+//           Aufgabe stoppen/aus der Warteschlange entfernen,
+//           wenn sie bereits läuft oder sich in der Warteschlange befindet.
+//         type: boolean
+//     required:
+//       - zone_id
+//       - duration
+//       - queuing
+//       - cancelling
 // responses:
 //   200:
-//     description: OK
+//     description: Bewässerungsaufgabe erfolgreich gestarted/gestoppt
 //     schema:
 //       $ref: "#/definitions/StatusMessage"
+//   400:
+//     description: Bewässerungsaufgabe läuft schon und kann nicht gestoppt werden.
+//     schema:
+//       $ref: "#/definitions/Error"
 //   500:
 //     description: Serverfehler
 //     schema:
 //       $ref: "#/definitions/Error"
 func (srv *WebUIServer) controllerStartTask(c *gin.Context) {
-	var zoneId model.ZoneID
+	var params struct {
-	if err := c.ShouldBindJSON(&zoneId); err != nil {
+		ZoneID     int32 `json:"zone_id"`
+		Duration   int32 `json:"duration"`
+		Queuing    bool  `json:"queuing"`
+		Cancelling bool  `json:"cancelling"`
+	}
+
+	if err := c.ShouldBindJSON(&params); err != nil {
 		log.Error().Err(err).Msg("StartTask input error")
 		writeStatus(c, http.StatusBadRequest, "invalid input data")
 		return
 	}
+	if !srv.validateZoneID(params.ZoneID) {
+		writeStatus(c, http.StatusBadRequest, "invalid zone_id")
+		return
+	}
 
-	ok, err := srv.rpc.StartManualTask(zoneId.Id, 0)
+	res, err := srv.rpc.StartManualTask(
+		params.ZoneID, params.Duration, params.Queuing, params.Cancelling)
 	if err != nil {
-		log.Error().Err(err).Msg("StartTask")
+		log.Error().Err(err).Msg("StartManualTask")
 		writeStatus(c, http.StatusInternalServerError, "error starting task")
 		return
 	}
 
-	if !ok {
+	statusCode := 200
-		log.Error().Msg("StartTask: alrady running")
+	if !res.Started && !res.Stopped {
-		writeStatus(c, http.StatusBadRequest, "task already running")
+		statusCode = 400
-		return
 	}
 
-	writeStatus(c, http.StatusOK, "task started")
+	c.JSON(statusCode, res)
-}
-
-// swagger:operation POST /task/stop stopTask
-//
-// Stoppe eine manuelle Bewässerungsaufgabe.
-//
-// ---
-// consumes: [application/json]
-// produces: [application/json]
-// parameters:
-// - name: zoneId
-//   in: body
-//   description: ZoneID
-//   schema:
-//     $ref: '#/definitions/ZoneID'
-// responses:
-//   200:
-//     description: OK
-//     schema:
-//       $ref: "#/definitions/StatusMessage"
-//   500:
-//     description: Serverfehler
-//     schema:
-//       $ref: "#/definitions/Error"
-func (srv *WebUIServer) controllerStopTask(c *gin.Context) {
-	var zoneId model.ZoneID
-	if err := c.ShouldBindJSON(&zoneId); err != nil {
-		log.Error().Err(err).Msg("StopTask input error")
-		writeStatus(c, http.StatusBadRequest, "invalid input data")
-		return
-	}
-
-	ok, err := srv.rpc.StopManualTask(zoneId.Id)
-	if err != nil {
-		log.Error().Err(err).Msg("StopTask")
-		writeStatus(c, http.StatusInternalServerError, "error stopping task")
-		return
-	}
-	if !ok {
-		log.Error().Msg("StopTask: no task to stop")
-		writeStatus(c, http.StatusBadRequest, "no task to stop")
-		return
-	}
-
-	writeStatus(c, http.StatusOK, "task stopped")
-}
-
-// swagger:operation GET /tasks getTasks
-//
-// Rufe alle momentan laufenden Bewässerungsaufgaben ab.
-//
-// ---
-// produces: [application/json]
-// responses:
-//   200:
-//     description: Liste der Bewässerungsaufgaben
-//     schema:
-//	     "$ref": "#/definitions/TaskList"
-//   500:
-//     description: Serverfehler
-//     schema:
-//       "$ref": "#/definitions/Error"
-func (srv *WebUIServer) controllerGetTasks(c *gin.Context) {
-	tasks, err := srv.rpc.GetTasks()
-	if err != nil {
-		log.Error().Err(err).Msg("GetTasks")
-		writeStatus(c, http.StatusInternalServerError, "error getting tasks")
-		return
-	}
-
-	c.JSON(200, tasks)
 }
 
 // swagger:operation GET /jobs getJobs
@@ -309,16 +263,17 @@ func (srv *WebUIServer) controllerGetJobs(c *gin.Context) {
 //     schema:
 //       $ref: "#/definitions/Error"
 func (srv *WebUIServer) controllerGetJob(c *gin.Context) {
-	idStr := c.Query("id")
+	var params struct {
+		Id int32 `uri:"id" binding:"required"`
+	}
 
-	id, err := strconv.ParseInt(idStr, 10, 32)
+	if err := c.ShouldBindUri(&params); err != nil {
-	if err != nil {
 		log.Error().Err(err).Msg("GetJob input error")
 		writeStatus(c, http.StatusBadRequest, "invalid input data")
 		return
 	}
 
-	job, err := srv.rpc.GetJob(int32(id))
+	job, err := srv.rpc.GetJob(params.Id)
 	if err != nil {
 		log.Error().Err(err).Msg("GetJob")
 		writeStatus(c, http.StatusInternalServerError, "error getting job")
@@ -418,11 +373,10 @@ func (srv *WebUIServer) controllerUpdateJob(c *gin.Context) {
 // consumes: [application/json]
 // produces: [application/json]
 // parameters:
-// - name: jobId
+// - name: id
 //   in: body
-//   description: JobID
 //   schema:
-//     $ref: '#/definitions/JobID'
+//     type: integer
 // responses:
 //   200:
 //     description: OK
@@ -488,7 +442,12 @@ func (srv *WebUIServer) controllerGetAutoMode(c *gin.Context) {
 //   name: state
 //   description: Zustand des Automatikmodus
 //   schema:
-//     $ref: '#/definitions/AutoMode'
+//     type: object
+//     properties:
+//       state:
+//         type: boolean
+//     required:
+//       - state
 // responses:
 //   200:
 //     description: OK
@@ -516,7 +475,7 @@ func (srv *WebUIServer) controllerSetAutoMode(c *gin.Context) {
 	writeStatus(c, http.StatusOK, "set autoMode")
 }
 
-// swagger:operation GET /config/time getSystemTime
+// swagger:operation GET /config/time getConfigTime
 //
 // Rufe die aktuelle Systemzeit/Zeitzone ab
 //
@@ -526,34 +485,34 @@ func (srv *WebUIServer) controllerSetAutoMode(c *gin.Context) {
 //   200:
 //     description: Aktuelle Systemzeit/Zeitzone
 //     schema:
-//       $ref: "#/definitions/SystemTime"
+//       $ref: "#/definitions/ConfigTime"
 //   500:
 //     description: Serverfehler
 //     schema:
 //       $ref: "#/definitions/Error"
-func (srv *WebUIServer) controllerGetSystemTime(c *gin.Context) {
+func (srv *WebUIServer) controllerGetConfigTime(c *gin.Context) {
-	systemTime, err := srv.rpc.GetSystemTime()
+	configTime, err := srv.rpc.GetConfigTime()
 	if err != nil {
-		log.Error().Err(err).Msg("GetSystemTime")
+		log.Error().Err(err).Msg("GetConfigTime")
-		writeStatus(c, http.StatusInternalServerError, "error getting system time")
+		writeStatus(c, http.StatusInternalServerError, "error setting configTime")
 		return
 	}
 
-	c.JSON(200, systemTime)
+	c.JSON(200, configTime)
 }
 
-// swagger:operation POST /config/time setSystemTime
+// swagger:operation POST /config/time setConfigTime
 //
-// Systemzeit einstellen
+// Automatikmodus aktivieren/deaktivieren
 //
 // ---
 // consumes: [application/json]
 // produces: [application/json]
 // parameters:
 // - in: body
-//   name: timestamp
+//   name: configTime
 //   schema:
-//     $ref: "#/definitions/Timestamp"
+//     $ref: "#/definitions/ConfigTime"
 // responses:
 //   200:
 //     description: OK
@@ -563,61 +522,22 @@ func (srv *WebUIServer) controllerGetSystemTime(c *gin.Context) {
 //     description: Serverfehler
 //     schema:
 //       $ref: "#/definitions/Error"
-func (srv *WebUIServer) controllerSetSystemTime(c *gin.Context) {
+func (srv *WebUIServer) controllerSetConfigTime(c *gin.Context) {
-	var systemTime model.Timestamp
+	var configTime model.ConfigTime
-	if err := c.ShouldBindJSON(&systemTime); err != nil {
+	if err := c.ShouldBindJSON(&configTime); err != nil {
-		log.Error().Err(err).Msg("SetSystemTime input error")
+		log.Error().Err(err).Msg("SetConfigTime input error")
 		writeStatus(c, http.StatusBadRequest, "invalid input data")
 		return
 	}
 
-	err := srv.rpc.SetSystemTime(systemTime.Time)
+	err := srv.rpc.SetConfigTime(configTime)
 	if err != nil {
-		log.Error().Err(err).Msg("SetSystemTime")
+		log.Error().Err(err).Msg("SetConfigTime")
-		writeStatus(c, http.StatusInternalServerError, "error setting systemTime")
+		writeStatus(c, http.StatusInternalServerError, "error setting configTime")
 		return
 	}
 
-	writeStatus(c, http.StatusOK, "set systemTime")
+	writeStatus(c, http.StatusOK, "set configTime")
-}
-
-// swagger:operation POST /config/timezone setSystemTimezone
-//
-// Systemzeitzone einstellen
-//
-// ---
-// consumes: [application/json]
-// produces: [application/json]
-// parameters:
-// - in: body
-//   name: timezone
-//   schema:
-//     $ref: "#/definitions/Timezone"
-// responses:
-//   200:
-//     description: OK
-//     schema:
-//       $ref: "#/definitions/StatusMessage"
-//   500:
-//     description: Serverfehler
-//     schema:
-//       $ref: "#/definitions/Error"
-func (srv *WebUIServer) controllerSetSystemTimezone(c *gin.Context) {
-	var timezone model.Timezone
-	if err := c.ShouldBindJSON(&timezone); err != nil {
-		log.Error().Err(err).Msg("SetSystemTimezone input error")
-		writeStatus(c, http.StatusBadRequest, "invalid input data")
-		return
-	}
-
-	err := srv.rpc.SetSystemTimezone(timezone.Timezone)
-	if err != nil {
-		log.Error().Err(err).Msg("SetSystemTimezone")
-		writeStatus(c, http.StatusInternalServerError, "error setting systemTimezone")
-		return
-	}
-
-	writeStatus(c, http.StatusOK, "set systemTimezone")
 }
 
 // swagger:operation GET /config/defaultIrrigationTime getDefaultIrrigationTime
@@ -644,7 +564,7 @@ func (srv *WebUIServer) controllerGetDefaultIrrigationTime(c *gin.Context) {
 		return
 	}
 
-	c.JSON(200, model.DefaultIrrigationTime{Time: defaultIrrigationTime})
+	c.JSON(200, defaultIrrigationTime)
 }
 
 // swagger:operation POST /config/defaultIrrigationTime setDefaultIrrigationTime

src/server/swagger/swagger.yaml

@@ -8,6 +8,21 @@ definitions:
       - state
     title: AutoMode model
     type: object
+  ConfigTime:
+    description: Aktuelle Systemzeit/Zeitzone
+    properties:
+      time:
+        description: Aktuelle Systemzeit
+        format: int64
+        type: integer
+      timezone:
+        description: Aktuelle Zeitzone
+        type: string
+    required:
+      - time
+      - timezone
+    title: ConfigTime model
+    type: object
   DefaultIrrigationTime:
     description: Manuelle Bewässerungszeit in Sekunden
     properties:
@@ -143,21 +158,6 @@ definitions:
       - msg
     title: StatusMessage model
     type: object
-  SystemTime:
-    description: Aktuelle Systemzeit/Zeitzone
-    properties:
-      time:
-        description: Aktuelle Systemzeit
-        format: int64
-        type: integer
-      timezone:
-        description: Aktuelle Zeitzone
-        type: string
-    required:
-      - time
-      - timezone
-    title: SystemTime model
-    type: object
   Task:
     description: Task stellt eine Bewässerungsaufgabe dar.
     properties:
@@ -216,30 +216,14 @@ definitions:
       - auto_mode
     title: TaskList model
     type: object
-  Timestamp:
+  TaskRequestResult:
-    description: Zeitstempel
+    description: TaskRequestResult wird beim Starten eines Tasks zurückgegeben
     properties:
-      time:
+      Started:
-        format: int64
+        type: boolean
-        type: integer
+      Stopped:
-    required:
+        type: boolean
-      - time
+    title: TaskRequestResult model
-    title: Timestamp model
-    type: object
-  Timezone:
-    description: Systemzeitzone
-    properties:
-      timezone:
-        type: string
-    required:
-      - timezone
-    title: Timezone model
-    type: object
-  ZoneID:
-    properties:
-      id:
-        format: int32
-        type: integer
     type: object
 info:
   description: REST API for the TSGRain WebUI
@@ -273,7 +257,12 @@ paths:
           in: body
           name: state
           schema:
-            $ref: "#/definitions/AutoMode"
+            properties:
+              state:
+                type: boolean
+            required:
+              - state
+            type: object
       produces:
         - application/json
       responses:
@@ -324,14 +313,14 @@ paths:
   /config/time:
     get:
       description: Rufe die aktuelle Systemzeit/Zeitzone ab
-      operationId: getSystemTime
+      operationId: getConfigTime
       produces:
         - application/json
       responses:
         "200":
           description: Aktuelle Systemzeit/Zeitzone
           schema:
-            $ref: "#/definitions/SystemTime"
+            $ref: "#/definitions/ConfigTime"
         "500":
           description: Serverfehler
           schema:
@@ -339,35 +328,13 @@ paths:
     post:
       consumes:
         - application/json
-      description: Systemzeit einstellen
+      description: Automatikmodus aktivieren/deaktivieren
-      operationId: setSystemTime
+      operationId: setConfigTime
       parameters:
         - in: body
-          name: timestamp
+          name: configTime
           schema:
-            $ref: "#/definitions/Timestamp"
+            $ref: "#/definitions/ConfigTime"
-      produces:
-        - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: "#/definitions/StatusMessage"
-        "500":
-          description: Serverfehler
-          schema:
-            $ref: "#/definitions/Error"
-  /config/timezone:
-    post:
-      consumes:
-        - application/json
-      description: Systemzeitzone einstellen
-      operationId: setSystemTimezone
-      parameters:
-        - in: body
-          name: timezone
-          schema:
-            $ref: "#/definitions/Timezone"
       produces:
         - application/json
       responses:
@@ -385,11 +352,10 @@ paths:
         - application/json
       operationId: deleteJob
       parameters:
-        - description: JobID
+        - in: body
-          in: body
+          name: id
-          name: jobId
           schema:
-            $ref: "#/definitions/JobID"
+            type: integer
       produces:
         - application/json
       responses:
@@ -483,69 +449,54 @@ paths:
           schema:
             $ref: "#/definitions/Error"
       summary: Rufe alle gespeicherten Zeitpläne ab.
-  /task/start:
+  /task/manual:
     post:
       consumes:
         - application/json
-      description: |-
+      description: Starte/stoppe manuell eine neue Bewässerungsaufgabe
-        Starte eine neue manuelle Bewässerungsaufgabe
+      operationId: startManualTask
-        mit der eingestellten Standardzeit.
-      operationId: startTask
       parameters:
-        - description: ZoneID
+        - in: body
-          in: body
+          name: taskRequest
-          name: zoneId
           schema:
-            $ref: "#/definitions/ZoneID"
+            properties:
+              cancelling:
+                description: |
+                  Aufgabe stoppen/aus der Warteschlange entfernen,
+                  wenn sie bereits läuft oder sich in der Warteschlange befindet.
+                type: boolean
+              duration:
+                description: "Bewässerungsdauer in Sekunden (0: Standarddauer)"
+                type: integer
+              queuing:
+                description: |
+                  Aufgabe in die Warteschlange einreihen,
+                  wenn sie nicht sofort ausgeführt werden kann.
+                type: boolean
+              zone_id:
+                description: Nummer der Bewässerungszone
+                type: integer
+            required:
+              - zone_id
+              - duration
+              - queuing
+              - cancelling
+            type: object
       produces:
         - application/json
       responses:
         "200":
-          description: OK
+          description: Bewässerungsaufgabe erfolgreich gestarted/gestoppt
           schema:
             $ref: "#/definitions/StatusMessage"
+        "400":
+          description: Bewässerungsaufgabe läuft schon und kann nicht gestoppt werden.
+          schema:
+            $ref: "#/definitions/Error"
         "500":
           description: Serverfehler
           schema:
             $ref: "#/definitions/Error"
-  /task/stop:
-    post:
-      consumes:
-        - application/json
-      operationId: stopTask
-      parameters:
-        - description: ZoneID
-          in: body
-          name: zoneId
-          schema:
-            $ref: "#/definitions/ZoneID"
-      produces:
-        - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: "#/definitions/StatusMessage"
-        "500":
-          description: Serverfehler
-          schema:
-            $ref: "#/definitions/Error"
-      summary: Stoppe eine manuelle Bewässerungsaufgabe.
-  /tasks:
-    get:
-      operationId: getTasks
-      produces:
-        - application/json
-      responses:
-        "200":
-          description: Liste der Bewässerungsaufgaben
-          schema:
-            $ref: "#/definitions/TaskList"
-        "500":
-          description: Serverfehler
-          schema:
-            $ref: "#/definitions/Error"
-      summary: Rufe alle momentan laufenden Bewässerungsaufgaben ab.
 schemes:
   - http
   - https

src/tsgrain_rpc/proto/tsgrain.pb.go

@@ -251,132 +251,6 @@ func (x *TaskRequestResult) GetStopped() bool {
 	return false
 }
 
-type TaskStart struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Source   TaskSource `protobuf:"varint,1,opt,name=source,proto3,enum=TaskSource" json:"source,omitempty"`
-	ZoneId   int32      `protobuf:"varint,2,opt,name=zone_id,json=zoneId,proto3" json:"zone_id,omitempty"`
-	Duration int32      `protobuf:"varint,3,opt,name=duration,proto3" json:"duration,omitempty"`
-	Queuing  bool       `protobuf:"varint,4,opt,name=queuing,proto3" json:"queuing,omitempty"`
-}
-
-func (x *TaskStart) Reset() {
-	*x = TaskStart{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TaskStart) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TaskStart) ProtoMessage() {}
-
-func (x *TaskStart) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TaskStart.ProtoReflect.Descriptor instead.
-func (*TaskStart) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *TaskStart) GetSource() TaskSource {
-	if x != nil {
-		return x.Source
-	}
-	return TaskSource_MANUAL
-}
-
-func (x *TaskStart) GetZoneId() int32 {
-	if x != nil {
-		return x.ZoneId
-	}
-	return 0
-}
-
-func (x *TaskStart) GetDuration() int32 {
-	if x != nil {
-		return x.Duration
-	}
-	return 0
-}
-
-func (x *TaskStart) GetQueuing() bool {
-	if x != nil {
-		return x.Queuing
-	}
-	return false
-}
-
-type TaskStop struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Source TaskSource `protobuf:"varint,1,opt,name=source,proto3,enum=TaskSource" json:"source,omitempty"`
-	ZoneId int32      `protobuf:"varint,2,opt,name=zone_id,json=zoneId,proto3" json:"zone_id,omitempty"`
-}
-
-func (x *TaskStop) Reset() {
-	*x = TaskStop{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TaskStop) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TaskStop) ProtoMessage() {}
-
-func (x *TaskStop) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TaskStop.ProtoReflect.Descriptor instead.
-func (*TaskStop) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *TaskStop) GetSource() TaskSource {
-	if x != nil {
-		return x.Source
-	}
-	return TaskSource_MANUAL
-}
-
-func (x *TaskStop) GetZoneId() int32 {
-	if x != nil {
-		return x.ZoneId
-	}
-	return 0
-}
-
 type Task struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -392,7 +266,7 @@ type Task struct {
 func (x *Task) Reset() {
 	*x = Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[5]
+		mi := &file_proto_tsgrain_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -405,7 +279,7 @@ func (x *Task) String() string {
 func (*Task) ProtoMessage() {}
 
 func (x *Task) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[5]
+	mi := &file_proto_tsgrain_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -418,7 +292,7 @@ func (x *Task) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Task.ProtoReflect.Descriptor instead.
 func (*Task) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{5}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *Task) GetSource() TaskSource {
@@ -469,7 +343,7 @@ type TaskList struct {
 func (x *TaskList) Reset() {
 	*x = TaskList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[6]
+		mi := &file_proto_tsgrain_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -482,7 +356,7 @@ func (x *TaskList) String() string {
 func (*TaskList) ProtoMessage() {}
 
 func (x *TaskList) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[6]
+	mi := &file_proto_tsgrain_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -495,7 +369,7 @@ func (x *TaskList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TaskList.ProtoReflect.Descriptor instead.
 func (*TaskList) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{6}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *TaskList) GetTasks() []*Task {
@@ -535,7 +409,7 @@ type Job struct {
 func (x *Job) Reset() {
 	*x = Job{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[7]
+		mi := &file_proto_tsgrain_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -548,7 +422,7 @@ func (x *Job) String() string {
 func (*Job) ProtoMessage() {}
 
 func (x *Job) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[7]
+	mi := &file_proto_tsgrain_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -561,7 +435,7 @@ func (x *Job) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Job.ProtoReflect.Descriptor instead.
 func (*Job) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{7}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *Job) GetId() int32 {
@@ -617,7 +491,7 @@ type JobID struct {
 func (x *JobID) Reset() {
 	*x = JobID{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[8]
+		mi := &file_proto_tsgrain_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -630,7 +504,7 @@ func (x *JobID) String() string {
 func (*JobID) ProtoMessage() {}
 
 func (x *JobID) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[8]
+	mi := &file_proto_tsgrain_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -643,7 +517,7 @@ func (x *JobID) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use JobID.ProtoReflect.Descriptor instead.
 func (*JobID) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{8}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *JobID) GetId() int32 {
@@ -664,7 +538,7 @@ type JobList struct {
 func (x *JobList) Reset() {
 	*x = JobList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[9]
+		mi := &file_proto_tsgrain_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -677,7 +551,7 @@ func (x *JobList) String() string {
 func (*JobList) ProtoMessage() {}
 
 func (x *JobList) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[9]
+	mi := &file_proto_tsgrain_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -690,7 +564,7 @@ func (x *JobList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use JobList.ProtoReflect.Descriptor instead.
 func (*JobList) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{9}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *JobList) GetJobs() []*Job {
@@ -700,7 +574,7 @@ func (x *JobList) GetJobs() []*Job {
 	return nil
 }
 
-type SystemTime struct {
+type ConfigTime struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -709,23 +583,23 @@ type SystemTime struct {
 	Timezone string     `protobuf:"bytes,2,opt,name=timezone,proto3" json:"timezone,omitempty"`
 }
 
-func (x *SystemTime) Reset() {
+func (x *ConfigTime) Reset() {
-	*x = SystemTime{}
+	*x = ConfigTime{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_tsgrain_proto_msgTypes[10]
+		mi := &file_proto_tsgrain_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *SystemTime) String() string {
+func (x *ConfigTime) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SystemTime) ProtoMessage() {}
+func (*ConfigTime) ProtoMessage() {}
 
-func (x *SystemTime) ProtoReflect() protoreflect.Message {
+func (x *ConfigTime) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_tsgrain_proto_msgTypes[10]
+	mi := &file_proto_tsgrain_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -736,19 +610,19 @@ func (x *SystemTime) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SystemTime.ProtoReflect.Descriptor instead.
+// Deprecated: Use ConfigTime.ProtoReflect.Descriptor instead.
-func (*SystemTime) Descriptor() ([]byte, []int) {
+func (*ConfigTime) Descriptor() ([]byte, []int) {
-	return file_proto_tsgrain_proto_rawDescGZIP(), []int{10}
+	return file_proto_tsgrain_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *SystemTime) GetDatetime() *Timestamp {
+func (x *ConfigTime) GetDatetime() *Timestamp {
 	if x != nil {
 		return x.Datetime
 	}
 	return nil
 }
 
-func (x *SystemTime) GetTimezone() string {
+func (x *ConfigTime) GetTimezone() string {
 	if x != nil {
 		return x.Timezone
 	}
@@ -780,134 +654,104 @@ var file_proto_tsgrain_proto_rawDesc = []byte{
 	0x6c, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07,
 	0x73, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73,
-	0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x22, 0x7f, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74,
+	0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x22, 0xd0, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12,
-	0x61, 0x72, 0x74, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x23, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x0b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x06, 0x73, 0x6f,
-	0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65,
+	0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+	0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a,
+	0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x10, 0x64, 0x61, 0x74,
-	0x07, 0x71, 0x75, 0x65, 0x75, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+	0x65, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20,
-	0x71, 0x75, 0x65, 0x75, 0x69, 0x6e, 0x67, 0x22, 0x48, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x53,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
-	0x74, 0x6f, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x0f, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64,
-	0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x12, 0x37, 0x0a, 0x11, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x69, 0x6e,
-	0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65,
+	0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69,
-	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49,
+	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x10, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d,
-	0x64, 0x22, 0xd0, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x6f,
+	0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x22, 0x62, 0x0a, 0x08, 0x54, 0x61, 0x73,
-	0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x54, 0x61, 0x73,
+	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01,
-	0x6b, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73,
-	0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x03, 0x6e, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61,
+	0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x6e, 0x6f, 0x77,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61,
+	0x12, 0x1b, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x10, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65,
+	0x01, 0x28, 0x08, 0x52, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x97, 0x01,
-	0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
+	0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0f, 0x64, 0x61, 0x74, 0x65,
+	0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20,
-	0x74, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x37, 0x0a, 0x11, 0x64,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
-	0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
+	0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6d, 0x70, 0x52, 0x10, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x69, 0x6e, 0x69,
+	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x7a, 0x6f, 0x6e, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05,
-	0x73, 0x68, 0x65, 0x64, 0x22, 0x62, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x05, 0x7a, 0x6f, 0x6e, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x12, 0x1b, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x12,
-	0x05, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1c, 0x0a,
+	0x16, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x03, 0x6e, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d,
+	0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x22, 0x17, 0x0a, 0x05, 0x4a, 0x6f, 0x62, 0x49, 0x44,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x6e, 0x6f, 0x77, 0x12, 0x1b, 0x0a, 0x09, 0x61,
-	0x75, 0x74, 0x6f, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08,
-	0x61, 0x75, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x97, 0x01, 0x0a, 0x03, 0x4a, 0x6f, 0x62,
 	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
+	0x22, 0x23, 0x0a, 0x07, 0x4a, 0x6f, 0x62, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x04, 0x6a,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65,
+	0x6f, 0x62, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x52,
-	0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x04, 0x6a, 0x6f, 0x62, 0x73, 0x22, 0x50, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54,
-	0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05,
+	0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x7a, 0x6f, 0x6e, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x7a, 0x6f, 0x6e,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x70, 0x52, 0x08, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74,
-	0x28, 0x08, 0x52, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65,
+	0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74,
-	0x70, 0x65, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x65,
+	0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x2a, 0x26, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x53,
-	0x61, 0x74, 0x22, 0x17, 0x0a, 0x05, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x41, 0x4e, 0x55, 0x41, 0x4c, 0x10,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x07, 0x4a,
+	0x00, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x43, 0x48, 0x45, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x01, 0x32,
-	0x6f, 0x62, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x04, 0x6a, 0x6f, 0x62, 0x73, 0x18, 0x01,
+	0xc7, 0x06, 0x0a, 0x07, 0x54, 0x53, 0x47, 0x52, 0x61, 0x69, 0x6e, 0x12, 0x2f, 0x0a, 0x09, 0x53,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x52, 0x04, 0x6a, 0x6f, 0x62, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0c, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52,
-	0x22, 0x50, 0x0a, 0x0a, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
-	0x0a, 0x08, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x08,
-	0x32, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x64, 0x61,
+	0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f,
-	0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f,
-	0x6e, 0x65, 0x2a, 0x26, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x41, 0x4e, 0x55, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08,
-	0x53, 0x43, 0x48, 0x45, 0x44, 0x55, 0x4c, 0x45, 0x10, 0x01, 0x32, 0xe0, 0x08, 0x0a, 0x07, 0x54,
-	0x53, 0x47, 0x52, 0x61, 0x69, 0x6e, 0x12, 0x31, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0c, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x09, 0x53, 0x74, 0x61,
-	0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0a, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x72, 0x74, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00,
-	0x12, 0x33, 0x0a, 0x08, 0x53, 0x74, 0x6f, 0x70, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x09, 0x2e, 0x54,
-	0x61, 0x73, 0x6b, 0x53, 0x74, 0x6f, 0x70, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b,
-	0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x09, 0x2e, 0x54, 0x61, 0x73, 0x6b,
-	0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x34, 0x0a, 0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x09, 0x2e,
-	0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x30, 0x01, 0x12, 0x1b, 0x0a, 0x09,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x1a,
-	0x06, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x22, 0x00, 0x12, 0x18, 0x0a, 0x06, 0x47, 0x65, 0x74,
-	0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x1a, 0x04, 0x2e, 0x4a, 0x6f,
-	0x62, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x16,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x08, 0x2e, 0x4a, 0x6f, 0x62, 0x4c, 0x69, 0x73, 0x74,
-	0x22, 0x00, 0x12, 0x2b, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12,
-	0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12,
-	0x2d, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a,
-	0x6f, 0x62, 0x49, 0x44, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x2d,
-	0x0a, 0x09, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a, 0x6f,
-	0x62, 0x49, 0x44, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x2e, 0x0a,
-	0x0a, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a, 0x6f,
-	0x62, 0x49, 0x44, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x43, 0x0a,
-	0x0b, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
-	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x22, 0x00, 0x12, 0x43, 0x0a, 0x0b, 0x53, 0x65, 0x74, 0x41, 0x75, 0x74, 0x6f, 0x4d, 0x6f, 0x64,
-	0x65, 0x12, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x16, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x36, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x53, 0x79,
-	0x73, 0x74, 0x65, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x1a, 0x0b, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x00, 0x12,
+	0x1a, 0x09, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x34, 0x0a,
-	0x35, 0x0a, 0x0d, 0x53, 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x54, 0x69, 0x6d, 0x65,
+	0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x2e, 0x67,
-	0x12, 0x0a, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x1a, 0x16, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
-	0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x11, 0x53, 0x65, 0x74, 0x53, 0x79, 0x73,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x09, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22,
-	0x74, 0x65, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x1c, 0x2e, 0x67, 0x6f,
+	0x00, 0x30, 0x01, 0x12, 0x1b, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74,
+	0x12, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x06, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x22, 0x00,
-	0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x12, 0x18, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a, 0x6f, 0x62,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
+	0x49, 0x44, 0x1a, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x07, 0x47, 0x65,
-	0x79, 0x22, 0x00, 0x12, 0x51, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x74, 0x49, 0x72, 0x72, 0x69, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x08, 0x2e,
-	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x4a, 0x6f, 0x62, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x2b, 0x0a, 0x09, 0x55, 0x70, 0x64,
-	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x04, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x16, 0x2e, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
-	0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x51, 0x0a, 0x18, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66,
+	0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x61, 0x75, 0x6c, 0x74, 0x49, 0x72, 0x72, 0x69, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69,
+	0x4a, 0x6f, 0x62, 0x12, 0x06, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
-	0x6d, 0x65, 0x12, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a,
+	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74, 0x6f,
-	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x47, 0x65, 0x74,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x67,
-	0x4e, 0x5a, 0x6f, 0x6e, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b,
+	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0b, 0x53, 0x65,
+	0x74, 0x41, 0x75, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12,
+	0x36, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x69, 0x6d, 0x65,
+	0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0b, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x00, 0x12, 0x36, 0x0a, 0x0d, 0x53, 0x65, 0x74, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x0b, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12,
+	0x51, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x49, 0x72, 0x72,
+	0x69, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x22, 0x00, 0x12, 0x51, 0x0a, 0x18, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x49, 0x72, 0x72, 0x69, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1b,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x42, 0x30, 0x5a,
+	0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
-	0x2e, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x68, 0x65, 0x74, 0x61, 0x64, 0x65, 0x76, 0x2e, 0x64,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x65, 0x2f, 0x54, 0x53, 0x47, 0x52, 0x61, 0x69, 0x6e, 0x2f, 0x57, 0x65, 0x62, 0x55, 0x49, 0x2f,
+	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x4e, 0x5a, 0x6f, 0x6e,
-	0x73, 0x72, 0x63, 0x2f, 0x74, 0x73, 0x67, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x70, 0x63, 0x62,
+	0x65, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74,
+	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x42, 0x30, 0x5a, 0x2e, 0x63, 0x6f, 0x64,
+	0x65, 0x2e, 0x74, 0x68, 0x65, 0x74, 0x61, 0x64, 0x65, 0x76, 0x2e, 0x64, 0x65, 0x2f, 0x54, 0x53,
+	0x47, 0x52, 0x61, 0x69, 0x6e, 0x2f, 0x57, 0x65, 0x62, 0x55, 0x49, 0x2f, 0x73, 0x72, 0x63, 0x2f,
+	0x74, 0x73, 0x67, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -923,82 +767,67 @@ func file_proto_tsgrain_proto_rawDescGZIP() []byte {
 }
 
 var file_proto_tsgrain_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_proto_tsgrain_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_proto_tsgrain_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_proto_tsgrain_proto_goTypes = []interface{}{
 	(TaskSource)(0),               // 0: TaskSource
 	(*Timestamp)(nil),             // 1: Timestamp
 	(*TaskRequest)(nil),           // 2: TaskRequest
 	(*TaskRequestResult)(nil),     // 3: TaskRequestResult
-	(*TaskStart)(nil),              // 4: TaskStart
+	(*Task)(nil),                  // 4: Task
-	(*TaskStop)(nil),               // 5: TaskStop
+	(*TaskList)(nil),              // 5: TaskList
-	(*Task)(nil),                   // 6: Task
+	(*Job)(nil),                   // 6: Job
-	(*TaskList)(nil),               // 7: TaskList
+	(*JobID)(nil),                 // 7: JobID
-	(*Job)(nil),                    // 8: Job
+	(*JobList)(nil),               // 8: JobList
-	(*JobID)(nil),                  // 9: JobID
+	(*ConfigTime)(nil),            // 9: ConfigTime
-	(*JobList)(nil),                // 10: JobList
+	(*emptypb.Empty)(nil),         // 10: google.protobuf.Empty
-	(*SystemTime)(nil),             // 11: SystemTime
+	(*wrapperspb.BoolValue)(nil),  // 11: google.protobuf.BoolValue
-	(*emptypb.Empty)(nil),          // 12: google.protobuf.Empty
+	(*wrapperspb.Int32Value)(nil), // 12: google.protobuf.Int32Value
-	(*wrapperspb.BoolValue)(nil),   // 13: google.protobuf.BoolValue
-	(*wrapperspb.StringValue)(nil), // 14: google.protobuf.StringValue
-	(*wrapperspb.Int32Value)(nil),  // 15: google.protobuf.Int32Value
 }
 var file_proto_tsgrain_proto_depIdxs = []int32{
 	0,  // 0: TaskRequest.source:type_name -> TaskSource
-	0,  // 1: TaskStart.source:type_name -> TaskSource
+	0,  // 1: Task.source:type_name -> TaskSource
-	0,  // 2: TaskStop.source:type_name -> TaskSource
+	1,  // 2: Task.datetime_started:type_name -> Timestamp
-	0,  // 3: Task.source:type_name -> TaskSource
+	1,  // 3: Task.datetime_finished:type_name -> Timestamp
-	1,  // 4: Task.datetime_started:type_name -> Timestamp
+	4,  // 4: TaskList.tasks:type_name -> Task
-	1,  // 5: Task.datetime_finished:type_name -> Timestamp
+	1,  // 5: TaskList.now:type_name -> Timestamp
-	6,  // 6: TaskList.tasks:type_name -> Task
+	1,  // 6: Job.date:type_name -> Timestamp
-	1,  // 7: TaskList.now:type_name -> Timestamp
+	6,  // 7: JobList.jobs:type_name -> Job
-	1,  // 8: Job.date:type_name -> Timestamp
+	1,  // 8: ConfigTime.datetime:type_name -> Timestamp
-	8,  // 9: JobList.jobs:type_name -> Job
+	2,  // 9: TSGRain.StartTask:input_type -> TaskRequest
-	1,  // 10: SystemTime.datetime:type_name -> Timestamp
+	10, // 10: TSGRain.GetTasks:input_type -> google.protobuf.Empty
-	2,  // 11: TSGRain.RequestTask:input_type -> TaskRequest
+	10, // 11: TSGRain.StreamTasks:input_type -> google.protobuf.Empty
-	4,  // 12: TSGRain.StartTask:input_type -> TaskStart
+	6,  // 12: TSGRain.CreateJob:input_type -> Job
-	5,  // 13: TSGRain.StopTask:input_type -> TaskStop
+	7,  // 13: TSGRain.GetJob:input_type -> JobID
-	12, // 14: TSGRain.GetTasks:input_type -> google.protobuf.Empty
+	10, // 14: TSGRain.GetJobs:input_type -> google.protobuf.Empty
-	12, // 15: TSGRain.StreamTasks:input_type -> google.protobuf.Empty
+	6,  // 15: TSGRain.UpdateJob:input_type -> Job
-	8,  // 16: TSGRain.CreateJob:input_type -> Job
+	7,  // 16: TSGRain.DeleteJob:input_type -> JobID
-	9,  // 17: TSGRain.GetJob:input_type -> JobID
+	10, // 17: TSGRain.GetAutoMode:input_type -> google.protobuf.Empty
-	12, // 18: TSGRain.GetJobs:input_type -> google.protobuf.Empty
+	11, // 18: TSGRain.SetAutoMode:input_type -> google.protobuf.BoolValue
-	8,  // 19: TSGRain.UpdateJob:input_type -> Job
+	10, // 19: TSGRain.GetConfigTime:input_type -> google.protobuf.Empty
-	9,  // 20: TSGRain.DeleteJob:input_type -> JobID
+	9,  // 20: TSGRain.SetConfigTime:input_type -> ConfigTime
-	9,  // 21: TSGRain.EnableJob:input_type -> JobID
+	10, // 21: TSGRain.GetDefaultIrrigationTime:input_type -> google.protobuf.Empty
-	9,  // 22: TSGRain.DisableJob:input_type -> JobID
+	12, // 22: TSGRain.SetDefaultIrrigationTime:input_type -> google.protobuf.Int32Value
-	12, // 23: TSGRain.GetAutoMode:input_type -> google.protobuf.Empty
+	10, // 23: TSGRain.GetNZones:input_type -> google.protobuf.Empty
-	13, // 24: TSGRain.SetAutoMode:input_type -> google.protobuf.BoolValue
+	3,  // 24: TSGRain.StartTask:output_type -> TaskRequestResult
-	12, // 25: TSGRain.GetSystemTime:input_type -> google.protobuf.Empty
+	5,  // 25: TSGRain.GetTasks:output_type -> TaskList
-	1,  // 26: TSGRain.SetSystemTime:input_type -> Timestamp
+	5,  // 26: TSGRain.StreamTasks:output_type -> TaskList
-	14, // 27: TSGRain.SetSystemTimezone:input_type -> google.protobuf.StringValue
+	7,  // 27: TSGRain.CreateJob:output_type -> JobID
-	12, // 28: TSGRain.GetDefaultIrrigationTime:input_type -> google.protobuf.Empty
+	6,  // 28: TSGRain.GetJob:output_type -> Job
-	15, // 29: TSGRain.SetDefaultIrrigationTime:input_type -> google.protobuf.Int32Value
+	8,  // 29: TSGRain.GetJobs:output_type -> JobList
-	12, // 30: TSGRain.GetNZones:input_type -> google.protobuf.Empty
+	10, // 30: TSGRain.UpdateJob:output_type -> google.protobuf.Empty
-	3,  // 31: TSGRain.RequestTask:output_type -> TaskRequestResult
+	10, // 31: TSGRain.DeleteJob:output_type -> google.protobuf.Empty
-	13, // 32: TSGRain.StartTask:output_type -> google.protobuf.BoolValue
+	11, // 32: TSGRain.GetAutoMode:output_type -> google.protobuf.BoolValue
-	13, // 33: TSGRain.StopTask:output_type -> google.protobuf.BoolValue
+	10, // 33: TSGRain.SetAutoMode:output_type -> google.protobuf.Empty
-	7,  // 34: TSGRain.GetTasks:output_type -> TaskList
+	9,  // 34: TSGRain.GetConfigTime:output_type -> ConfigTime
-	7,  // 35: TSGRain.StreamTasks:output_type -> TaskList
+	10, // 35: TSGRain.SetConfigTime:output_type -> google.protobuf.Empty
-	9,  // 36: TSGRain.CreateJob:output_type -> JobID
+	12, // 36: TSGRain.GetDefaultIrrigationTime:output_type -> google.protobuf.Int32Value
-	8,  // 37: TSGRain.GetJob:output_type -> Job
+	10, // 37: TSGRain.SetDefaultIrrigationTime:output_type -> google.protobuf.Empty
-	10, // 38: TSGRain.GetJobs:output_type -> JobList
+	12, // 38: TSGRain.GetNZones:output_type -> google.protobuf.Int32Value
-	12, // 39: TSGRain.UpdateJob:output_type -> google.protobuf.Empty
+	24, // [24:39] is the sub-list for method output_type
-	12, // 40: TSGRain.DeleteJob:output_type -> google.protobuf.Empty
+	9,  // [9:24] is the sub-list for method input_type
-	12, // 41: TSGRain.EnableJob:output_type -> google.protobuf.Empty
+	9,  // [9:9] is the sub-list for extension type_name
-	12, // 42: TSGRain.DisableJob:output_type -> google.protobuf.Empty
+	9,  // [9:9] is the sub-list for extension extendee
-	13, // 43: TSGRain.GetAutoMode:output_type -> google.protobuf.BoolValue
+	0,  // [0:9] is the sub-list for field type_name
-	12, // 44: TSGRain.SetAutoMode:output_type -> google.protobuf.Empty
-	11, // 45: TSGRain.GetSystemTime:output_type -> SystemTime
-	12, // 46: TSGRain.SetSystemTime:output_type -> google.protobuf.Empty
-	12, // 47: TSGRain.SetSystemTimezone:output_type -> google.protobuf.Empty
-	15, // 48: TSGRain.GetDefaultIrrigationTime:output_type -> google.protobuf.Int32Value
-	12, // 49: TSGRain.SetDefaultIrrigationTime:output_type -> google.protobuf.Empty
-	15, // 50: TSGRain.GetNZones:output_type -> google.protobuf.Int32Value
-	31, // [31:51] is the sub-list for method output_type
-	11, // [11:31] is the sub-list for method input_type
-	11, // [11:11] is the sub-list for extension type_name
-	11, // [11:11] is the sub-list for extension extendee
-	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_proto_tsgrain_proto_init() }
@@ -1044,30 +873,6 @@ func file_proto_tsgrain_proto_init() {
 			}
 		}
 		file_proto_tsgrain_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TaskStart); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_proto_tsgrain_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TaskStop); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_proto_tsgrain_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Task); i {
 			case 0:
 				return &v.state
@@ -1079,7 +884,7 @@ func file_proto_tsgrain_proto_init() {
 				return nil
 			}
 		}
-		file_proto_tsgrain_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_tsgrain_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TaskList); i {
 			case 0:
 				return &v.state
@@ -1091,7 +896,7 @@ func file_proto_tsgrain_proto_init() {
 				return nil
 			}
 		}
-		file_proto_tsgrain_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_tsgrain_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Job); i {
 			case 0:
 				return &v.state
@@ -1103,7 +908,7 @@ func file_proto_tsgrain_proto_init() {
 				return nil
 			}
 		}
-		file_proto_tsgrain_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_tsgrain_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*JobID); i {
 			case 0:
 				return &v.state
@@ -1115,7 +920,7 @@ func file_proto_tsgrain_proto_init() {
 				return nil
 			}
 		}
-		file_proto_tsgrain_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_tsgrain_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*JobList); i {
 			case 0:
 				return &v.state
@@ -1127,8 +932,8 @@ func file_proto_tsgrain_proto_init() {
 				return nil
 			}
 		}
-		file_proto_tsgrain_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_tsgrain_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SystemTime); i {
+			switch v := v.(*ConfigTime); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1146,7 +951,7 @@ func file_proto_tsgrain_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_proto_tsgrain_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   11,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

src/tsgrain_rpc/proto/tsgrain_grpc.pb.go

@@ -26,11 +26,7 @@ const _ = grpc.SupportPackageIsVersion7
 type TSGRainClient interface {
 	// Starte eine neue Bewässerungsaufgabe (oder stoppe eine laufende, wenn
 	// diese bereits läuft).
-	RequestTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskRequestResult, error)
+	StartTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskRequestResult, error)
-	// Starte eine Bewässerungsaufgabe
-	StartTask(ctx context.Context, in *TaskStart, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error)
-	// Stoppe eine Bewässerungsaufgabe
-	StopTask(ctx context.Context, in *TaskStop, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error)
 	// Gibt sämtliche in der Warteschlange befindlichen Bewässerungsaufgaben zurück.
 	GetTasks(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*TaskList, error)
 	// Streamt die aktuelle Warteschlange mit ihren Bewässerungsaufgaben,
@@ -46,20 +42,14 @@ type TSGRainClient interface {
 	UpdateJob(ctx context.Context, in *Job, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lösche den Bewässerungsjob mit der gegebenen ID.
 	DeleteJob(ctx context.Context, in *JobID, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// Aktiviere Bewässerungsjob
-	EnableJob(ctx context.Context, in *JobID, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// Deaktiviere Bewässerungsjob
-	DisableJob(ctx context.Context, in *JobID, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gibt zurück, ob der Automatikmodus aktiviert ist.
 	GetAutoMode(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error)
 	// Aktiviert/deaktiviert den Automatikmodus.
 	SetAutoMode(ctx context.Context, in *wrapperspb.BoolValue, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Datum/Uhrzeit/Zeitzone abrufen
-	GetSystemTime(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SystemTime, error)
+	GetConfigTime(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ConfigTime, error)
-	// Datum/Uhrzeit einstellen
+	// Datum/Uhrzeit/Zeitzone einstellen
-	SetSystemTime(ctx context.Context, in *Timestamp, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	SetConfigTime(ctx context.Context, in *ConfigTime, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// Zeitzone einstellen
-	SetSystemTimezone(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Standardzeit bei manueller Bewässerung abrufen
 	GetDefaultIrrigationTime(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*wrapperspb.Int32Value, error)
 	// Standardzeit bei manueller Bewässerung einstellen
@@ -76,17 +66,8 @@ func NewTSGRainClient(cc grpc.ClientConnInterface) TSGRainClient {
 	return &tSGRainClient{cc}
 }
 
-func (c *tSGRainClient) RequestTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskRequestResult, error) {
+func (c *tSGRainClient) StartTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskRequestResult, error) {
 	out := new(TaskRequestResult)
-	err := c.cc.Invoke(ctx, "/TSGRain/RequestTask", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tSGRainClient) StartTask(ctx context.Context, in *TaskStart, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error) {
-	out := new(wrapperspb.BoolValue)
 	err := c.cc.Invoke(ctx, "/TSGRain/StartTask", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -94,15 +75,6 @@ func (c *tSGRainClient) StartTask(ctx context.Context, in *TaskStart, opts ...gr
 	return out, nil
 }
 
-func (c *tSGRainClient) StopTask(ctx context.Context, in *TaskStop, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error) {
-	out := new(wrapperspb.BoolValue)
-	err := c.cc.Invoke(ctx, "/TSGRain/StopTask", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *tSGRainClient) GetTasks(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*TaskList, error) {
 	out := new(TaskList)
 	err := c.cc.Invoke(ctx, "/TSGRain/GetTasks", in, out, opts...)
@@ -189,24 +161,6 @@ func (c *tSGRainClient) DeleteJob(ctx context.Context, in *JobID, opts ...grpc.C
 	return out, nil
 }
 
-func (c *tSGRainClient) EnableJob(ctx context.Context, in *JobID, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/TSGRain/EnableJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tSGRainClient) DisableJob(ctx context.Context, in *JobID, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/TSGRain/DisableJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *tSGRainClient) GetAutoMode(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*wrapperspb.BoolValue, error) {
 	out := new(wrapperspb.BoolValue)
 	err := c.cc.Invoke(ctx, "/TSGRain/GetAutoMode", in, out, opts...)
@@ -225,27 +179,18 @@ func (c *tSGRainClient) SetAutoMode(ctx context.Context, in *wrapperspb.BoolValu
 	return out, nil
 }
 
-func (c *tSGRainClient) GetSystemTime(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SystemTime, error) {
+func (c *tSGRainClient) GetConfigTime(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ConfigTime, error) {
-	out := new(SystemTime)
+	out := new(ConfigTime)
-	err := c.cc.Invoke(ctx, "/TSGRain/GetSystemTime", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/TSGRain/GetConfigTime", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *tSGRainClient) SetSystemTime(ctx context.Context, in *Timestamp, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *tSGRainClient) SetConfigTime(ctx context.Context, in *ConfigTime, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/TSGRain/SetSystemTime", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/TSGRain/SetConfigTime", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tSGRainClient) SetSystemTimezone(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/TSGRain/SetSystemTimezone", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -285,11 +230,7 @@ func (c *tSGRainClient) GetNZones(ctx context.Context, in *emptypb.Empty, opts .
 type TSGRainServer interface {
 	// Starte eine neue Bewässerungsaufgabe (oder stoppe eine laufende, wenn
 	// diese bereits läuft).
-	RequestTask(context.Context, *TaskRequest) (*TaskRequestResult, error)
+	StartTask(context.Context, *TaskRequest) (*TaskRequestResult, error)
-	// Starte eine Bewässerungsaufgabe
-	StartTask(context.Context, *TaskStart) (*wrapperspb.BoolValue, error)
-	// Stoppe eine Bewässerungsaufgabe
-	StopTask(context.Context, *TaskStop) (*wrapperspb.BoolValue, error)
 	// Gibt sämtliche in der Warteschlange befindlichen Bewässerungsaufgaben zurück.
 	GetTasks(context.Context, *emptypb.Empty) (*TaskList, error)
 	// Streamt die aktuelle Warteschlange mit ihren Bewässerungsaufgaben,
@@ -305,20 +246,14 @@ type TSGRainServer interface {
 	UpdateJob(context.Context, *Job) (*emptypb.Empty, error)
 	// Lösche den Bewässerungsjob mit der gegebenen ID.
 	DeleteJob(context.Context, *JobID) (*emptypb.Empty, error)
-	// Aktiviere Bewässerungsjob
-	EnableJob(context.Context, *JobID) (*emptypb.Empty, error)
-	// Deaktiviere Bewässerungsjob
-	DisableJob(context.Context, *JobID) (*emptypb.Empty, error)
 	// Gibt zurück, ob der Automatikmodus aktiviert ist.
 	GetAutoMode(context.Context, *emptypb.Empty) (*wrapperspb.BoolValue, error)
 	// Aktiviert/deaktiviert den Automatikmodus.
 	SetAutoMode(context.Context, *wrapperspb.BoolValue) (*emptypb.Empty, error)
 	// Datum/Uhrzeit/Zeitzone abrufen
-	GetSystemTime(context.Context, *emptypb.Empty) (*SystemTime, error)
+	GetConfigTime(context.Context, *emptypb.Empty) (*ConfigTime, error)
-	// Datum/Uhrzeit einstellen
+	// Datum/Uhrzeit/Zeitzone einstellen
-	SetSystemTime(context.Context, *Timestamp) (*emptypb.Empty, error)
+	SetConfigTime(context.Context, *ConfigTime) (*emptypb.Empty, error)
-	// Zeitzone einstellen
-	SetSystemTimezone(context.Context, *wrapperspb.StringValue) (*emptypb.Empty, error)
 	// Standardzeit bei manueller Bewässerung abrufen
 	GetDefaultIrrigationTime(context.Context, *emptypb.Empty) (*wrapperspb.Int32Value, error)
 	// Standardzeit bei manueller Bewässerung einstellen
@@ -332,15 +267,9 @@ type TSGRainServer interface {
 type UnimplementedTSGRainServer struct {
 }
 
-func (UnimplementedTSGRainServer) RequestTask(context.Context, *TaskRequest) (*TaskRequestResult, error) {
+func (UnimplementedTSGRainServer) StartTask(context.Context, *TaskRequest) (*TaskRequestResult, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RequestTask not implemented")
-}
-func (UnimplementedTSGRainServer) StartTask(context.Context, *TaskStart) (*wrapperspb.BoolValue, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method StartTask not implemented")
 }
-func (UnimplementedTSGRainServer) StopTask(context.Context, *TaskStop) (*wrapperspb.BoolValue, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method StopTask not implemented")
-}
 func (UnimplementedTSGRainServer) GetTasks(context.Context, *emptypb.Empty) (*TaskList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetTasks not implemented")
 }
@@ -362,26 +291,17 @@ func (UnimplementedTSGRainServer) UpdateJob(context.Context, *Job) (*emptypb.Emp
 func (UnimplementedTSGRainServer) DeleteJob(context.Context, *JobID) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
 }
-func (UnimplementedTSGRainServer) EnableJob(context.Context, *JobID) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method EnableJob not implemented")
-}
-func (UnimplementedTSGRainServer) DisableJob(context.Context, *JobID) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DisableJob not implemented")
-}
 func (UnimplementedTSGRainServer) GetAutoMode(context.Context, *emptypb.Empty) (*wrapperspb.BoolValue, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetAutoMode not implemented")
 }
 func (UnimplementedTSGRainServer) SetAutoMode(context.Context, *wrapperspb.BoolValue) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetAutoMode not implemented")
 }
-func (UnimplementedTSGRainServer) GetSystemTime(context.Context, *emptypb.Empty) (*SystemTime, error) {
+func (UnimplementedTSGRainServer) GetConfigTime(context.Context, *emptypb.Empty) (*ConfigTime, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetSystemTime not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method GetConfigTime not implemented")
 }
-func (UnimplementedTSGRainServer) SetSystemTime(context.Context, *Timestamp) (*emptypb.Empty, error) {
+func (UnimplementedTSGRainServer) SetConfigTime(context.Context, *ConfigTime) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetSystemTime not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method SetConfigTime not implemented")
-}
-func (UnimplementedTSGRainServer) SetSystemTimezone(context.Context, *wrapperspb.StringValue) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetSystemTimezone not implemented")
 }
 func (UnimplementedTSGRainServer) GetDefaultIrrigationTime(context.Context, *emptypb.Empty) (*wrapperspb.Int32Value, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetDefaultIrrigationTime not implemented")
@@ -405,26 +325,8 @@ func RegisterTSGRainServer(s grpc.ServiceRegistrar, srv TSGRainServer) {
 	s.RegisterService(&TSGRain_ServiceDesc, srv)
 }
 
-func _TSGRain_RequestTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TaskRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TSGRainServer).RequestTask(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/TSGRain/RequestTask",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).RequestTask(ctx, req.(*TaskRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _TSGRain_StartTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TaskStart)
+	in := new(TaskRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -436,25 +338,7 @@ func _TSGRain_StartTask_Handler(srv interface{}, ctx context.Context, dec func(i
 		FullMethod: "/TSGRain/StartTask",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).StartTask(ctx, req.(*TaskStart))
+		return srv.(TSGRainServer).StartTask(ctx, req.(*TaskRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TSGRain_StopTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TaskStop)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TSGRainServer).StopTask(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/TSGRain/StopTask",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).StopTask(ctx, req.(*TaskStop))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -588,42 +472,6 @@ func _TSGRain_DeleteJob_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TSGRain_EnableJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(JobID)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TSGRainServer).EnableJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/TSGRain/EnableJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).EnableJob(ctx, req.(*JobID))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TSGRain_DisableJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(JobID)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TSGRainServer).DisableJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/TSGRain/DisableJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).DisableJob(ctx, req.(*JobID))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _TSGRain_GetAutoMode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
@@ -660,56 +508,38 @@ func _TSGRain_SetAutoMode_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TSGRain_GetSystemTime_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _TSGRain_GetConfigTime_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TSGRainServer).GetSystemTime(ctx, in)
+		return srv.(TSGRainServer).GetConfigTime(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/TSGRain/GetSystemTime",
+		FullMethod: "/TSGRain/GetConfigTime",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).GetSystemTime(ctx, req.(*emptypb.Empty))
+		return srv.(TSGRainServer).GetConfigTime(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TSGRain_SetSystemTime_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _TSGRain_SetConfigTime_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Timestamp)
+	in := new(ConfigTime)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TSGRainServer).SetSystemTime(ctx, in)
+		return srv.(TSGRainServer).SetConfigTime(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/TSGRain/SetSystemTime",
+		FullMethod: "/TSGRain/SetConfigTime",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).SetSystemTime(ctx, req.(*Timestamp))
+		return srv.(TSGRainServer).SetConfigTime(ctx, req.(*ConfigTime))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TSGRain_SetSystemTimezone_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(wrapperspb.StringValue)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TSGRainServer).SetSystemTimezone(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/TSGRain/SetSystemTimezone",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TSGRainServer).SetSystemTimezone(ctx, req.(*wrapperspb.StringValue))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -775,18 +605,10 @@ var TSGRain_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "TSGRain",
 	HandlerType: (*TSGRainServer)(nil),
 	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "RequestTask",
-			Handler:    _TSGRain_RequestTask_Handler,
-		},
 		{
 			MethodName: "StartTask",
 			Handler:    _TSGRain_StartTask_Handler,
 		},
-		{
-			MethodName: "StopTask",
-			Handler:    _TSGRain_StopTask_Handler,
-		},
 		{
 			MethodName: "GetTasks",
 			Handler:    _TSGRain_GetTasks_Handler,
@@ -811,14 +633,6 @@ var TSGRain_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteJob",
 			Handler:    _TSGRain_DeleteJob_Handler,
 		},
-		{
-			MethodName: "EnableJob",
-			Handler:    _TSGRain_EnableJob_Handler,
-		},
-		{
-			MethodName: "DisableJob",
-			Handler:    _TSGRain_DisableJob_Handler,
-		},
 		{
 			MethodName: "GetAutoMode",
 			Handler:    _TSGRain_GetAutoMode_Handler,
@@ -828,16 +642,12 @@ var TSGRain_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _TSGRain_SetAutoMode_Handler,
 		},
 		{
-			MethodName: "GetSystemTime",
+			MethodName: "GetConfigTime",
-			Handler:    _TSGRain_GetSystemTime_Handler,
+			Handler:    _TSGRain_GetConfigTime_Handler,
 		},
 		{
-			MethodName: "SetSystemTime",
+			MethodName: "SetConfigTime",
-			Handler:    _TSGRain_SetSystemTime_Handler,
+			Handler:    _TSGRain_SetConfigTime_Handler,
-		},
-		{
-			MethodName: "SetSystemTimezone",
-			Handler:    _TSGRain_SetSystemTimezone_Handler,
 		},
 		{
 			MethodName: "GetDefaultIrrigationTime",

src/tsgrain_rpc/tsgrain_rpc.go

@@ -83,30 +83,24 @@ func mapTaskList(pbTaskList *tsgrain_grpc.TaskList) model.TaskList {
 	return taskList
 }
 
-func (c *RPCClient) StartManualTask(zone_id int32, duration int32) (bool, error) {
+func (c *RPCClient) StartManualTask(
-	res, err := c.tsgrain.StartTask(c.ctx, &tsgrain_grpc.TaskStart{
+	zone_id int32, duration int32, queuing bool, cancelling bool) (
+	model.TaskRequestResult, error) {
+	res, err := c.tsgrain.StartTask(c.ctx, &tsgrain_grpc.TaskRequest{
 		Source:     tsgrain_grpc.TaskSource_MANUAL,
 		ZoneId:     zone_id,
 		Duration:   duration,
-		Queuing:  true,
+		Queuing:    queuing,
+		Cancelling: cancelling,
 	})
 	if err != nil {
-		return false, err
+		return model.TaskRequestResult{}, err
 	}
 
-	return res.Value, nil
+	return model.TaskRequestResult{
-}
+		Started: res.Started,
-
+		Stopped: res.Stopped,
-func (c *RPCClient) StopManualTask(zone_id int32) (bool, error) {
+	}, nil
-	res, err := c.tsgrain.StopTask(c.ctx, &tsgrain_grpc.TaskStop{
-		Source: tsgrain_grpc.TaskSource_MANUAL,
-		ZoneId: zone_id,
-	})
-	if err != nil {
-		return false, err
-	}
-
-	return res.Value, nil
 }
 
 func (c *RPCClient) GetTasks() (model.TaskList, error) {
@@ -261,27 +255,30 @@ func (c *RPCClient) SetAutoMode(state bool) error {
 	return err
 }
 
-func (c *RPCClient) GetSystemTime() (model.SystemTime, error) {
+func (c *RPCClient) GetConfigTime() (model.ConfigTime, error) {
-	configTime, err := c.tsgrain.GetSystemTime(c.ctx, &emptypb.Empty{})
+	configTime, err := c.tsgrain.GetConfigTime(c.ctx, &emptypb.Empty{})
 	if err != nil {
-		return model.SystemTime{}, err
+		return model.ConfigTime{}, err
 	}
 
-	return model.SystemTime{
+	return model.ConfigTime{
 		Time:     configTime.Datetime.Seconds,
 		Timezone: configTime.Timezone,
 	}, nil
 }
 
-func (c *RPCClient) SetSystemTime(timestamp int64) error {
+func (c *RPCClient) SetConfigTime(configTime model.ConfigTime) error {
-	_, err := c.tsgrain.SetSystemTime(c.ctx,
+	_, err := c.tsgrain.SetConfigTime(c.ctx, &tsgrain_grpc.ConfigTime{
-		&tsgrain_grpc.Timestamp{Seconds: timestamp})
+		Datetime: &tsgrain_grpc.Timestamp{Seconds: configTime.Time},
+		Timezone: configTime.Timezone,
+	})
 	return err
 }
 
 func (c *RPCClient) SetSystemTimezone(timezone string) error {
-	_, err := c.tsgrain.SetSystemTimezone(c.ctx,
+	_, err := c.tsgrain.SetConfigTime(c.ctx, &tsgrain_grpc.ConfigTime{
-		&wrapperspb.StringValue{Value: timezone})
+		Timezone: timezone,
+	})
 	return err
 }
 

ui/package.json

@@ -9,22 +9,16 @@
     "format": "prettier --write ../"
   },
   "dependencies": {
-    "@emotion/react": "^11.7.1",
+    "@mdi/js": "^6.5.95",
-    "@emotion/styled": "^11.6.0",
+    "axios": "^0.24.0",
-    "@mui/icons-material": "^5.3.1",
+    "preact": "^10.5.15"
-    "@mui/lab": "^5.0.0-alpha.67",
-    "@mui/material": "^5.4.0",
-    "axios": "^0.25.0",
-    "date-fns": "^2.28.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "wouter": "^2.8.0-alpha.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.0",
+    "@preact/preset-vite": "^2.1.5",
-    "@types/react-dom": "^17.0.11",
+    "prettier": "^2.4.1",
-    "@vitejs/plugin-react-refresh": "latest",
+    "sass": "^1.43.4",
     "typescript": "^4.5.2",
-    "vite": "latest"
+    "vite": "^2.6.14",
+    "@babel/core": ">=7.12.10 <8.0.0"
   }
 }

ui/src/App.tsx

@@ -1,36 +0,0 @@
-import * as React from "react"
-import {Box, Typography} from "@mui/material"
-import {Route} from "wouter"
-
-import Navbar from "./components/Navbar"
-import Controls from "./components/Controls"
-import Jobs from "./components/Jobs"
-import Settings from "./components/Settings"
-import NoConnectionBar from "./components/NoConnectionBar"
-
-export default function App() {
-	return (
-		<Box
-			sx={{
-				display: "flex",
-				flexDirection: "column",
-				minHeight: "100vh",
-			}}
-		>
-			<Navbar />
-			<NoConnectionBar />
-
-			<Box sx={{m: 2}}>
-				<Route path="">
-					<Controls />
-				</Route>
-				<Route path="/jobs">
-					<Jobs />
-				</Route>
-				<Route path="/settings">
-					<Settings />
-				</Route>
-			</Box>
-		</Box>
-	)
-}

ui/src/components/AutoMode.tsx

@@ -1,65 +0,0 @@
-import * as React from "react"
-import {Switch, FormControlLabel} from "@mui/material"
-import {WebsocketClient} from "../util/websocket"
-import {TaskList} from "../tsgrain-client"
-import {tsgrainApi} from "../util/apiUrls"
-import {handleApiError} from "../util/functions"
-
-type Props = {}
-
-type State = {
-	wsConnected: boolean
-	auto: boolean
-}
-
-export default class AutoModeSwitch extends React.Component<Props, State> {
-	private ws?: WebsocketClient
-
-	constructor(props: Props) {
-		super(props)
-
-		this.state = {
-			wsConnected: false,
-			auto: false,
-		}
-	}
-
-	private onWsStatusUpdate = (wsConnected: boolean) => {
-		this.setState({wsConnected: wsConnected})
-	}
-
-	private onWsMessage = (msg: TaskList, date: Date) => {
-		this.setState({auto: msg.auto_mode})
-	}
-
-	componentDidMount() {
-		this.ws = new WebsocketClient(this.onWsStatusUpdate, this.onWsMessage)
-		this.setState({wsConnected: this.ws.api().isConnected()})
-	}
-
-	componentWillUnmount() {
-		if (this.ws !== undefined) {
-			this.ws.destroy()
-		}
-	}
-
-	private handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-		const newState = !this.state.auto
-		tsgrainApi.setAutoMode({state: newState}).catch(handleApiError)
-	}
-
-	render() {
-		return (
-			<FormControlLabel
-				control={
-					<Switch
-						color="secondary"
-						checked={this.state.auto}
-						onChange={this.handleChange}
-					/>
-				}
-				label="Auto"
-			/>
-		)
-	}
-}

ui/src/components/Controls.tsx

@@ -1,344 +0,0 @@
-import * as React from "react"
-import {
-	Container,
-	Card,
-	CardContent,
-	Typography,
-	CardActions,
-	Button,
-	Box,
-	Grid,
-	LinearProgress,
-	LinearProgressProps,
-} from "@mui/material"
-import {
-	TimerOutlined as IconSchedule,
-	PowerSettingsNew as IconManual,
-} from "@mui/icons-material"
-import {Config, getConfig} from "../util/config"
-import {WebsocketClient, WebsocketMessage} from "../util/websocket"
-import {TaskList, Task} from "../tsgrain-client"
-import {tsgrainApi} from "../util/apiUrls"
-import {
-	dateToTimestamp,
-	getTimestamp,
-	handleApiError,
-	secondsToString,
-} from "../util/functions"
-
-function startZone(id: number) {
-	tsgrainApi.startTask({id: id}).catch(handleApiError)
-}
-
-function stopZone(id: number) {
-	tsgrainApi.stopTask({id: id}).catch(handleApiError)
-}
-
-type LinearProgressWithLabelProps = LinearProgressProps & {
-	label?: string
-	icon?: React.ReactElement
-}
-
-function LinearProgressWithLabel(props: LinearProgressWithLabelProps) {
-	return (
-		<Box sx={{display: "flex", alignItems: "center", width: "100%", my: 1}}>
-			<Box sx={{minWidth: 35, maxWidth: 120, overflow: "hidden"}}>
-				<div
-					style={{
-						display: "flex",
-						alignItems: "center",
-						flexWrap: "wrap",
-					}}
-				>
-					{props.icon}
-					<Typography variant="body2" color="text.secondary">
-						{props.label}
-					</Typography>
-				</div>
-			</Box>
-			<Box sx={{flexGrow: "1", ml: 1}}>
-				<LinearProgress variant="determinate" {...props} />
-			</Box>
-		</Box>
-	)
-}
-
-type TaskProgressProps = {
-	task: Task
-	taskListCliTimestamp: number
-	taskListSrvTimestamp: number
-}
-
-type TaskProgressState = {
-	timestamp: number
-}
-
-class TaskProgress extends React.Component<TaskProgressProps, TaskProgressState> {
-	private timerID?: number
-
-	constructor(props: TaskProgressProps) {
-		super(props)
-		this.state = {timestamp: getTimestamp()}
-	}
-
-	componentDidMount() {
-		this.timerID = setInterval(() => this.tick(), 1000)
-	}
-
-	componentWillUnmount() {
-		clearInterval(this.timerID)
-	}
-
-	tick() {
-		this.setState({
-			timestamp: getTimestamp(),
-		})
-	}
-
-	render() {
-		let icon
-		switch (this.props.task.source) {
-			case 0:
-				icon = <IconManual />
-				break
-
-			case 1:
-				icon = <IconSchedule />
-				break
-
-			default:
-				break
-		}
-
-		let progSeconds = 0,
-			progPercent = 0
-
-		if (this.props.task.datetime_started !== null) {
-			// Calculate the current server time based on current client time,
-			// client time at last TaskList update and server time at last TaskList update
-			const srvTimestamp =
-				this.state.timestamp -
-				this.props.taskListCliTimestamp +
-				this.props.taskListSrvTimestamp
-
-			const srvDuration =
-				this.props.task.datetime_finished - this.props.task.datetime_started
-
-			// If a task is restored from the database (after a server restart),
-			// it will continue at the left-off position.
-			// The 'Headstart' is the amount of irrigation time already completed
-			// in the previous server run. It needs to be added to the progress time.
-			const headstart = this.props.task.duration - srvDuration
-
-			progSeconds = srvTimestamp - this.props.task.datetime_started + headstart
-
-			// Cap progress in case the client is out of sync
-			progSeconds = Math.min(Math.max(progSeconds, 0), this.props.task.duration)
-
-			progPercent = (progSeconds / srvDuration) * 100
-		}
-
-		return (
-			<LinearProgressWithLabel
-				variant="determinate"
-				value={progPercent}
-				label={`${secondsToString(progSeconds)}/${secondsToString(
-					this.props.task.duration
-				)}`}
-				icon={icon}
-			/>
-		)
-	}
-}
-
-type TaskProgressListProps = {
-	tasks: Task[]
-	taskListCliTimestamp: number
-	taskListSrvTimestamp: number
-}
-
-const TaskProgressList = (props: TaskProgressListProps) => {
-	let items: React.ReactElement[] = []
-
-	props.tasks.forEach((task, i) => {
-		let icon
-		switch (task.source) {
-			case 0:
-				icon = <IconManual />
-				break
-
-			case 1:
-				icon = <IconSchedule />
-				break
-
-			default:
-				break
-		}
-
-		if (task.datetime_started !== null) {
-		}
-
-		items.push(
-			<TaskProgress
-				key={i}
-				task={task}
-				taskListCliTimestamp={props.taskListCliTimestamp}
-				taskListSrvTimestamp={props.taskListSrvTimestamp}
-			/>
-		)
-	})
-
-	return <Box>{items}</Box>
-}
-
-type ZoneButtonProps = {
-	start: boolean
-	disabled: boolean
-	zoneId: number
-}
-
-const ZoneButton = (props: ZoneButtonProps) => {
-	const clickFun = props.start ? startZone : stopZone
-
-	return (
-		<Button
-			size="small"
-			onClick={() => clickFun(props.zoneId)}
-			disabled={props.disabled}
-		>
-			{props.start ? "Start" : "Stop"}
-		</Button>
-	)
-}
-
-type ZoneCardProps = {
-	zoneId: number
-	tasks?: Task[]
-	taskListCliTimestamp: number
-	taskListSrvTimestamp: number
-}
-
-const ZoneCard = (props: ZoneCardProps) => {
-	const tasks = props.tasks === undefined ? [] : props.tasks
-
-	let runningTask
-	let hasManualTask = false
-
-	if (tasks.length > 0) {
-		if (tasks[0].datetime_started !== null) {
-			runningTask = tasks[0]
-		}
-
-		tasks.forEach((task) => {
-			if (task.source === 0) {
-				hasManualTask = true
-			}
-		})
-	}
-
-	return (
-		<Card sx={{width: 250}}>
-			<CardContent sx={{py: 1.5}}>
-				<Typography variant="h5" component="div">
-					Platz {props.zoneId}
-				</Typography>
-			</CardContent>
-			<CardContent sx={{py: 0}}>
-				<TaskProgressList
-					tasks={tasks}
-					taskListCliTimestamp={props.taskListCliTimestamp}
-					taskListSrvTimestamp={props.taskListSrvTimestamp}
-				/>
-			</CardContent>
-			<CardActions>
-				<ZoneButton
-					start={!hasManualTask}
-					disabled={false}
-					zoneId={props.zoneId}
-				/>
-			</CardActions>
-		</Card>
-	)
-}
-
-type Props = {}
-
-type State = {
-	wsConnected: boolean
-	taskList: TaskList
-	tasksByZone: {[key: number]: Task[]}
-	taskListTimestamp: number
-}
-
-export default class Controls extends React.Component<Props, State> {
-	private cfg: Config
-	private ws?: WebsocketClient
-
-	constructor(props: Props) {
-		super(props)
-
-		this.cfg = getConfig()
-
-		this.state = {
-			wsConnected: false,
-			taskList: new WebsocketMessage(),
-			tasksByZone: {},
-			taskListTimestamp: getTimestamp(),
-		}
-	}
-
-	private onWsStatusUpdate = (wsConnected: boolean) => {
-		this.setState({wsConnected: wsConnected})
-	}
-
-	private onWsMessage = (msg: TaskList, date: Date) => {
-		const tbz: {[key: number]: Task[]} = {}
-		msg.tasks.forEach((task) => {
-			if (tbz[task.zone_id] === undefined) {
-				tbz[task.zone_id] = []
-			}
-			tbz[task.zone_id].push(task)
-		})
-
-		this.setState({
-			taskList: msg,
-			tasksByZone: tbz,
-			taskListTimestamp: dateToTimestamp(date),
-		})
-	}
-
-	componentDidMount() {
-		this.ws = new WebsocketClient(this.onWsStatusUpdate, this.onWsMessage)
-		this.setState({wsConnected: this.ws.api().isConnected()})
-	}
-
-	componentWillUnmount() {
-		if (this.ws !== undefined) {
-			this.ws.destroy()
-		}
-	}
-
-	render() {
-		let cards = []
-		for (let i = 1; i <= this.cfg.n_zones; i++) {
-			cards.push(
-				<Grid item key={i}>
-					<ZoneCard
-						zoneId={i}
-						tasks={this.state.tasksByZone[i]}
-						taskListCliTimestamp={this.state.taskListTimestamp}
-						taskListSrvTimestamp={this.state.taskList.now}
-					/>
-				</Grid>
-			)
-		}
-
-		return (
-			<Container maxWidth="md">
-				<Grid container spacing={2}>
-					{cards}
-				</Grid>
-			</Container>
-		)
-	}
-}

ui/src/components/DurationInput.tsx

@@ -1,35 +0,0 @@
-import * as React from "react"
-import {TextField, TextFieldProps} from "@mui/material"
-
-import {parseTimeString, secondsToString} from "../util/functions"
-
-type Props = {
-	value: number
-	onChange: (newValue: number) => void
-	textFieldProps: TextFieldProps
-}
-
-const DurationInput = (props: Props) => {
-	const [textValue, setTextValue] = React.useState(secondsToString(props.value))
-
-	const handleDurationUpdate = (e: React.ChangeEvent<HTMLInputElement>) => {
-		setTextValue(e.target.value)
-		props.onChange(parseTimeString(e.target.value))
-	}
-
-	const handleDurationBlur = (e: React.FocusEvent<HTMLInputElement>) => {
-		setTextValue(secondsToString(props.value))
-	}
-
-	return (
-		<TextField
-			{...props.textFieldProps}
-			value={textValue}
-			onChange={handleDurationUpdate}
-			onBlur={handleDurationBlur}
-			error={!(props.value > 0)}
-		/>
-	)
-}
-
-export default DurationInput

ui/src/components/Jobs.tsx

@@ -1,409 +0,0 @@
-import * as React from "react"
-import {
-	Box,
-	Card,
-	Chip,
-	CircularProgress,
-	Container,
-	Paper,
-	Table,
-	TableBody,
-	TableCell,
-	TableContainer,
-	TableHead,
-	TableRow,
-	IconButton,
-	Fab,
-	Button,
-	Dialog,
-	DialogActions,
-	DialogContent,
-	DialogTitle,
-	TextField,
-	FormControlLabel,
-	Checkbox,
-	Typography,
-} from "@mui/material"
-import {
-	Add as AddIcon,
-	Edit as EditIcon,
-	Delete as DeleteIcon,
-	Timer as PowerOnIcon,
-	TimerOff as PowerOffIcon,
-} from "@mui/icons-material"
-import {DateTimePicker, LocalizationProvider} from "@mui/lab"
-import AdapterDateFns from "@mui/lab/AdapterDateFns"
-import {de} from "date-fns/locale"
-
-import {Job} from "../tsgrain-client"
-import {tsgrainApi} from "../util/apiUrls"
-import {
-	dateToTimestamp,
-	getTimestamp,
-	handleApiError,
-	secondsToString,
-	timestampToString,
-} from "../util/functions"
-import {getConfig} from "../util/config"
-import DurationInput from "./DurationInput"
-
-type ZoneSelectorProps = {
-	defaultSelection?: Set<number>
-	onChange?: (selection: Set<number>) => void
-}
-
-function ZoneSelector(props: ZoneSelectorProps) {
-	const [selection, setSelection] = React.useState(
-		props.defaultSelection || new Set([])
-	)
-
-	const handleChange = (zoneId: number) => {
-		const newSelection = new Set(selection)
-		if (newSelection.has(zoneId)) {
-			newSelection.delete(zoneId)
-		} else {
-			newSelection.add(zoneId)
-		}
-
-		setSelection(newSelection)
-		if (props.onChange) {
-			props.onChange(newSelection)
-		}
-	}
-
-	const nZones = getConfig().n_zones
-	let items: React.ReactElement[] = []
-
-	for (let i = 1; i <= nZones; i++) {
-		items.push(
-			<Checkbox
-				key={i}
-				sx={{p: 0, m: 1}}
-				icon={<Chip label={i} color="default" />}
-				checkedIcon={<Chip label={i} color="primary" />}
-				checked={selection.has(i)}
-				onChange={() => handleChange(i)}
-			/>
-		)
-	}
-
-	return (
-		<Box>
-			<Typography>Plätze</Typography>
-			{items}
-		</Box>
-	)
-}
-
-type JobEditorProps = {
-	job: Job
-	jobEdit: (job: Job) => void
-	getBtn: (handleClickOpen: () => void) => React.ReactElement
-}
-
-function JobEditor(props: JobEditorProps) {
-	const [open, setOpen] = React.useState(false)
-
-	const [zones, setZones] = React.useState(new Set(props.job.zones))
-	const [timestamp, setTimestamp] = React.useState<number | null>(props.job.date)
-	const [datetimeInput, setDatetimeInput] = React.useState<Date | null>(
-		new Date((timestamp || 0) * 1000)
-	)
-	const [duration, setDuration] = React.useState(props.job.duration)
-	const [repeat, setRepeat] = React.useState(props.job.repeat)
-
-	const handleClickOpen = () => {
-		setOpen(true)
-	}
-
-	const handleClose = () => {
-		setOpen(false)
-	}
-
-	const handleOK = () => {
-		// Validate
-		if (zones.size === 0) {
-			return
-		}
-		if (timestamp === null) {
-			return
-		}
-		if (!(duration > 0)) {
-			return
-		}
-
-		const job = props.job
-		job.zones = Array.from(zones)
-		job.date = timestamp
-		job.duration = duration
-		job.repeat = repeat
-
-		props.jobEdit(job)
-		handleClose()
-	}
-
-	const handleDateUpdate = (newValue: Date | null) => {
-		setDatetimeInput(newValue)
-
-		if (newValue === null || isNaN(newValue.getTime())) {
-			setTimestamp(null)
-		} else {
-			setTimestamp(dateToTimestamp(newValue))
-		}
-	}
-
-	return (
-		<Box sx={{display: "inline"}}>
-			{props.getBtn(handleClickOpen)}
-			<Dialog open={open} onClose={handleClose}>
-				<DialogTitle>
-					Zeitplan {props.job.id > 0 ? "bearbeiten" : "erstellen"}
-				</DialogTitle>
-				<DialogContent>
-					<ZoneSelector
-						defaultSelection={zones}
-						onChange={(selection) => setZones(selection)}
-					/>
-					<LocalizationProvider dateAdapter={AdapterDateFns} locale={de}>
-						<DateTimePicker
-							renderInput={(props) => (
-								<TextField
-									variant="standard"
-									fullWidth
-									margin="dense"
-									{...props}
-								/>
-							)}
-							label="Datum/Zeit"
-							value={datetimeInput}
-							onChange={handleDateUpdate}
-							mask="__.__.____ __:__"
-						/>
-					</LocalizationProvider>
-
-					<DurationInput
-						textFieldProps={{
-							label: "Dauer",
-							fullWidth: true,
-							margin: "dense",
-							variant: "standard",
-						}}
-						value={duration}
-						onChange={(v) => setDuration(v)}
-					/>
-
-					<FormControlLabel
-						control={
-							<Checkbox
-								checked={repeat}
-								onChange={() => setRepeat(!repeat)}
-							/>
-						}
-						label="Täglich wiederholen"
-					/>
-				</DialogContent>
-				<DialogActions>
-					<Button onClick={handleClose}>Abbrechen</Button>
-					<Button onClick={handleOK}>OK</Button>
-				</DialogActions>
-			</Dialog>
-		</Box>
-	)
-}
-
-type JobTableProps = {
-	jobs: Job[]
-	jobEdit: (job: Job) => void
-	jobDelete: (jobId: number) => void
-}
-
-const JobTable = (props: JobTableProps) => {
-	return (
-		<TableContainer component={Paper}>
-			<Table sx={{minWidth: 650}} aria-label="simple table">
-				<TableHead>
-					<TableRow>
-						<TableCell>Ein/Aus</TableCell>
-						<TableCell>Plätze</TableCell>
-						<TableCell>Datum/Zeit</TableCell>
-						<TableCell>Dauer</TableCell>
-						<TableCell>Wiederholen</TableCell>
-						<TableCell>Bearbeiten</TableCell>
-					</TableRow>
-				</TableHead>
-				<TableBody>
-					{props.jobs.map((job) => {
-						return (
-							<TableRow key={job.id}>
-								<TableCell>
-									<IconButton
-										onClick={() => {
-											job.enable = !job.enable
-											props.jobEdit(job)
-										}}
-									>
-										{job.enable ? (
-											<PowerOnIcon color="primary" />
-										) : (
-											<PowerOffIcon />
-										)}
-									</IconButton>
-								</TableCell>
-								<TableCell>{job.zones.join(", ")}</TableCell>
-								<TableCell>{timestampToString(job.date)}</TableCell>
-								<TableCell>{secondsToString(job.duration)}</TableCell>
-								<TableCell>
-									{job.repeat ? (
-										<Chip label="Ja" color="primary" />
-									) : (
-										<Chip label="Nein" color="error" />
-									)}
-								</TableCell>
-								<TableCell>
-									<JobEditor
-										job={job}
-										jobEdit={props.jobEdit}
-										getBtn={(handleClickOpen) => (
-											<IconButton
-												aria-label="edit"
-												onClick={handleClickOpen}
-											>
-												<EditIcon />
-											</IconButton>
-										)}
-									/>
-									<IconButton
-										aria-label="delete"
-										onClick={() => props.jobDelete(job.id)}
-									>
-										<DeleteIcon />
-									</IconButton>
-								</TableCell>
-							</TableRow>
-						)
-					})}
-				</TableBody>
-			</Table>
-		</TableContainer>
-	)
-}
-
-type JobsProps = {}
-
-type JobsState = {
-	loaded: boolean
-	jobs: Job[]
-}
-
-export default class Jobs extends React.Component<JobsProps, JobsState> {
-	private updateTimeout: number | undefined
-
-	constructor(props: JobsProps) {
-		super(props)
-
-		this.state = {
-			loaded: false,
-			jobs: [],
-		}
-	}
-
-	private clearUpdateTimeout = () => {
-		if (this.updateTimeout !== undefined) {
-			window.clearTimeout(this.updateTimeout)
-		}
-	}
-
-	private updateJobs = () => {
-		this.clearUpdateTimeout()
-		this.setState({loaded: false})
-		tsgrainApi
-			.getJobs()
-			.then((response) => {
-				this.setState({loaded: true, jobs: response.data})
-			})
-			.catch((reason) => {
-				console.log("error fetching info", reason)
-				this.updateTimeout = window.setTimeout(this.updateJobs, 3000)
-			})
-	}
-
-	private jobEdit = (job: Job) => {
-		tsgrainApi
-			.updateJob(job)
-			.then((response) => {
-				this.updateJobs()
-			})
-			.catch(handleApiError)
-	}
-
-	private jobCreate = (job: Job) => {
-		tsgrainApi
-			.createJob(job)
-			.then((response) => {
-				this.updateJobs()
-			})
-			.catch(handleApiError)
-	}
-
-	private jobDelete = (jobId: number) => {
-		tsgrainApi
-			.deleteJob({id: jobId})
-			.then((response) => {
-				this.updateJobs()
-			})
-			.catch(handleApiError)
-	}
-
-	componentDidMount() {
-		this.updateJobs()
-	}
-
-	componentWillUnmount() {
-		this.clearUpdateTimeout()
-	}
-
-	render() {
-		return (
-			<Container maxWidth="md" sx={{px: 0}}>
-				{this.state.loaded ? (
-					<JobTable
-						jobs={this.state.jobs}
-						jobEdit={this.jobEdit}
-						jobDelete={this.jobDelete}
-					/>
-				) : (
-					<Card sx={{p: 1}}>
-						<Box sx={{display: "flex", justifyContent: "center"}}>
-							<CircularProgress />
-						</Box>
-					</Card>
-				)}
-				<JobEditor
-					job={{
-						id: 0,
-						date: getTimestamp() + 300,
-						duration: 300,
-						enable: true,
-						repeat: false,
-						zones: [],
-					}}
-					jobEdit={this.jobCreate}
-					getBtn={(handleClickOpen) => (
-						<Fab
-							sx={{
-								position: "absolute",
-								bottom: 32,
-								right: 32,
-							}}
-							color="primary"
-							aria-label="add"
-							onClick={handleClickOpen}
-						>
-							<AddIcon />
-						</Fab>
-					)}
-				/>
-			</Container>
-		)
-	}
-}

ui/src/components/Navbar.tsx

@@ -1,124 +0,0 @@
-import * as React from "react"
-import {
-	AppBar,
-	Box,
-	Toolbar,
-	IconButton,
-	Typography,
-	Menu,
-	Container,
-	Button,
-	MenuItem,
-	Switch,
-	FormControlLabel,
-} from "@mui/material"
-import MenuIcon from "@mui/icons-material/Menu"
-import {useLocation} from "wouter"
-import {getConfig} from "../util/config"
-import AutoModeSwitch from "./AutoMode"
-
-const pages: {[key: string]: string} = {
-	Steuerung: "/",
-	Zeitpläne: "/jobs",
-	Einstellungen: "/settings",
-}
-
-const Navbar = () => {
-	const [anchorElNav, setAnchorElNav] = React.useState<Element | null>(null)
-	const [location, setLocation] = useLocation()
-
-	const handleOpenNavMenu = (event: React.MouseEvent) => {
-		setAnchorElNav(event.currentTarget)
-	}
-
-	const handleCloseNavMenu = () => {
-		setAnchorElNav(null)
-	}
-
-	const handleTabClick = (page: string) => {
-		setLocation(pages[page])
-		handleCloseNavMenu()
-	}
-
-	return (
-		<AppBar position="static">
-			<Container maxWidth="xl">
-				<Toolbar disableGutters>
-					{/* Desktop title */}
-					<Typography
-						variant="h6"
-						noWrap
-						component="div"
-						sx={{mr: 2, display: {xs: "none", md: "flex"}}}
-					>
-						TSGRain
-					</Typography>
-
-					<Box sx={{flexGrow: 1, display: {xs: "flex", md: "none"}}}>
-						<IconButton
-							size="large"
-							aria-label="account of current user"
-							aria-controls="menu-appbar"
-							aria-haspopup="true"
-							onClick={handleOpenNavMenu}
-							color="inherit"
-						>
-							<MenuIcon />
-						</IconButton>
-						<Menu
-							id="menu-appbar"
-							anchorEl={anchorElNav}
-							anchorOrigin={{
-								vertical: "bottom",
-								horizontal: "left",
-							}}
-							keepMounted
-							transformOrigin={{
-								vertical: "top",
-								horizontal: "left",
-							}}
-							open={Boolean(anchorElNav)}
-							onClose={handleCloseNavMenu}
-							sx={{
-								display: {xs: "block", md: "none"},
-							}}
-						>
-							{Object.keys(pages).map((page) => (
-								<MenuItem
-									key={page}
-									onClick={() => handleTabClick(page)}
-								>
-									<Typography textAlign="center">{page}</Typography>
-								</MenuItem>
-							))}
-						</Menu>
-					</Box>
-					{/* Mobile title */}
-					<Typography
-						variant="h6"
-						noWrap
-						component="div"
-						sx={{flexGrow: 1, display: {xs: "flex", md: "none"}}}
-					>
-						TSGRain
-					</Typography>
-					<Box sx={{flexGrow: 1, display: {xs: "none", md: "flex"}}}>
-						{Object.keys(pages).map((page) => (
-							<Button
-								key={page}
-								onClick={() => handleTabClick(page)}
-								sx={{my: 2, color: "white", display: "block"}}
-							>
-								{page}
-							</Button>
-						))}
-					</Box>
-					<Box>
-						<AutoModeSwitch />
-					</Box>
-				</Toolbar>
-			</Container>
-		</AppBar>
-	)
-}
-export default Navbar

ui/src/components/NoConnectionBar.tsx

@@ -1,47 +0,0 @@
-import * as React from "react"
-import {Box, Typography} from "@mui/material"
-import {WebsocketClient} from "../util/websocket"
-
-type Props = {}
-
-type State = {
-	wsConnected: boolean
-}
-
-export default class NoConnectionBar extends React.Component<Props, State> {
-	private ws?: WebsocketClient
-
-	constructor(props: Props) {
-		super(props)
-
-		this.state = {
-			wsConnected: false,
-		}
-	}
-
-	private onWsStatusUpdate = (wsConnected: boolean) => {
-		this.setState({wsConnected: wsConnected})
-	}
-
-	componentDidMount() {
-		this.ws = new WebsocketClient(this.onWsStatusUpdate)
-		this.setState({wsConnected: this.ws.api().isConnected()})
-	}
-
-	componentWillUnmount() {
-		if (this.ws !== undefined) {
-			this.ws.destroy()
-		}
-	}
-
-	render() {
-		if (!this.state.wsConnected) {
-			return (
-				<Box sx={{bgcolor: "warning.main"}}>
-					<Typography align="center">Keine Verbindung</Typography>
-				</Box>
-			)
-		}
-		return null
-	}
-}

ui/src/components/Settings.tsx

@@ -1,315 +0,0 @@
-import * as React from "react"
-import {
-	Box,
-	Button,
-	Card,
-	CardActions,
-	CardContent,
-	CircularProgress,
-	Container,
-	TextField,
-	Typography,
-} from "@mui/material"
-import {tsgrainApi} from "../util/apiUrls"
-import {
-	dateToInputString,
-	dateToTimestamp,
-	handleApiError,
-	inputStringToDate,
-	timestampToDate,
-} from "../util/functions"
-import {getConfig} from "../util/config"
-import DurationInput from "./DurationInput"
-
-type IrrigationSettingsProps = {}
-
-type IrrigationSettingsState = {
-	loaded: boolean
-	irrigationTime: number
-}
-
-class IrrigationSettings extends React.Component<
-	IrrigationSettingsProps,
-	IrrigationSettingsState
-> {
-	private updateTimeout?: number
-	private initialIrrigationTime?: number
-
-	constructor(props: IrrigationSettingsProps) {
-		super(props)
-
-		this.state = {
-			loaded: false,
-			irrigationTime: 0,
-		}
-	}
-
-	private clearUpdateTimeout = () => {
-		if (this.updateTimeout !== undefined) {
-			window.clearTimeout(this.updateTimeout)
-		}
-	}
-
-	private updateSettings = () => {
-		this.clearUpdateTimeout()
-		this.setState({loaded: false})
-
-		tsgrainApi
-			.getDefaultIrrigationTime()
-			.then((response) => {
-				this.initialIrrigationTime = response.data.time
-
-				this.setState({
-					loaded: true,
-					irrigationTime: this.initialIrrigationTime,
-				})
-			})
-			.catch((reason) => {
-				console.log("error fetching irrigation settings", reason)
-				this.updateTimeout = window.setTimeout(this.updateSettings, 3000)
-			})
-	}
-
-	private showSubmit(): boolean {
-		return (
-			this.state.irrigationTime !== this.initialIrrigationTime &&
-			this.state.irrigationTime > 0
-		)
-	}
-
-	private submitSettings = () => {
-		const irrigationTime = this.state.irrigationTime
-		tsgrainApi
-			.setDefaultIrrigationTime({time: irrigationTime})
-			.then((response) => {
-				this.setState({irrigationTime: irrigationTime})
-			})
-			.catch(handleApiError)
-	}
-
-	componentDidMount() {
-		this.updateSettings()
-	}
-
-	componentWillUnmount() {
-		this.clearUpdateTimeout()
-	}
-
-	renderSettings() {
-		return (
-			<Box>
-				<Card sx={{mb: 2}}>
-					<CardContent>
-						<Typography variant="h5">Bewässerungssteuerung</Typography>
-
-						<DurationInput
-							textFieldProps={{
-								label: "Manuelle Bewässerungszeit",
-								fullWidth: true,
-								margin: "dense",
-								variant: "standard",
-							}}
-							value={this.state.irrigationTime}
-							onChange={(v) => this.setState({irrigationTime: v})}
-						/>
-					</CardContent>
-					{this.showSubmit() ? (
-						<CardActions>
-							<Button size="small" onClick={this.submitSettings}>
-								OK
-							</Button>
-						</CardActions>
-					) : null}
-				</Card>
-			</Box>
-		)
-	}
-
-	render() {
-		if (this.state.loaded) return this.renderSettings()
-
-		return (
-			<Card sx={{p: 1}}>
-				<Box sx={{display: "flex", justifyContent: "center"}}>
-					<CircularProgress />
-				</Box>
-			</Card>
-		)
-	}
-}
-
-type TimeSettingsProps = {}
-
-type TimeSettingsState = {
-	loaded: boolean
-	date: Date
-	dateStr: string
-	timezone: string
-}
-
-class TimeSettings extends React.Component<TimeSettingsProps, TimeSettingsState> {
-	private updateTimeout?: number
-	private timerID?: number
-
-	private initialDate?: Date
-	private initialTimezone?: string
-
-	constructor(props: TimeSettingsProps) {
-		super(props)
-
-		const now = new Date()
-		this.state = {
-			loaded: false,
-			date: now,
-			dateStr: dateToInputString(now),
-			timezone: "",
-		}
-	}
-
-	private clearUpdateTimeout = () => {
-		if (this.updateTimeout !== undefined) {
-			window.clearTimeout(this.updateTimeout)
-		}
-	}
-
-	private updateSettings = () => {
-		this.clearUpdateTimeout()
-		this.setState({loaded: false})
-
-		tsgrainApi
-			.getSystemTime()
-			.then((response) => {
-				this.initialDate = timestampToDate(response.data.time)
-				this.initialTimezone = response.data.timezone
-
-				this.setState({
-					loaded: true,
-					dateStr: dateToInputString(this.initialDate),
-					timezone: this.initialTimezone,
-				})
-
-				this.timerID = setInterval(this.tick, 1000)
-			})
-			.catch((reason) => {
-				console.log("error fetching time settings", reason)
-				this.updateTimeout = window.setTimeout(this.updateSettings, 3000)
-			})
-	}
-
-	private tick = () => {
-		if (this.state.date !== null) {
-			const newDate = new Date(this.state.date.getTime() + 1000)
-			this.setState({
-				date: newDate,
-				dateStr: dateToInputString(newDate),
-			})
-		}
-	}
-
-	private showSubmit(): boolean {
-		return (
-			this.state.date !== this.initialDate ||
-			this.state.timezone !== this.initialTimezone
-		)
-	}
-
-	private submitSettings = () => {
-		const date = this.state.date
-		if (date !== this.initialDate) {
-			tsgrainApi
-				.setSystemTime({time: dateToTimestamp(date)})
-				.then((response) => {
-					this.updateSettings()
-				})
-				.catch(handleApiError)
-		}
-
-		const tz = this.state.timezone
-		if (tz !== this.initialTimezone) {
-			tsgrainApi
-				.setSystemTimezone({timezone: this.state.timezone})
-				.then((response) => {
-					this.initialTimezone = tz
-					this.setState({timezone: tz})
-				})
-				.catch(handleApiError)
-		}
-	}
-
-	componentDidMount() {
-		this.updateSettings()
-	}
-
-	componentWillUnmount() {
-		this.clearUpdateTimeout()
-		clearInterval(this.timerID)
-	}
-
-	renderSettings() {
-		return (
-			<Card sx={{mb: 2}}>
-				<CardContent>
-					<Typography variant="h5">Datum/Uhrzeit</Typography>
-
-					<TextField
-						label="Datum/Zeit"
-						fullWidth
-						margin="dense"
-						variant="standard"
-						type="datetime-local"
-						value={this.state.dateStr}
-						onChange={(e) => {
-							clearInterval(this.timerID)
-							this.setState({
-								dateStr: e.target.value,
-								date: inputStringToDate(e.target.value),
-							})
-						}}
-					/>
-
-					<TextField
-						label="Zeitzone"
-						fullWidth
-						margin="dense"
-						variant="standard"
-						value={this.state.timezone}
-						onChange={(e) => this.setState({timezone: e.target.value})}
-					/>
-				</CardContent>
-				{this.showSubmit() ? (
-					<CardActions>
-						<Button size="small" onClick={this.submitSettings}>
-							OK
-						</Button>
-					</CardActions>
-				) : null}
-			</Card>
-		)
-	}
-
-	render() {
-		if (this.state.loaded) return this.renderSettings()
-
-		return (
-			<Card sx={{p: 1}}>
-				<Box sx={{display: "flex", justifyContent: "center"}}>
-					<CircularProgress />
-				</Box>
-			</Card>
-		)
-	}
-}
-
-const Settings = () => {
-	return (
-		<Container maxWidth="md" sx={{px: 0}}>
-			<IrrigationSettings />
-			<TimeSettings />
-			<Card sx={{mb: 2, p: 1, textAlign: "center"}}>
-				TSGRain WebUI Version: {getConfig().version}
-			</Card>
-		</Container>
-	)
-}
-
-export default Settings

ui/src/components/app.tsx

@@ -0,0 +1,10 @@
+import {Component} from "preact"
+// import UpdaterView from "./Updater/UpdaterView"
+// import logo from "../assets/logo.svg"
+import {getConfig} from "../util/config"
+
+export default class App extends Component {
+	render() {
+		return <div>{getConfig().version}</div>
+	}
+}

ui/src/main.tsx

@@ -1,17 +1,5 @@
-import * as React from "react"
+import {render} from "preact"
-import ReactDOM from "react-dom"
+import App from "./components/app"
-import {CssBaseline} from "@mui/material"
+import "./style/index.scss"
-import {ThemeProvider} from "@mui/material/styles"
-import App from "./App"
-import theme from "./theme"
 
-ReactDOM.render(
+render(<App />, document.getElementById("app")!)
-	<React.StrictMode>
-		<ThemeProvider theme={theme}>
-			{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
-			<CssBaseline />
-			<App />
-		</ThemeProvider>
-	</React.StrictMode>,
-	document.getElementById("app")
-)

ui/src/preact.d.ts

@@ -0,0 +1 @@
+import JSX = preact.JSX

ui/src/theme.ts

@@ -1,19 +0,0 @@
-import {createTheme} from "@mui/material/styles"
-import {red} from "@mui/material/colors"
-
-// Create a theme instance.
-const theme = createTheme({
-	palette: {
-		primary: {
-			main: "#357a38",
-		},
-		secondary: {
-			main: "#ff3d00",
-		},
-		error: {
-			main: red.A400,
-		},
-	},
-})
-
-export default theme

ui/src/tsgrain-client/.openapi-generator/FILES

@@ -1,5 +1,6 @@
 .gitignore
 .npmignore
+.openapi-generator-ignore
 api.ts
 base.ts
 common.ts

ui/src/tsgrain-client/.openapi-generator/VERSION

@@ -1 +1 @@
-5.4.0
+5.3.1

ui/src/tsgrain-client/api.ts

@@ -50,6 +50,25 @@ export interface AutoMode {
 	 */
 	state: boolean
 }
+/**
+ * Aktuelle Systemzeit/Zeitzone
+ * @export
+ * @interface ConfigTime
+ */
+export interface ConfigTime {
+	/**
+	 * Aktuelle Systemzeit
+	 * @type {number}
+	 * @memberof ConfigTime
+	 */
+	time: number
+	/**
+	 * Aktuelle Zeitzone
+	 * @type {string}
+	 * @memberof ConfigTime
+	 */
+	timezone: string
+}
 /**
  * Manuelle Bewässerungszeit in Sekunden
  * @export
@@ -63,6 +82,50 @@ export interface DefaultIrrigationTime {
 	 */
 	time: number
 }
+/**
+ *
+ * @export
+ * @interface InlineObject
+ */
+export interface InlineObject {
+	/**
+	 *
+	 * @type {boolean}
+	 * @memberof InlineObject
+	 */
+	state: boolean
+}
+/**
+ *
+ * @export
+ * @interface InlineObject1
+ */
+export interface InlineObject1 {
+	/**
+	 * Aufgabe stoppen/aus der Warteschlange entfernen, wenn sie bereits läuft oder sich in der Warteschlange befindet.
+	 * @type {boolean}
+	 * @memberof InlineObject1
+	 */
+	cancelling: boolean
+	/**
+	 * Bewässerungsdauer in Sekunden (0: Standarddauer)
+	 * @type {number}
+	 * @memberof InlineObject1
+	 */
+	duration: number
+	/**
+	 * Aufgabe in die Warteschlange einreihen, wenn sie nicht sofort ausgeführt werden kann.
+	 * @type {boolean}
+	 * @memberof InlineObject1
+	 */
+	queuing: boolean
+	/**
+	 * Nummer der Bewässerungszone
+	 * @type {number}
+	 * @memberof InlineObject1
+	 */
+	zone_id: number
+}
 /**
  * Job stellt einen Bewässerungszeitplan dar.
  * @export
@@ -200,25 +263,6 @@ export interface StatusMessage {
 	 */
 	success: boolean
 }
-/**
- * Aktuelle Systemzeit/Zeitzone
- * @export
- * @interface SystemTime
- */
-export interface SystemTime {
-	/**
-	 * Aktuelle Systemzeit
-	 * @type {number}
-	 * @memberof SystemTime
-	 */
-	time: number
-	/**
-	 * Aktuelle Zeitzone
-	 * @type {string}
-	 * @memberof SystemTime
-	 */
-	timezone: string
-}
 /**
  * Task stellt eine Bewässerungsaufgabe dar.
  * @export
@@ -282,43 +326,23 @@ export interface TaskList {
 	tasks: Array<Task>
 }
 /**
- * Zeitstempel
+ * TaskRequestResult wird beim Starten eines Tasks zurückgegeben
  * @export
- * @interface Timestamp
+ * @interface TaskRequestResult
  */
-export interface Timestamp {
+export interface TaskRequestResult {
 	/**
 	 *
-	 * @type {number}
+	 * @type {boolean}
-	 * @memberof Timestamp
+	 * @memberof TaskRequestResult
 	 */
-	time: number
+	Started?: boolean
-}
-/**
- * Systemzeitzone
- * @export
- * @interface Timezone
- */
-export interface Timezone {
 	/**
 	 *
-	 * @type {string}
+	 * @type {boolean}
-	 * @memberof Timezone
+	 * @memberof TaskRequestResult
 	 */
-	timezone: string
+	Stopped?: boolean
-}
-/**
- *
- * @export
- * @interface ZoneID
- */
-export interface ZoneID {
-	/**
-	 *
-	 * @type {number}
-	 * @memberof ZoneID
-	 */
-	id?: number
 }
 
 /**
@@ -376,12 +400,12 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 		/**
 		 *
 		 * @summary Lösche einen gespeicherten Zeitplan.
-		 * @param {JobID} [jobId] JobID
+		 * @param {number} [id]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
 		deleteJob: async (
-			jobId?: JobID,
+			id?: number,
 			options: AxiosRequestConfig = {}
 		): Promise<RequestArgs> => {
 			const localVarPath = `/job`
@@ -411,7 +435,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 				...options.headers,
 			}
 			localVarRequestOptions.data = serializeDataIfNeeded(
-				jobId,
+				id,
 				localVarRequestOptions,
 				configuration
 			)
@@ -454,6 +478,40 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 				options: localVarRequestOptions,
 			}
 		},
+		/**
+		 * Rufe die aktuelle Systemzeit/Zeitzone ab
+		 * @param {*} [options] Override http request option.
+		 * @throws {RequiredError}
+		 */
+		getConfigTime: async (
+			options: AxiosRequestConfig = {}
+		): Promise<RequestArgs> => {
+			const localVarPath = `/config/time`
+			// use dummy base URL string because the URL constructor only accepts absolute URLs.
+			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
+			let baseOptions
+			if (configuration) {
+				baseOptions = configuration.baseOptions
+			}
+
+			const localVarRequestOptions = {method: "GET", ...baseOptions, ...options}
+			const localVarHeaderParameter = {} as any
+			const localVarQueryParameter = {} as any
+
+			setSearchParams(localVarUrlObj, localVarQueryParameter)
+			let headersFromBaseOptions =
+				baseOptions && baseOptions.headers ? baseOptions.headers : {}
+			localVarRequestOptions.headers = {
+				...localVarHeaderParameter,
+				...headersFromBaseOptions,
+				...options.headers,
+			}
+
+			return {
+				url: toPathString(localVarUrlObj),
+				options: localVarRequestOptions,
+			}
+		},
 		/**
 		 *
 		 * @summary Rufe die Standardzeit bei manueller Bewässerung ab.
@@ -565,81 +623,14 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 				options: localVarRequestOptions,
 			}
 		},
-		/**
-		 * Rufe die aktuelle Systemzeit/Zeitzone ab
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		getSystemTime: async (
-			options: AxiosRequestConfig = {}
-		): Promise<RequestArgs> => {
-			const localVarPath = `/config/time`
-			// use dummy base URL string because the URL constructor only accepts absolute URLs.
-			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
-			let baseOptions
-			if (configuration) {
-				baseOptions = configuration.baseOptions
-			}
-
-			const localVarRequestOptions = {method: "GET", ...baseOptions, ...options}
-			const localVarHeaderParameter = {} as any
-			const localVarQueryParameter = {} as any
-
-			setSearchParams(localVarUrlObj, localVarQueryParameter)
-			let headersFromBaseOptions =
-				baseOptions && baseOptions.headers ? baseOptions.headers : {}
-			localVarRequestOptions.headers = {
-				...localVarHeaderParameter,
-				...headersFromBaseOptions,
-				...options.headers,
-			}
-
-			return {
-				url: toPathString(localVarUrlObj),
-				options: localVarRequestOptions,
-			}
-		},
-		/**
-		 *
-		 * @summary Rufe alle momentan laufenden Bewässerungsaufgaben ab.
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		getTasks: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-			const localVarPath = `/tasks`
-			// use dummy base URL string because the URL constructor only accepts absolute URLs.
-			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
-			let baseOptions
-			if (configuration) {
-				baseOptions = configuration.baseOptions
-			}
-
-			const localVarRequestOptions = {method: "GET", ...baseOptions, ...options}
-			const localVarHeaderParameter = {} as any
-			const localVarQueryParameter = {} as any
-
-			setSearchParams(localVarUrlObj, localVarQueryParameter)
-			let headersFromBaseOptions =
-				baseOptions && baseOptions.headers ? baseOptions.headers : {}
-			localVarRequestOptions.headers = {
-				...localVarHeaderParameter,
-				...headersFromBaseOptions,
-				...options.headers,
-			}
-
-			return {
-				url: toPathString(localVarUrlObj),
-				options: localVarRequestOptions,
-			}
-		},
 		/**
 		 * Automatikmodus aktivieren/deaktivieren
-		 * @param {AutoMode} [state] Zustand des Automatikmodus
+		 * @param {InlineObject} [state]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
 		setAutoMode: async (
-			state?: AutoMode,
+			state?: InlineObject,
 			options: AxiosRequestConfig = {}
 		): Promise<RequestArgs> => {
 			const localVarPath = `/config/auto`
@@ -675,6 +666,49 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 				options: localVarRequestOptions,
 			}
 		},
+		/**
+		 * Automatikmodus aktivieren/deaktivieren
+		 * @param {ConfigTime} [configTime]
+		 * @param {*} [options] Override http request option.
+		 * @throws {RequiredError}
+		 */
+		setConfigTime: async (
+			configTime?: ConfigTime,
+			options: AxiosRequestConfig = {}
+		): Promise<RequestArgs> => {
+			const localVarPath = `/config/time`
+			// use dummy base URL string because the URL constructor only accepts absolute URLs.
+			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
+			let baseOptions
+			if (configuration) {
+				baseOptions = configuration.baseOptions
+			}
+
+			const localVarRequestOptions = {method: "POST", ...baseOptions, ...options}
+			const localVarHeaderParameter = {} as any
+			const localVarQueryParameter = {} as any
+
+			localVarHeaderParameter["Content-Type"] = "application/json"
+
+			setSearchParams(localVarUrlObj, localVarQueryParameter)
+			let headersFromBaseOptions =
+				baseOptions && baseOptions.headers ? baseOptions.headers : {}
+			localVarRequestOptions.headers = {
+				...localVarHeaderParameter,
+				...headersFromBaseOptions,
+				...options.headers,
+			}
+			localVarRequestOptions.data = serializeDataIfNeeded(
+				configTime,
+				localVarRequestOptions,
+				configuration
+			)
+
+			return {
+				url: toPathString(localVarUrlObj),
+				options: localVarRequestOptions,
+			}
+		},
 		/**
 		 *
 		 * @summary Setze die die Standardzeit bei manueller Bewässerung.
@@ -720,16 +754,16 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 			}
 		},
 		/**
-		 * Systemzeit einstellen
+		 * Starte/stoppe manuell eine neue Bewässerungsaufgabe
-		 * @param {Timestamp} [timestamp]
+		 * @param {InlineObject1} [taskRequest]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		setSystemTime: async (
+		startManualTask: async (
-			timestamp?: Timestamp,
+			taskRequest?: InlineObject1,
 			options: AxiosRequestConfig = {}
 		): Promise<RequestArgs> => {
-			const localVarPath = `/config/time`
+			const localVarPath = `/task/manual`
 			// use dummy base URL string because the URL constructor only accepts absolute URLs.
 			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
 			let baseOptions
@@ -752,137 +786,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 				...options.headers,
 			}
 			localVarRequestOptions.data = serializeDataIfNeeded(
-				timestamp,
+				taskRequest,
-				localVarRequestOptions,
-				configuration
-			)
-
-			return {
-				url: toPathString(localVarUrlObj),
-				options: localVarRequestOptions,
-			}
-		},
-		/**
-		 * Systemzeitzone einstellen
-		 * @param {Timezone} [timezone]
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		setSystemTimezone: async (
-			timezone?: Timezone,
-			options: AxiosRequestConfig = {}
-		): Promise<RequestArgs> => {
-			const localVarPath = `/config/timezone`
-			// use dummy base URL string because the URL constructor only accepts absolute URLs.
-			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
-			let baseOptions
-			if (configuration) {
-				baseOptions = configuration.baseOptions
-			}
-
-			const localVarRequestOptions = {method: "POST", ...baseOptions, ...options}
-			const localVarHeaderParameter = {} as any
-			const localVarQueryParameter = {} as any
-
-			localVarHeaderParameter["Content-Type"] = "application/json"
-
-			setSearchParams(localVarUrlObj, localVarQueryParameter)
-			let headersFromBaseOptions =
-				baseOptions && baseOptions.headers ? baseOptions.headers : {}
-			localVarRequestOptions.headers = {
-				...localVarHeaderParameter,
-				...headersFromBaseOptions,
-				...options.headers,
-			}
-			localVarRequestOptions.data = serializeDataIfNeeded(
-				timezone,
-				localVarRequestOptions,
-				configuration
-			)
-
-			return {
-				url: toPathString(localVarUrlObj),
-				options: localVarRequestOptions,
-			}
-		},
-		/**
-		 * Starte eine neue manuelle Bewässerungsaufgabe mit der eingestellten Standardzeit.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		startTask: async (
-			zoneId?: ZoneID,
-			options: AxiosRequestConfig = {}
-		): Promise<RequestArgs> => {
-			const localVarPath = `/task/start`
-			// use dummy base URL string because the URL constructor only accepts absolute URLs.
-			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
-			let baseOptions
-			if (configuration) {
-				baseOptions = configuration.baseOptions
-			}
-
-			const localVarRequestOptions = {method: "POST", ...baseOptions, ...options}
-			const localVarHeaderParameter = {} as any
-			const localVarQueryParameter = {} as any
-
-			localVarHeaderParameter["Content-Type"] = "application/json"
-
-			setSearchParams(localVarUrlObj, localVarQueryParameter)
-			let headersFromBaseOptions =
-				baseOptions && baseOptions.headers ? baseOptions.headers : {}
-			localVarRequestOptions.headers = {
-				...localVarHeaderParameter,
-				...headersFromBaseOptions,
-				...options.headers,
-			}
-			localVarRequestOptions.data = serializeDataIfNeeded(
-				zoneId,
-				localVarRequestOptions,
-				configuration
-			)
-
-			return {
-				url: toPathString(localVarUrlObj),
-				options: localVarRequestOptions,
-			}
-		},
-		/**
-		 *
-		 * @summary Stoppe eine manuelle Bewässerungsaufgabe.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		stopTask: async (
-			zoneId?: ZoneID,
-			options: AxiosRequestConfig = {}
-		): Promise<RequestArgs> => {
-			const localVarPath = `/task/stop`
-			// use dummy base URL string because the URL constructor only accepts absolute URLs.
-			const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
-			let baseOptions
-			if (configuration) {
-				baseOptions = configuration.baseOptions
-			}
-
-			const localVarRequestOptions = {method: "POST", ...baseOptions, ...options}
-			const localVarHeaderParameter = {} as any
-			const localVarQueryParameter = {} as any
-
-			localVarHeaderParameter["Content-Type"] = "application/json"
-
-			setSearchParams(localVarUrlObj, localVarQueryParameter)
-			let headersFromBaseOptions =
-				baseOptions && baseOptions.headers ? baseOptions.headers : {}
-			localVarRequestOptions.headers = {
-				...localVarHeaderParameter,
-				...headersFromBaseOptions,
-				...options.headers,
-			}
-			localVarRequestOptions.data = serializeDataIfNeeded(
-				zoneId,
 				localVarRequestOptions,
 				configuration
 			)
@@ -973,18 +877,18 @@ export const DefaultApiFp = function (configuration?: Configuration) {
 		/**
 		 *
 		 * @summary Lösche einen gespeicherten Zeitplan.
-		 * @param {JobID} [jobId] JobID
+		 * @param {number} [id]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
 		async deleteJob(
-			jobId?: JobID,
+			id?: number,
 			options?: AxiosRequestConfig
 		): Promise<
 			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
 		> {
 			const localVarAxiosArgs = await localVarAxiosParamCreator.deleteJob(
-				jobId,
+				id,
 				options
 			)
 			return createRequestFunction(
@@ -1015,6 +919,26 @@ export const DefaultApiFp = function (configuration?: Configuration) {
 				configuration
 			)
 		},
+		/**
+		 * Rufe die aktuelle Systemzeit/Zeitzone ab
+		 * @param {*} [options] Override http request option.
+		 * @throws {RequiredError}
+		 */
+		async getConfigTime(
+			options?: AxiosRequestConfig
+		): Promise<
+			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ConfigTime>
+		> {
+			const localVarAxiosArgs = await localVarAxiosParamCreator.getConfigTime(
+				options
+			)
+			return createRequestFunction(
+				localVarAxiosArgs,
+				globalAxios,
+				BASE_PATH,
+				configuration
+			)
+		},
 		/**
 		 *
 		 * @summary Rufe die Standardzeit bei manueller Bewässerung ab.
@@ -1080,16 +1004,19 @@ export const DefaultApiFp = function (configuration?: Configuration) {
 			)
 		},
 		/**
-		 * Rufe die aktuelle Systemzeit/Zeitzone ab
+		 * Automatikmodus aktivieren/deaktivieren
+		 * @param {InlineObject} [state]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		async getSystemTime(
+		async setAutoMode(
+			state?: InlineObject,
 			options?: AxiosRequestConfig
 		): Promise<
-			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SystemTime>
+			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
 		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.getSystemTime(
+			const localVarAxiosArgs = await localVarAxiosParamCreator.setAutoMode(
+				state,
 				options
 			)
 			return createRequestFunction(
@@ -1099,39 +1026,20 @@ export const DefaultApiFp = function (configuration?: Configuration) {
 				configuration
 			)
 		},
-		/**
-		 *
-		 * @summary Rufe alle momentan laufenden Bewässerungsaufgaben ab.
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		async getTasks(
-			options?: AxiosRequestConfig
-		): Promise<
-			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TaskList>
-		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.getTasks(options)
-			return createRequestFunction(
-				localVarAxiosArgs,
-				globalAxios,
-				BASE_PATH,
-				configuration
-			)
-		},
 		/**
 		 * Automatikmodus aktivieren/deaktivieren
-		 * @param {AutoMode} [state] Zustand des Automatikmodus
+		 * @param {ConfigTime} [configTime]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		async setAutoMode(
+		async setConfigTime(
-			state?: AutoMode,
+			configTime?: ConfigTime,
 			options?: AxiosRequestConfig
 		): Promise<
 			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
 		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.setAutoMode(
+			const localVarAxiosArgs = await localVarAxiosParamCreator.setConfigTime(
-				state,
+				configTime,
 				options
 			)
 			return createRequestFunction(
@@ -1167,89 +1075,19 @@ export const DefaultApiFp = function (configuration?: Configuration) {
 			)
 		},
 		/**
-		 * Systemzeit einstellen
+		 * Starte/stoppe manuell eine neue Bewässerungsaufgabe
-		 * @param {Timestamp} [timestamp]
+		 * @param {InlineObject1} [taskRequest]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		async setSystemTime(
+		async startManualTask(
-			timestamp?: Timestamp,
+			taskRequest?: InlineObject1,
 			options?: AxiosRequestConfig
 		): Promise<
 			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
 		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.setSystemTime(
+			const localVarAxiosArgs = await localVarAxiosParamCreator.startManualTask(
-				timestamp,
+				taskRequest,
-				options
-			)
-			return createRequestFunction(
-				localVarAxiosArgs,
-				globalAxios,
-				BASE_PATH,
-				configuration
-			)
-		},
-		/**
-		 * Systemzeitzone einstellen
-		 * @param {Timezone} [timezone]
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		async setSystemTimezone(
-			timezone?: Timezone,
-			options?: AxiosRequestConfig
-		): Promise<
-			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
-		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.setSystemTimezone(
-				timezone,
-				options
-			)
-			return createRequestFunction(
-				localVarAxiosArgs,
-				globalAxios,
-				BASE_PATH,
-				configuration
-			)
-		},
-		/**
-		 * Starte eine neue manuelle Bewässerungsaufgabe mit der eingestellten Standardzeit.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		async startTask(
-			zoneId?: ZoneID,
-			options?: AxiosRequestConfig
-		): Promise<
-			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
-		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.startTask(
-				zoneId,
-				options
-			)
-			return createRequestFunction(
-				localVarAxiosArgs,
-				globalAxios,
-				BASE_PATH,
-				configuration
-			)
-		},
-		/**
-		 *
-		 * @summary Stoppe eine manuelle Bewässerungsaufgabe.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		async stopTask(
-			zoneId?: ZoneID,
-			options?: AxiosRequestConfig
-		): Promise<
-			(axios?: AxiosInstance, basePath?: string) => AxiosPromise<StatusMessage>
-		> {
-			const localVarAxiosArgs = await localVarAxiosParamCreator.stopTask(
-				zoneId,
 				options
 			)
 			return createRequestFunction(
@@ -1312,13 +1150,13 @@ export const DefaultApiFactory = function (
 		/**
 		 *
 		 * @summary Lösche einen gespeicherten Zeitplan.
-		 * @param {JobID} [jobId] JobID
+		 * @param {number} [id]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		deleteJob(jobId?: JobID, options?: any): AxiosPromise<StatusMessage> {
+		deleteJob(id?: number, options?: any): AxiosPromise<StatusMessage> {
 			return localVarFp
-				.deleteJob(jobId, options)
+				.deleteJob(id, options)
 				.then((request) => request(axios, basePath))
 		},
 		/**
@@ -1332,6 +1170,16 @@ export const DefaultApiFactory = function (
 				.getAutoMode(options)
 				.then((request) => request(axios, basePath))
 		},
+		/**
+		 * Rufe die aktuelle Systemzeit/Zeitzone ab
+		 * @param {*} [options] Override http request option.
+		 * @throws {RequiredError}
+		 */
+		getConfigTime(options?: any): AxiosPromise<ConfigTime> {
+			return localVarFp
+				.getConfigTime(options)
+				.then((request) => request(axios, basePath))
+		},
 		/**
 		 *
 		 * @summary Rufe die Standardzeit bei manueller Bewässerung ab.
@@ -1367,35 +1215,28 @@ export const DefaultApiFactory = function (
 				.then((request) => request(axios, basePath))
 		},
 		/**
-		 * Rufe die aktuelle Systemzeit/Zeitzone ab
+		 * Automatikmodus aktivieren/deaktivieren
+		 * @param {InlineObject} [state]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		getSystemTime(options?: any): AxiosPromise<SystemTime> {
+		setAutoMode(state?: InlineObject, options?: any): AxiosPromise<StatusMessage> {
 			return localVarFp
-				.getSystemTime(options)
+				.setAutoMode(state, options)
-				.then((request) => request(axios, basePath))
-		},
-		/**
-		 *
-		 * @summary Rufe alle momentan laufenden Bewässerungsaufgaben ab.
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		getTasks(options?: any): AxiosPromise<TaskList> {
-			return localVarFp
-				.getTasks(options)
 				.then((request) => request(axios, basePath))
 		},
 		/**
 		 * Automatikmodus aktivieren/deaktivieren
-		 * @param {AutoMode} [state] Zustand des Automatikmodus
+		 * @param {ConfigTime} [configTime]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		setAutoMode(state?: AutoMode, options?: any): AxiosPromise<StatusMessage> {
+		setConfigTime(
+			configTime?: ConfigTime,
+			options?: any
+		): AxiosPromise<StatusMessage> {
 			return localVarFp
-				.setAutoMode(state, options)
+				.setConfigTime(configTime, options)
 				.then((request) => request(axios, basePath))
 		},
 		/**
@@ -1414,54 +1255,17 @@ export const DefaultApiFactory = function (
 				.then((request) => request(axios, basePath))
 		},
 		/**
-		 * Systemzeit einstellen
+		 * Starte/stoppe manuell eine neue Bewässerungsaufgabe
-		 * @param {Timestamp} [timestamp]
+		 * @param {InlineObject1} [taskRequest]
 		 * @param {*} [options] Override http request option.
 		 * @throws {RequiredError}
 		 */
-		setSystemTime(
+		startManualTask(
-			timestamp?: Timestamp,
+			taskRequest?: InlineObject1,
 			options?: any
 		): AxiosPromise<StatusMessage> {
 			return localVarFp
-				.setSystemTime(timestamp, options)
+				.startManualTask(taskRequest, options)
-				.then((request) => request(axios, basePath))
-		},
-		/**
-		 * Systemzeitzone einstellen
-		 * @param {Timezone} [timezone]
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		setSystemTimezone(
-			timezone?: Timezone,
-			options?: any
-		): AxiosPromise<StatusMessage> {
-			return localVarFp
-				.setSystemTimezone(timezone, options)
-				.then((request) => request(axios, basePath))
-		},
-		/**
-		 * Starte eine neue manuelle Bewässerungsaufgabe mit der eingestellten Standardzeit.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		startTask(zoneId?: ZoneID, options?: any): AxiosPromise<StatusMessage> {
-			return localVarFp
-				.startTask(zoneId, options)
-				.then((request) => request(axios, basePath))
-		},
-		/**
-		 *
-		 * @summary Stoppe eine manuelle Bewässerungsaufgabe.
-		 * @param {ZoneID} [zoneId] ZoneID
-		 * @param {*} [options] Override http request option.
-		 * @throws {RequiredError}
-		 */
-		stopTask(zoneId?: ZoneID, options?: any): AxiosPromise<StatusMessage> {
-			return localVarFp
-				.stopTask(zoneId, options)
 				.then((request) => request(axios, basePath))
 		},
 		/**
@@ -1503,14 +1307,14 @@ export class DefaultApi extends BaseAPI {
 	/**
 	 *
 	 * @summary Lösche einen gespeicherten Zeitplan.
-	 * @param {JobID} [jobId] JobID
+	 * @param {number} [id]
 	 * @param {*} [options] Override http request option.
 	 * @throws {RequiredError}
 	 * @memberof DefaultApi
 	 */
-	public deleteJob(jobId?: JobID, options?: AxiosRequestConfig) {
+	public deleteJob(id?: number, options?: AxiosRequestConfig) {
 		return DefaultApiFp(this.configuration)
-			.deleteJob(jobId, options)
+			.deleteJob(id, options)
 			.then((request) => request(this.axios, this.basePath))
 	}
 
@@ -1527,6 +1331,18 @@ export class DefaultApi extends BaseAPI {
 			.then((request) => request(this.axios, this.basePath))
 	}
 
+	/**
+	 * Rufe die aktuelle Systemzeit/Zeitzone ab
+	 * @param {*} [options] Override http request option.
+	 * @throws {RequiredError}
+	 * @memberof DefaultApi
+	 */
+	public getConfigTime(options?: AxiosRequestConfig) {
+		return DefaultApiFp(this.configuration)
+			.getConfigTime(options)
+			.then((request) => request(this.axios, this.basePath))
+	}
+
 	/**
 	 *
 	 * @summary Rufe die Standardzeit bei manueller Bewässerung ab.
@@ -1568,40 +1384,28 @@ export class DefaultApi extends BaseAPI {
 	}
 
 	/**
-	 * Rufe die aktuelle Systemzeit/Zeitzone ab
+	 * Automatikmodus aktivieren/deaktivieren
+	 * @param {InlineObject} [state]
 	 * @param {*} [options] Override http request option.
 	 * @throws {RequiredError}
 	 * @memberof DefaultApi
 	 */
-	public getSystemTime(options?: AxiosRequestConfig) {
+	public setAutoMode(state?: InlineObject, options?: AxiosRequestConfig) {
 		return DefaultApiFp(this.configuration)
-			.getSystemTime(options)
+			.setAutoMode(state, options)
-			.then((request) => request(this.axios, this.basePath))
-	}
-
-	/**
-	 *
-	 * @summary Rufe alle momentan laufenden Bewässerungsaufgaben ab.
-	 * @param {*} [options] Override http request option.
-	 * @throws {RequiredError}
-	 * @memberof DefaultApi
-	 */
-	public getTasks(options?: AxiosRequestConfig) {
-		return DefaultApiFp(this.configuration)
-			.getTasks(options)
 			.then((request) => request(this.axios, this.basePath))
 	}
 
 	/**
 	 * Automatikmodus aktivieren/deaktivieren
-	 * @param {AutoMode} [state] Zustand des Automatikmodus
+	 * @param {ConfigTime} [configTime]
 	 * @param {*} [options] Override http request option.
 	 * @throws {RequiredError}
 	 * @memberof DefaultApi
 	 */
-	public setAutoMode(state?: AutoMode, options?: AxiosRequestConfig) {
+	public setConfigTime(configTime?: ConfigTime, options?: AxiosRequestConfig) {
 		return DefaultApiFp(this.configuration)
-			.setAutoMode(state, options)
+			.setConfigTime(configTime, options)
 			.then((request) => request(this.axios, this.basePath))
 	}
 
@@ -1623,55 +1427,15 @@ export class DefaultApi extends BaseAPI {
 	}
 
 	/**
-	 * Systemzeit einstellen
+	 * Starte/stoppe manuell eine neue Bewässerungsaufgabe
-	 * @param {Timestamp} [timestamp]
+	 * @param {InlineObject1} [taskRequest]
 	 * @param {*} [options] Override http request option.
 	 * @throws {RequiredError}
 	 * @memberof DefaultApi
 	 */
-	public setSystemTime(timestamp?: Timestamp, options?: AxiosRequestConfig) {
+	public startManualTask(taskRequest?: InlineObject1, options?: AxiosRequestConfig) {
 		return DefaultApiFp(this.configuration)
-			.setSystemTime(timestamp, options)
+			.startManualTask(taskRequest, options)
-			.then((request) => request(this.axios, this.basePath))
-	}
-
-	/**
-	 * Systemzeitzone einstellen
-	 * @param {Timezone} [timezone]
-	 * @param {*} [options] Override http request option.
-	 * @throws {RequiredError}
-	 * @memberof DefaultApi
-	 */
-	public setSystemTimezone(timezone?: Timezone, options?: AxiosRequestConfig) {
-		return DefaultApiFp(this.configuration)
-			.setSystemTimezone(timezone, options)
-			.then((request) => request(this.axios, this.basePath))
-	}
-
-	/**
-	 * Starte eine neue manuelle Bewässerungsaufgabe mit der eingestellten Standardzeit.
-	 * @param {ZoneID} [zoneId] ZoneID
-	 * @param {*} [options] Override http request option.
-	 * @throws {RequiredError}
-	 * @memberof DefaultApi
-	 */
-	public startTask(zoneId?: ZoneID, options?: AxiosRequestConfig) {
-		return DefaultApiFp(this.configuration)
-			.startTask(zoneId, options)
-			.then((request) => request(this.axios, this.basePath))
-	}
-
-	/**
-	 *
-	 * @summary Stoppe eine manuelle Bewässerungsaufgabe.
-	 * @param {ZoneID} [zoneId] ZoneID
-	 * @param {*} [options] Override http request option.
-	 * @throws {RequiredError}
-	 * @memberof DefaultApi
-	 */
-	public stopTask(zoneId?: ZoneID, options?: AxiosRequestConfig) {
-		return DefaultApiFp(this.configuration)
-			.stopTask(zoneId, options)
 			.then((request) => request(this.axios, this.basePath))
 	}
 

ui/src/util/apiUrls.ts

@@ -15,6 +15,6 @@ let apicfg = new Configuration({
 	basePath: apiUrl,
 })
 
-const tsgrainApi = new DefaultApi(apicfg)
+const sebraucApi = new DefaultApi(apicfg)
 
-export {apiUrl, wsUrl, tsgrainApi}
+export {apiUrl, wsUrl, sebraucApi}

ui/src/util/config.ts

@@ -19,8 +19,9 @@ export function getConfig(): Config {
 		return window.config
 	}
 
+	console.error("App config not found")
 	return {
 		version: "dev",
-		n_zones: 7,
+		n_zones: 0,
 	}
 }

ui/src/util/functions.ts

@@ -1,120 +1,18 @@
-import {format, parse, parseISO} from "date-fns"
-
-const S_YEAR = 31536000
-const S_DAY = 86400
-const S_HOUR = 3600
-const S_MIN = 60
-
 function secondsToString(seconds: number): string {
-	const numyears = Math.floor(seconds / S_YEAR)
+	const numyears = Math.floor(seconds / 31536000)
-	const numdays = Math.floor((seconds % S_YEAR) / S_DAY)
+	const numdays = Math.floor((seconds % 31536000) / 86400)
-	const numhours = Math.floor(((seconds % S_YEAR) % S_DAY) / S_HOUR)
+	const numhours = Math.floor(((seconds % 31536000) % 86400) / 3600)
-	const numminutes = Math.floor((((seconds % S_YEAR) % S_DAY) % S_HOUR) / S_MIN)
+	const numminutes = Math.floor((((seconds % 31536000) % 86400) % 3600) / 60)
-	const numseconds = (((seconds % S_YEAR) % S_DAY) % S_HOUR) % S_MIN
+	const numseconds = (((seconds % 31536000) % 86400) % 3600) % 60
 
 	let res = []
 	if (numyears > 0) res.push(numyears + "yr")
 	if (numdays > 0) res.push(numdays + "d")
 	if (numhours > 0) res.push(numhours + "h")
 	if (numminutes > 0) res.push(numminutes + "m")
-	if (numseconds > 0 || res.length === 0) res.push(numseconds + "s")
+	if (seconds < 60) res.push(numseconds + "s")
 
 	return res.join(" ")
 }
 
-function parseTimeString(timeString: string): number {
+export {secondsToString}
-	const parts = timeString.split(/[ ,;]/)
-	let seconds = 0
-	const regexpPart = /^(\d+)\s*(?:([yjdthms])|$)/i
-
-	parts.forEach((part) => {
-		const match = part.match(regexpPart)
-		if (match) {
-			const n = parseInt(match[1])
-			const unit = match[2] === undefined ? "" : match[2].toLowerCase()
-
-			switch (unit) {
-				case "y":
-				case "j":
-					seconds += n * S_YEAR
-					break
-				case "d":
-				case "t":
-					seconds += n * S_DAY
-					break
-				case "h":
-					seconds += n * S_HOUR
-					break
-				case "m":
-					seconds += n * S_MIN
-					break
-				case "s":
-					seconds += n
-					break
-				default:
-					if (seconds === 0) seconds += n * S_MIN
-					else seconds += n
-					break
-			}
-		}
-	})
-
-	return seconds
-}
-
-function getTimestamp(): number {
-	return Math.round(Date.now() / 1000)
-}
-
-function timestampToDate(timestamp: number): Date {
-	return new Date(timestamp * 1000)
-}
-
-function dateToTimestamp(date: Date): number {
-	return Math.round(date.getTime() / 1000)
-}
-
-function timestampToString(timestamp: number): string {
-	return dateToString(timestampToDate(timestamp))
-}
-
-function dateToString(date: Date): string {
-	return date.toLocaleString("de-DE")
-}
-
-const INPUT_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss"
-
-function dateToInputString(date: Date): string {
-	return format(date, INPUT_DATE_FORMAT)
-}
-
-function inputStringToDate(inputString: string): Date {
-	return parseISO(inputString)
-}
-
-function handleApiError(error: any) {
-	if (error.response) {
-		const msg = error.response.data.msg
-
-		if (msg !== undefined) {
-			alert("Error: " + msg)
-		} else {
-			alert("Error: no response")
-		}
-	} else {
-		alert(String(error))
-	}
-}
-
-export {
-	secondsToString,
-	parseTimeString,
-	getTimestamp,
-	timestampToDate,
-	dateToTimestamp,
-	timestampToString,
-	dateToString,
-	dateToInputString,
-	inputStringToDate,
-	handleApiError,
-}

ui/src/util/websocket.ts

@@ -1,19 +1,10 @@
-import {Task, TaskList} from "../tsgrain-client"
+import {wsUrl} from "./apiUrls"
-import {tsgrainApi, wsUrl} from "./apiUrls"
-
-class WebsocketMessage implements TaskList {
-	auto_mode = false
-	now = 0
-	tasks: Task[] = []
-}
 
 class WebsocketAPI {
-	private static ws?: WebsocketAPI
+	private static ws: WebsocketAPI | undefined
 
-	private conn?: WebSocket
+	private conn: WebSocket | undefined
 	private wsConnected: boolean
-	private lastMessage?: WebsocketMessage
-	private lastMessageDate?: Date
 
 	private clients: Set<WebsocketClient>
 
@@ -49,25 +40,11 @@ class WebsocketAPI {
 			window.setTimeout(() => this.connect(), 3000)
 		}
 		this.conn.onmessage = (evt) => {
-			const msg = Object.assign(new WebsocketMessage(), JSON.parse(evt.data))
-			this.broadcastMsg(msg)
-		}
-
-		// Get initial state via REST api
-		tsgrainApi.getTasks().then((response) => {
-			this.broadcastMsg(response.data)
-		})
-	}
-
-	private broadcastMsg(msg: WebsocketMessage) {
-		const date = new Date()
-		this.lastMessage = msg
-		this.lastMessageDate = date
-
 			this.clients.forEach((client) => {
-			client.msgCallback(msg, date)
+				client.msgCallback(evt)
 			})
 		}
+	}
 
 	static Get(): WebsocketAPI {
 		if (this.ws === undefined) {
@@ -81,28 +58,26 @@ class WebsocketAPI {
 	}
 
 	addClient(client: WebsocketClient) {
+		console.log("added client", client)
 		this.clients.add(client)
-
-		if (this.lastMessage !== undefined && this.lastMessageDate !== undefined) {
-			client.msgCallback(this.lastMessage, this.lastMessageDate)
-		}
 	}
 
 	removeClient(client: WebsocketClient) {
+		console.log("removed client", client)
 		this.clients.delete(client)
 	}
 }
 
-class WebsocketClient {
+export default class WebsocketClient {
 	statusCallback: (wsConnected: boolean) => void
-	msgCallback: (msg: WebsocketMessage, date: Date) => void
+	msgCallback: (evt: MessageEvent) => void
 
 	constructor(
-		statusCallback?: (wsConnected: boolean) => void,
+		statusCallback: (wsConnected: boolean) => void,
-		msgCallback?: (msg: WebsocketMessage, date: Date) => void
+		msgCallback: (evt: MessageEvent) => void
 	) {
-		this.statusCallback = statusCallback || ((con) => {})
+		this.statusCallback = statusCallback
-		this.msgCallback = msgCallback || ((msg, date) => {})
+		this.msgCallback = msgCallback
 
 		this.api().addClient(this)
 	}
@@ -115,5 +90,3 @@ class WebsocketClient {
 		this.api().removeClient(this)
 	}
 }
-
-export {WebsocketMessage, WebsocketClient}

ui/src/vite-env.d.ts

@@ -1,3 +1 @@
 /// <reference types="vite/client" />
-
-export {}

ui/tsconfig.json

@@ -14,6 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment"
   }
 }

ui/vite.config.ts

@@ -1,7 +1,7 @@
 import {defineConfig} from "vite"
-import reactRefresh from "@vitejs/plugin-react-refresh"
+import preact from "@preact/preset-vite"
 
 // https://vitejs.dev/config/
 export default defineConfig({
-	plugins: [reactRefresh()],
+	plugins: [preact()],
 })