From edc116d760c63c8cc06c50c109fae7e4e5eb12b2 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Mon, 29 Jan 2024 14:44:05 +0100
Subject: [PATCH 1/9] Update info.html

---
 templates/info.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/info.html b/templates/info.html
index dbd43d7..241f6d8 100644
--- a/templates/info.html
+++ b/templates/info.html
@@ -16,7 +16,7 @@ <h4><a href="https://smarthome-test-suite.withgoogle.com/devices" target="_blank
 			
 		</div>
 		<div class="post-item clearfix">
-			<h4><a href="https://smarthome-test-suite.withgoogle.com/devices" target="_blank">Latest Updates </a></h4>
+			<h4><a href="https://github.com/DewGew/DZGA-Flask/commits/development/" target="_blank">Latest Updates </a></h4>
 			<p>
 			{% for x in version %}
 				{% if x != version[0] %}

From f60b5f2dda4736877d4fe5b3e4b47e9961f45af3 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 09:31:18 +0100
Subject: [PATCH 2/9] Update devices.html

---
 templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/devices.html b/templates/devices.html
index 6cc7684..1384805 100644
--- a/templates/devices.html
+++ b/templates/devices.html
@@ -261,7 +261,7 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										</div>
 										{% endif %}
 										<div class="row mb-3">
-										  <small class="text-center text-info">Sync devices after saving for the changes to take effect</small>
+										  <small class="text-center text-danger"><strong>Sync devices after saving for the changes to take effect</strong></small>
 										</div>
 										</div>
 										</div>

From 91d8c00d598d3481e149c413ed6678de847c7532 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 12:12:29 +0100
Subject: [PATCH 3/9] Update info.html

---
 templates/info.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/info.html b/templates/info.html
index 241f6d8..143053b 100644
--- a/templates/info.html
+++ b/templates/info.html
@@ -9,18 +9,18 @@ <h5 class="card-title">Info <span>| {{ user.username }}</span></h5>
 		<div class="post-item clearfix">
 			<h4><a href="https://smarthome-test-suite.withgoogle.com/devices" target="_blank">About </a></h4>
 			<p>
-			<b>DZGA-Flask Version: </b><span id="dzga-version">Not available</span><span id="newver"></span>
+			<b>DZGA-Flask Version: </b><span id="dzga-version">Not available</span><span class="text-warning" id="newver"></span>
 			</br>
-			<b>Domoticz Version: </b><span id="dz-version">Not available</span></br>
+			<b>Domoticz Version: </b><span id="dz-version">Not available</span>
 			</p>
 			
 		</div>
 		<div class="post-item clearfix">
-			<h4><a href="https://github.com/DewGew/DZGA-Flask/commits/development/" target="_blank">Latest Updates </a></h4>
+			<h4><a href="https://smarthome-test-suite.withgoogle.com/devices" target="_blank">Latest Updates </a></h4>
 			<p>
 			{% for x in version %}
 				{% if x != version[0] %}
-					{{ x }} </br>
+					{{ x }}<br />
 				{% endif %}
 			{% endfor %}
 			</p>

From 66e1894377df3c3e91360c2817e73bcd8fafcf31 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 12:13:08 +0100
Subject: [PATCH 4/9] Update serveradmin.html

---
 templates/serveradmin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/serveradmin.html b/templates/serveradmin.html
index 72c3c35..8ebd4ad 100644
--- a/templates/serveradmin.html
+++ b/templates/serveradmin.html
@@ -2,7 +2,7 @@
 <div class="card">
 <div class="card-body">
   <h5 class="card-title">Server settings <span>| Admin</span></h5>
-   <p>Actions on Google API key will be disabled if <code>smart-home-key.json</code> file is added.</p>
+   <p>Actions on Google API key will be <span class="text-info">disabled</span> if smart-home-key.json file is added.</p>
 
   <form class="row g-3" role="form" name="modifyConfigForm" method="post">
 	<div class="col-md-6">

From 0527b4bceade371565df720abf2172d6267c534b Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 12:13:36 +0100
Subject: [PATCH 5/9] Update upload.html

---
 templates/upload.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/upload.html b/templates/upload.html
index 40bb729..16a420a 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -1,10 +1,10 @@
 <div class="card">
 <div class="card-body">
   <h5 class="card-title">File upload <span>| Admin</span></h5>
-  <p>Upload your {% if user.admin %}<code>smart-home-key.json</code> file or{% endif %} profile image here. Optimal size is 120x120px. Name your profile image to <code>{{ user.username }}.png</code> or <code>{{ user.username }}.jpg</code>.</p>
+  <p>Upload your profile image {% if user.admin %}or <span class="text-info">smart-home-key.json</span> file{% endif %} here. Optimal size is 120x120px. Name your profile image to <span class="text-info">{{ user.username }}.png</span> or <span class="text-info">{{ user.username }}.jpg</span>.</p>
 	<form class="row g-3" action = "{{ url_for('uploader') }}" method = "POST" enctype="multipart/form-data">
 		<div class="col-sm-12">
-			<label for="file" class="col-sm-2 col-form-label">File Upload</label>
+			<label for="file" class="col-sm-2 form-label">File Upload</label>
 			<input class="form-control" id="file" name="file" type="file" />
 		</div>
 	<div class="col-12">
@@ -20,4 +20,4 @@ <h5 class="card-title">File upload <span>| Admin</span></h5>
 		</div>
 	</form>	
 </div>
-</div>
\ No newline at end of file
+</div>

From 1b308a94c1750a090ba815b26ff06528baa93181 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 15:34:44 +0100
Subject: [PATCH 6/9] Add pincode to Diimmer

---
 templates/dashboard.html | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/templates/dashboard.html b/templates/dashboard.html
index f865fb3..030d747 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -249,7 +249,43 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					  <small id="output_{{ v['customData']['idx'] }}">0</small>		  
 					  <div class="label">{{ v['name']['name'] }}</div>
 					</div>
-					<input id="slider_{{ v['customData']['idx'] }}" type="range" min="0" max="100" step="1" onchange="changeDimmers({{ v['customData']['idx'] }}, this.value)">
+					<input id="slider_{{ v['customData']['idx'] }}" type="range" min="0" max="100" step="1" onchange="changeDimmers({{ v['customData']['idx'] }}, this.value, '{{ v['customData']['protected'] }}')">
+					<div class="modal fade" id="onoffpin_{{ v['customData']['idx'] }}" tabindex="-1">
+						<div class="modal-dialog modal-dialog-centered modal-sm">
+						  <div class="modal-content">
+							<div class="modal-body">
+							<form class="row g-3">
+								<div class="col-12">
+								  <label for="inputPin_{{ v['customData']['idx'] }}" class="form-label">Enter Pin</label>
+								  <input inputmode="numeric" type="password" class="form-control" id="inputPin_{{ v['customData']['idx'] }}">
+								</div>
+							</form>
+							</div>
+							<div class="modal-footer">
+							  <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
+							  <button onclick="toogleSecSwitch({{ v['customData']['idx'] }})" type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal">Submit</button>
+							</div>
+						  </div>
+						</div>
+					  </div><!-- End Vertically centered Modal-->
+					  <div class="modal fade" id="dimmerpin_{{ v['customData']['idx'] }}" tabindex="-1">
+						<div class="modal-dialog modal-dialog-centered modal-sm">
+						  <div class="modal-content">
+							<div class="modal-body">
+							<form class="row g-3">
+								<div class="col-12">
+								  <label for="inputDimPin_{{ v['customData']['idx'] }}" class="form-label">Enter Pin</label>
+								  <input inputmode="numeric" type="password" class="form-control" id="inputDimPin_{{ v['customData']['idx'] }}">
+								</div>
+							</form>
+							</div>
+							<div class="modal-footer">
+							  <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
+							  <button onclick="changeSecDimmers({{ v['customData']['idx'] }}, slider_{{ v['customData']['idx'] }}.value)" type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal">Submit</button>
+							</div>
+						  </div>
+						</div>
+					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
 					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">

From 3bf2983cd96c2ac7d452aba3826abfe791a4fccf Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 15:35:55 +0100
Subject: [PATCH 7/9] Add pincode to dimmer

---
 static/js/smarthome.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/static/js/smarthome.js b/static/js/smarthome.js
index 91be8b5..073c9cc 100644
--- a/static/js/smarthome.js
+++ b/static/js/smarthome.js
@@ -254,9 +254,18 @@ function changeRGB(ridx, val) {
 	requestAPI("/api?type=command&param=setcolbrightnessvalue&idx=" + ridx + "&hex=" + rgbcode_stripped);
 }
 
-function changeDimmers(idx, val) {
-    $('#output_' + idx).html(val);
-	requestAPI("/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=Set%20Level&level=" + val)
+function changeDimmers(idx, val, protect) {
+	if (protect == 'True'){
+		$('#dimmerpin_' + idx).modal('show');		
+	}else{
+		$('#output_' + idx).html(val);
+		requestAPI("/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=Set%20Level&level=" + val)
+	}
+}
+function changeSecDimmers(idx, val) {
+	var pin = $('#inputDimPin_'+idx).val();
+	$('#output_' + idx).html(val);
+	requestAPI("/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=Set%20Level&level=" + val + "&passcode=" + pin)
 }
 
 function setSetpoint(idx, protect) {

From 8f368f927959d7903684f934891a2674dcce20d0 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 18:39:04 +0100
Subject: [PATCH 8/9] Update doorlockinverted trait

---
 modules/trait.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/trait.py b/modules/trait.py
index 7a57597..ff5e53d 100644
--- a/modules/trait.py
+++ b/modules/trait.py
@@ -156,9 +156,12 @@ def execute(device, command, params, user_id, challenge):
         response['on'] = params['on']
 
     if command == 'action.devices.commands.LockUnlock':
-
-        url += 'switchlight&idx=' + idx + '&switchcmd=' + (
-                        'On' if params['lock'] else 'Off')
+        if domain in ['DoorLockInverted']:
+            url += 'switchlight&idx=' + idx + '&switchcmd=' + (
+                            'Off' if params['lock'] else 'On')
+        else:
+            url += 'switchlight&idx=' + idx + '&switchcmd=' + (
+                            'On' if params['lock'] else 'Off')
 
         response['isLocked'] = params['lock']
 

From a58d03541ab1b264ab4f6b7f5627624736848752 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Tue, 30 Jan 2024 18:40:54 +0100
Subject: [PATCH 9/9] Update VERSION.md

---
 VERSION.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION.md b/VERSION.md
index 4e0bba2..5cdd6dd 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,4 +1,5 @@
-24.2
+24.3
+- Fixed DoorLockInverted
 - Security Update. DZGA now reads smart-home-key.json file from config folder. Move .json file or upload a new.
 - Added new device, Door Lock Inverted.
 - Changed check version, get latest updates.