Merge branch 'master' of https://github.com/iobroker-community-adapte…

…rs/ioBroker.kecontact
iobroker-community-adapters · Nov 15, 2024 · ee12bfd · ee12bfd
2 parents f3c2a3a + 50b1b6e
commit ee12bfd
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 43 deletions.
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -223,7 +223,7 @@
     <div class="m adapter-container">
 
         <div class="row">
-            <div class="col s12 m4 l2">
+            <div class="col s8 m4 l2">
                 <img src="kecontact.png" class="logo">
             </div>
         </div>
@@ -233,104 +233,104 @@
 
         <!-- For example columns with settings: -->
         <div class="row">
-            <div class="col s6 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" id="host" class="value" />
                 <label for="host" class="translate">host</label>
                 <span class="helper-text future-tooltip translate">tooltip_host</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s3 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="passiveMode" class="value" />
                 <label for="passiveMode" class="translate">passiveMode</label>
                 <span class="helper-text future-tooltip translate">tooltip_passiveMode</span>
             </div>
-            <div class="col s3 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="pollInterval" class="value" />
                 <label for="pollInterval" class="translate">pollInterval</label>
                 <span class="helper-text translate">secs</span>
                 <span class="helper-text future-tooltip translate">tooltip_pollInterval</span>
             </div>
-            <div class="col s3 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="loadChargingSessions" class="value" />
                 <label for="loadChargingSessions" class="translate">loadChargingSessions</label>
                 <span class="helper-text future-tooltip translate">tooltip_loadChargingSessions</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s12 input-field">
+            <div class="col s12 m12 l12 input-field">
                 <h5 class="translate">only-special-values</h5>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateRegard" class="value" />
                 <label for="stateRegard" class="translate">stateRegard</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateRegard</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateRegard" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateSurplus" class="value" />
                 <label for="stateSurplus" class="translate">stateSurplus</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateSurplus</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateSurplus" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="statesIncludeWallbox" class="value" />
                 <label for="statesIncludeWallbox" class="translate">statesIncludeWallbox</label>
                 <span class="helper-text future-tooltip translate">tooltip_statesIncludeWallbox</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="useX1forAutomatic" class="value" />
                 <label for="useX1forAutomatic" class="translate">useX1forAutomatic</label>
                 <span class="helper-text future-tooltip translate">tooltip_useX1</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="delta" class="value" />
                 <label for="delta" class="translate">delta</label>
                 <span class="helper-text translate">mA</span>
                 <span class="helper-text future-tooltip translate">tooltip_delta</span>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="minAmperage" class="value" />
                 <label for="minAmperage" class="translate">minAmperage</label>
                 <span class="helper-text translate">mA</span>
                 <span class="helper-text future-tooltip translate">tooltip_minAmperage</span>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="addPower" class="value" />
                 <label for="addPower" class="translate">addPower</label>
                 <span class="helper-text translate">watts</span>
                 <span class="helper-text future-tooltip translate">tooltip_addPower</span>
             </div>
         </div>
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="underusage" class="value" />
                 <label for="underusage" class="translate">underusage</label>
                 <span class="helper-text translate">watts</span>
                 <span class="helper-text future-tooltip translate">tooltip_underusage</span>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="minTime" class="value" />
                 <label for="minTime" class="translate">minTime</label>
                 <span class="helper-text translate">secs</span>
                 <span class="helper-text future-tooltip translate">tooltip_minTime</span>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="regardTime" class="value" />
                 <label for="regardTime" class="translate">regardTime</label>
                 <span class="helper-text translate">secs</span>
@@ -339,50 +339,50 @@ <h5 class="translate">only-special-values</h5>
         </div>
 
         <div class="row">
-            <div class="col s12 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <h5 class="translate">1p3pSettingsSection</h5>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="state1p3pSwitch" class="value" />
                 <label for="state1p3pSwitch" class="translate">state1p3pSwitch</label>
                 <span class="helper-text future-tooltip translate">tooltip_state1p3pSwitch</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_state1p3pSwitch" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="1p3pViaX2" class="value" />
                 <label for="1p3pViaX2" class="translate">1p3pViaX2</label>
                 <span class="helper-text future-tooltip translate">tooltip_1p3pViaX2</span>
             </div>
         </div>
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="1p3pSwitchIsNO" class="value" />
                 <label for="1p3pSwitchIsNO" class="translate">1p3pSwitchIsNO</label>
                 <span class="helper-text future-tooltip translate">tooltip_1p3pSwitchIsNO</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s12 input-field">
+            <div class="col s12 m12 l12 input-field">
                 <h5 class="translate">batteryStorageSettingsSection</h5>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateBatteryCharging" class="value" />
                 <label for="stateBatteryCharging" class="translate">stateBatteryCharging</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateBatteryCharging</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateBatteryCharging" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateBatteryDischarging" class="value" />
                 <label for="stateBatteryDischarging" class="translate">stateBatteryDischarging</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateBatteryDischarging</span>
@@ -392,15 +392,15 @@ <h5 class="translate">batteryStorageSettingsSection</h5>
             </div>
         </div>
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="batteryPower" class="value" />
                 <label for="batteryPower" class="translate">batteryPower</label>
                 <span class="helper-text translate">watts</span>
                 <span class="helper-text future-tooltip translate">tooltip_batteryPower</span>
             </div>
             <div class="col s1 m2 l1">
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <select id="batteryStorageStrategy" class="value">
                     <option label="no-battery-vehicle-first" class="translate" value=1>no-battery-vehicle-first</option>
                     <option label="no-battery-battery-first" class="translate" value=2>no-battery-battery-first</option>
@@ -411,15 +411,15 @@ <h5 class="translate">batteryStorageSettingsSection</h5>
             </div>
         </div>
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateBatterySoC" class="value" />
                 <label for="stateBatterySoC" class="translate">stateBatterySoC</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateBatterySoC</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateBatterySoC" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="batteryMinSoC" class="value" />
                 <label for="batteryMinSoC" class="translate">batteryMinSoC</label>
                 %</span>
@@ -428,35 +428,35 @@ <h5 class="translate">batteryStorageSettingsSection</h5>
         </div>
 
         <div class="row">
-            <div class="col s12 input-field">
+            <div class="col s12 m12 l12 input-field">
                 <h5 class="translate">powerEnWG</h5>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateEnWG" class="value" />
                 <label for="stateEnWG" class="translate">stateEnWG</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateEnWG</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateEnWG" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="dynamicEnWG" class="value" />
                 <label for="dynamicEnWG" class="translate">dynamicEnWG</label>
                 <span class="helper-text future-tooltip translate">tooltip_dynamicEnWG</span>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s12 input-field">
+            <div class="col s12 m12 l12 input-field">
                 <h5 class="translate">powerLimitation</h5>
             </div>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="number" id="maxPower" class="value" />
                 <label for="maxPower" class="translate">maxPower</label>
                 <span class="helper-text translate">watts</span>
@@ -465,23 +465,23 @@ <h5 class="translate">powerLimitation</h5>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateEnergyMeter1" class="value" />
                 <label for="stateEnergyMeter1" class="translate">stateEnergyMeter1</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateEnergyMeter1</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateEnergyMeter1" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateEnergyMeter2" class="value" />
                 <label for="stateEnergyMeter2" class="translate">stateEnergyMeter2</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateEnergyMeter2</span>
             </div>
             <div class="col s1 m2 l1">
                 <a id="OID_stateEnergyMeter2" class="btn-floating waves-effect waves-light blue table-button-add"><i class="material-icons">add</i></a>
             </div>
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="text" size="50" id="stateEnergyMeter3" class="value" />
                 <label for="stateEnergyMeter3" class="translate">stateEnergyMeter3</label>
                 <span class="helper-text future-tooltip translate">tooltip_stateEnergyMeter3</span>
@@ -492,7 +492,7 @@ <h5 class="translate">powerLimitation</h5>
         </div>
 
         <div class="row">
-            <div class="col s4 input-field">
+            <div class="col s12 m6 l4 input-field">
                 <input type="checkbox" id="wallboxNotIncluded" class="value" />
                 <label for="wallboxNotIncluded" class="translate">wallboxNotIncluded</label>
                 <span class="helper-text future-tooltip translate">tooltip_wallboxNotIncluded</span>
@@ -503,10 +503,10 @@ <h5 class="translate">powerLimitation</h5>
             <div id="dialog-select-member" class="modal modal-fixed-footer">
                 <div class="modal-content">
                     <div class="row">
-                        <div class="col s12 title"></div>
+                        <div class="col s12 m12 l12 title"></div>
                     </div>
                     <div class="row">
-                        <div class="col s12 dialog-content">
+                        <div class="col s12 m12 l12 dialog-content">
                         </div>
                     </div>
                 </div>

diff --git a/admin/style.css b/admin/style.css
@@ -12,6 +12,7 @@
     height: 100%;
     width: 100%;
     position: relative;
+    overflow: auto;
 }
 .m .select-wrapper + label {
     /* The positioning for dropdown labels is messed up */
@@ -29,4 +30,14 @@ label > i[title] {
     white-space: nowrap;
 }
 
+.m [type=checkbox]+span:not(.lever) {
+    height: auto !important;
+}
+
+@media screen and (max-width: 768px) {
+    .m {
+        overflow: hidden;
+    }
+}
+
 /* Add your styles here */
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "@types/chai-as-promised": "^8.0.1",
     "@types/gulp": "^4.0.17",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.8.0",
+    "@types/node": "^22.8.6",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",