Merge pull request #628 from MartinRinas/feature-fixed-hour-tariff

Make input fields required and update price handling

Author: benderl

Diff for: src/components/electricity_tariffs/fixed_hours/TimeTable.vue

@@ -42,6 +42,8 @@
           <select
             v-model="time[0]"
             class="form-control"
+            required
+            @change="updateEndOptions(index)"
           >
             <option
               value=""
@@ -62,6 +64,7 @@
           <select
             v-model="time[1]"
             class="form-control"
+            required
           >
             <option
               value=""
@@ -70,7 +73,7 @@
               -- Bitte auswählen --
             </option>
             <option
-              v-for="option in generateTimeOptions('01:00', '24:00')"
+              v-for="option in endOptions[index]"
               :key="option.value"
               :value="option.value"
             >
@@ -122,7 +125,9 @@ export default {
   },
   emits: ["update:modelValue"],
   data() {
-    return {};
+    return {
+      endOptions: this.modelValue.map(() => this.generateTimeOptions("01:00", "24:00")),
+    };
   },
   computed: {
     value: {
@@ -152,6 +157,16 @@ export default {
     removeTime(timeIndex) {
       this.value.splice(timeIndex, 1);
     },
+    updateEndOptions(index) {
+      const startTime = this.value[index][0];
+      if (startTime) {
+        const startHour = parseInt(startTime.split(":")[0], 10) + 1;
+        const startString = startHour.toString().padStart(2, "0") + ":00";
+        this.endOptions[index] = this.generateTimeOptions(startString, "24:00");
+      } else {
+        this.endOptions[index] = this.generateTimeOptions("01:00", "24:00");
+      }
+    },
   },
 };
 </script>

Diff for: src/components/electricity_tariffs/fixed_hours/electricity_tariff.vue

@@ -10,8 +10,8 @@
       :precision="3"
       required
       unit="ct/kWh"
-      :model-value="electricityTariff.configuration.default_price"
-      @update:model-value="updateConfiguration(parseFloat($event.toFixed(3)), 'configuration.default_price')"
+      :model-value="electricityTariff.configuration.default_price * 100"
+      @update:model-value="updateConfiguration(parseFloat(($event / 100).toFixed(3)), 'configuration.default_price')"
     >
       <template #help> Standardpreis sofern kein anderer Tarif aktiv ist. </template>
     </openwb-base-number-input>
@@ -34,7 +34,8 @@
       v-if="electricityTariff.configuration.tariffs.length === 0"
       subtype="info"
     >
-      Es wurde noch kein Tarif konfiguriert.
+      Es wurde noch kein Tarif konfiguriert. Klicken Sie auf das Plus-Symbol um einen neuen Tarif hinzuzufügen.<br />
+      Tarife ermöglichen es unterschiedliche Preise für unterschiedliche Zeiten zu definieren.
     </openwb-base-alert>
     <openwb-base-card
       v-for="(tariff, index) in electricityTariff.configuration.tariffs"
@@ -68,19 +69,20 @@
         :precision="3"
         required
         unit="ct/kWh"
-        :model-value="tariff.price"
-        @update:model-value="updateTariff(parseFloat($event.toFixed(3)), index, 'price')"
+        :model-value="tariff.price * 100"
+        @update:model-value="updateTariff(parseFloat(($event / 100).toFixed(3)), index, 'price')"
       />
       <openwb-base-select-input
         title="Quartale"
         :options="[
-          { value: '1', text: '1. Quartal' },
-          { value: '2', text: '2. Quartal' },
-          { value: '3', text: '3. Quartal' },
-          { value: '4', text: '4. Quartal' },
+          { value: 1, text: '1. Quartal' },
+          { value: 2, text: '2. Quartal' },
+          { value: 3, text: '3. Quartal' },
+          { value: 4, text: '4. Quartal' },
         ]"
         :model-value="tariff.active_times.quarters"
         multiple
+        required
         @update:model-value="updateQuarters($event, index)"
       />
       <time-table