1 warning message, update link button

Author: Brett-S-OWB

packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue

@@ -8,11 +8,6 @@
         <q-space />
         <q-btn icon="close" flat round dense v-close-popup />
       </div>
-      <BaseMessage
-        :show-message="isTemporaryPlan"
-        message="Temporärer Plan. Der Plan wird nach dem Abstecken verworfen."
-        type="warning"
-      />
       <BaseMessage
         :show-message="temporaryChargeModeActive"
         message="Temporärer Modus aktiv. Alle Planänderungen werden nach dem Abstecken verworfen."
@@ -249,23 +244,22 @@
           color="positive"
         />
       </div>
-      <div v-if="temporaryChargeModeActive" class="row q-mt-lg">
+      <div class="row q-mt-lg">
         <q-btn
           size="sm"
           class="col"
-          color="warning"
-          :href="`/openWB/web/settings/#/VehicleConfiguration/charge_template/${chargeTemplateId ?? ''}`"
-          ><q-icon left size="xs" name="settings" /> Ladeplan
-          Einstellungen</q-btn
+          color="negative"
+          @click="removeScheduledChargingPlan(plan.id)"
+          >Plan löschen</q-btn
         >
       </div>
-      <div class="row q-mt-md">
+      <div v-if="temporaryChargeModeActive" class="row q-mt-md">
         <q-btn
           size="sm"
-          class="col"
-          color="negative"
-          @click="removeScheduledChargingPlan(plan.id)"
-          >Plan löschen</q-btn
+          class="col charge-plan-link-button"
+          :href="`/openWB/web/settings/#/VehicleConfiguration/charge_template/${chargeTemplateId ?? ''}`"
+          ><q-icon left size="xs" name="settings" /> persistente Ladeplan
+          Einstellungen</q-btn
         >
       </div>
     </q-card-section>
@@ -455,15 +449,6 @@ const removeScheduledChargingPlan = (planId) => {
   emit('close');
 };
 
-const PermanentScheduledChargingPlansIds = computed(() =>
-  mqttStore
-    .vehicleScheduledChargingPlansPermanent(props.chargePointId)
-    .map((plan) => plan.id),
-);
-const isTemporaryPlan = computed(
-  () => !PermanentScheduledChargingPlansIds.value.includes(props.plan.id),
-);
-
 const temporaryChargeModeActive = computed(
   () => mqttStore.temporaryChargeModeAktiv ?? false,
 );
@@ -484,6 +469,11 @@ const chargeTemplateId = computed(
   font-size: 10px !important;
 }
 
+.charge-plan-link-button {
+  background-color: var(--q-charge-plan-link-button);
+  color: white;
+}
+
 .flex-grow {
   flex-grow: 1;
 }

packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingPlanDetails.vue

@@ -8,11 +8,6 @@
         <q-space />
         <q-btn icon="close" flat round dense v-close-popup />
       </div>
-      <BaseMessage
-        :show-message="isTemporaryPlan"
-        message="Temporärer Plan. Der Plan wird nach dem Abstecken verworfen."
-        type="warning"
-      />
       <BaseMessage
         :show-message="temporaryChargeModeActive"
         message="Temporärer Modus aktiv. Alle Planänderungen werden nach dem Abstecken verworfen."
@@ -182,23 +177,22 @@
           <div class="text-body2">kWh</div>
         </template>
       </q-input>
-      <div v-if="temporaryChargeModeActive" class="row q-mt-lg">
+      <div class="row q-mt-lg">
         <q-btn
           size="sm"
           class="col"
-          color="warning"
-          :href="`/openWB/web/settings/#/VehicleConfiguration/charge_template/${chargeTemplateId ?? ''}`"
-          ><q-icon left size="xs" name="settings" /> Ladeplan
-          Einstellungen</q-btn
+          color="negative"
+          @click="removeTimeChargingPlan(plan.id)"
+          >Plan löschen</q-btn
         >
       </div>
-      <div class="row q-mt-md">
+      <div v-if="temporaryChargeModeActive" class="row q-mt-md">
         <q-btn
           size="sm"
-          class="col"
-          color="negative"
-          @click="removeTimeChargingPlan(plan.id)"
-          >Plan löschen</q-btn
+          class="col charge-plan-link-button"
+          :href="`/openWB/web/settings/#/VehicleConfiguration/charge_template/${chargeTemplateId ?? ''}`"
+          ><q-icon left size="xs" name="settings" /> persistente Ladeplan
+          Einstellungen</q-btn
         >
       </div>
     </q-card-section>
@@ -319,16 +313,6 @@ const acChargingEnabled = computed(
   () => mqttStore.chargePointChargeType(props.chargePointId).value === 'AC',
 );
 
-const PermanentTimeChargingPlansIds = computed(() =>
-  mqttStore
-    .vehicleTimeChargingPlansPermanent(props.chargePointId)
-    .map((plan) => plan.id),
-);
-
-const isTemporaryPlan = computed(
-  () => !PermanentTimeChargingPlansIds.value.includes(props.plan.id),
-);
-
 const temporaryChargeModeActive = computed(
   () => mqttStore.temporaryChargeModeAktiv ?? false,
 );
@@ -355,6 +339,11 @@ const removeTimeChargingPlan = (planId: number) => {
   font-size: 10px !important;
 }
 
+.charge-plan-link-button {
+  background-color: var(--q-charge-plan-link-button);
+  color: white;
+}
+
 .flex-grow {
   flex-grow: 1;
 }

packages/modules/web_themes/koala/source/src/css/quasar.variables.scss

@@ -49,6 +49,7 @@ $battery-fill: #ba712833;
 $battery-fill-flow-diagram: #c6a583;
 $charge-point-stroke: #5c93d1;
 $charge-point-fill: #5c93d14d;
+$charge-plan-link-button: #6b757d;
 // Light theme (default)
 :root {
   --q-primary: #{$primary};
@@ -78,6 +79,7 @@ $charge-point-fill: #5c93d14d;
   --q-battery-fill-flow-diagram: #{$battery-fill-flow-diagram};
   --q-charge-point-stroke: #{$charge-point-stroke};
   --q-charge-point-fill: #{$charge-point-fill};
+  --q-charge-plan-link-button: #{$charge-plan-link-button};
 
   // Main background
   background-color: var(--q-background-1);

packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts

@@ -1944,21 +1944,6 @@ export const useMqttStore = defineStore('mqtt', () => {
     });
   };
 
-  /**
-   * Get permanent time charging plan/s identified by the charge point id
-   * @param chargePointId charge point id
-   * @returns TimeChargingPlan[]
-   */
-  const vehicleTimeChargingPlansPermanent = (chargePointId: number) => {
-    const templateId =
-      chargePointConnectedVehicleChargeTemplate(chargePointId).value?.id;
-    const plans = getValue.value(
-      `openWB/vehicle/template/charge_template/${templateId}`,
-      'time_charging.plans',
-    ) as TimeChargingPlan[] | undefined;
-    return Array.isArray(plans) ? plans : [];
-  };
-
   /**
    * Get or set the limit selected mode for the time charging plan identified by the time charging plan id
    * @param chargePointId charge point id
@@ -2707,21 +2692,6 @@ export const useMqttStore = defineStore('mqtt', () => {
     }
   }
 
-  /**
-   * Get permanent scheduled charging plan/s identified by the charge point id
-   * @param chargePointId charge point id
-   * @returns ScheduledChargingPlan[]
-   */
-  const vehicleScheduledChargingPlansPermanent = (chargePointId: number) => {
-    const templateId =
-      chargePointConnectedVehicleChargeTemplate(chargePointId).value?.id;
-    const plans = getValue.value(
-      `openWB/vehicle/template/charge_template/${templateId}`,
-      'chargemode.scheduled_charging.plans',
-    ) as ScheduledChargingPlan[] | undefined;
-    return Array.isArray(plans) ? plans : [];
-  };
-
   function removeScheduledChargingPlanForChargePoint(
     chargePointId: number,
     planId: number,
@@ -3735,12 +3705,10 @@ export const useMqttStore = defineStore('mqtt', () => {
     vehicleTimeChargingPlanName,
     addTimeChargingPlanForChargePoint,
     removeTimeChargingPlanForChargePoint,
-    vehicleScheduledChargingPlansPermanent,
     vehicleTimeChargingPlanActive,
     vehicleTimeChargingPlanStartTime,
     vehicleTimeChargingPlanEndTime,
     vehicleTimeChargingPlanCurrent,
-    vehicleTimeChargingPlansPermanent,
     vehicleTimeChargingPlanLimitSelected,
     vehicleTimeChargingPlanSocLimit,
     vehicleTimeChargingPlanEnergyAmount,