From 74989ec0150d65d5425d975143a6ddf687f1c3ff Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Mon, 20 Nov 2023 12:30:44 +0100
Subject: [PATCH 1/2] Fixed missing reset of expected value of operateAs toggle

---
 client/demo.js                        | 3 +++
 client/src/panels/unitcontrolpanel.ts | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/demo.js b/client/demo.js
index 5589ac23..e1860648 100644
--- a/client/demo.js
+++ b/client/demo.js
@@ -130,6 +130,8 @@ class DemoDataGenerator {
         DEMO_UNIT_DATA[idx].position.lat += idx / 100;
         DEMO_UNIT_DATA[idx].category = "GroundUnit";
         DEMO_UNIT_DATA[idx].isLeader = true;
+        DEMO_UNIT_DATA[idx].coalition = 0;
+        DEMO_UNIT_DATA[idx].operateAs = 2;
 
         idx += 1;
         DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
@@ -139,6 +141,7 @@ class DemoDataGenerator {
         DEMO_UNIT_DATA[idx].category = "GroundUnit";
         DEMO_UNIT_DATA[idx].isLeader = true;
         DEMO_UNIT_DATA[idx].coalition = 0;
+        DEMO_UNIT_DATA[idx].operateAs = 1;
 
         idx += 1;
         DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts
index 6100b84a..99ab8893 100644
--- a/client/src/panels/unitcontrolpanel.ts
+++ b/client/src/panels/unitcontrolpanel.ts
@@ -2,16 +2,13 @@ import { SVGInjector } from "@tanem/svg-injector";
 import { getApp } from "..";
 import { Dropdown } from "../controls/dropdown";
 import { Slider } from "../controls/slider";
-import { aircraftDatabase } from "../unit/databases/aircraftdatabase";
 import { Unit } from "../unit/unit";
 import { Panel } from "./panel";
 import { Switch } from "../controls/switch";
 import { ROEDescriptions, ROEs, altitudeIncrements, emissionsCountermeasures, emissionsCountermeasuresDescriptions, maxAltitudeValues, maxSpeedValues, minAltitudeValues, minSpeedValues, reactionsToThreat, reactionsToThreatDescriptions, shotsIntensityDescriptions, shotsScatterDescriptions, speedIncrements } from "../constants/constants";
 import { ftToM, knotsToMs, mToFt, msToKnots } from "../other/utils";
 import { GeneralSettings, Radio, TACAN } from "../interfaces";
-import { PrimaryToolbar } from "../toolbars/primarytoolbar";
 import { ContextActionSet } from "../unit/contextactionset";
-import { ContextAction } from "../unit/contextaction";
 
 export class UnitControlPanel extends Panel {
     #altitudeSlider: Slider;
@@ -176,6 +173,7 @@ export class UnitControlPanel extends Panel {
         this.#AWACSSwitch.resetExpectedValue();
         this.#onOffSwitch.resetExpectedValue();
         this.#followRoadsSwitch.resetExpectedValue();
+        this.#operateAsSwitch.resetExpectedValue();
         this.#altitudeSlider.resetExpectedValue();
         this.#speedSlider.resetExpectedValue();
         this.#calculateMaxHeight();

From b442d238cda1b11ac325e1fb5101b3bf17ad9481 Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Thu, 23 Nov 2023 20:08:37 +0100
Subject: [PATCH 2/2] Fixed error in getUnitsVariable function

---
 client/public/stylesheets/style/style.css | 10 +++++++++-
 client/public/themes/olympus/theme.css    |  1 +
 client/src/unit/unitsmanager.ts           |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/public/stylesheets/style/style.css b/client/public/stylesheets/style/style.css
index 5eb11f5b..1bd3c351 100644
--- a/client/public/stylesheets/style/style.css
+++ b/client/public/stylesheets/style/style.css
@@ -1469,6 +1469,10 @@ input[type=number]::-webkit-outer-spin-button {
 	background-color: var(--ol-switch-off);
 }
 
+.switch-control.yes-no .ol-switch[data-value="undefined"] .ol-switch-fill {
+	background-color: var(--ol-switch-undefined);
+}
+
 .switch-control.coalition .ol-switch>.ol-switch-fill::before,
 .switch-control.yes-no .ol-switch>.ol-switch-fill::before {
     translate:-100% 0;
@@ -1484,13 +1488,17 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .switch-control.coalition [data-value="true"] .ol-switch-fill {
-	background-color: var(--accent-light-blue);
+	background-color: var(--primary-blue);
 }
 
 .switch-control.coalition [data-value="false"] .ol-switch-fill {
 	background-color: var(--primary-red);
 }
 
+.switch-control.coalition [data-value="undefined"] .ol-switch-fill {
+	background-color: var(--ol-switch-undefined);
+}
+
 .switch-control.coalition [data-value="true"]>.ol-switch-fill::before {
 	content: "BLUE" !important;
 }
diff --git a/client/public/themes/olympus/theme.css b/client/public/themes/olympus/theme.css
index b086467c..2da7dde9 100644
--- a/client/public/themes/olympus/theme.css
+++ b/client/public/themes/olympus/theme.css
@@ -46,6 +46,7 @@
 
     --ol-select-secondary: #545F6C;
     --ol-switch-off:#686868;
+    --ol-switch-undefined:#383838;
 
     /*** General border radii  **/
     --border-radius-xs: 2px;
diff --git a/client/src/unit/unitsmanager.ts b/client/src/unit/unitsmanager.ts
index f2168c7a..da0cd331 100644
--- a/client/src/unit/unitsmanager.ts
+++ b/client/src/unit/unitsmanager.ts
@@ -325,7 +325,7 @@ export class UnitsManager {
         var value: any = variableGetter(units[0]);
         units.forEach((unit: Unit) => {
             if (variableGetter(unit) !== value)
-                return undefined;
+                value = undefined;
         });
         return value;
     };