From de4554ce5a148d8b6f326f292483369d600f93e1 Mon Sep 17 00:00:00 2001
From: Michael Scherle
Date: Fri, 20 Jan 2017 15:19:58 +0100
Subject: frontend: added 4 state for pcs

---
 .../locationinfo/frontend/doorsign.html            | 14 +++++-
 .../locationinfo/frontend/img/pc_defect.svg        | 48 ++++++++++++---------
 .../locationinfo/frontend/img/pc_off.svg           | 50 ++++++++++++++++++++++
 .../locationinfo/frontend/img/pc_off_eink.svg      | 50 ++++++++++++++++++++++
 4 files changed, 140 insertions(+), 22 deletions(-)
 create mode 100644 modules-available/locationinfo/frontend/img/pc_off.svg
 create mode 100644 modules-available/locationinfo/frontend/img/pc_off_eink.svg

(limited to 'modules-available')

diff --git a/modules-available/locationinfo/frontend/doorsign.html b/modules-available/locationinfo/frontend/doorsign.html
index d95ccbb6..44f7e495 100755
--- a/modules-available/locationinfo/frontend/doorsign.html
+++ b/modules-available/locationinfo/frontend/doorsign.html
@@ -1166,27 +1166,37 @@ optional:
 				if (imgobj != null) {
 
 					var img;
+					// Pc free
 					if (update[i].pcState == "0") {
-						//add time to prevent caching
 						if (supportSvg) {
 							img = "img/pc_free";
 						} else {
 							imgobj.style.backgroundColor = "green";
 						}
 						freePcs++;
+						// Pc in use
 					} else if (update[i].pcState == "1") {
 						if (supportSvg) {
 							img = "img/pc_used";
 						} else {
 							imgobj.style.backgroundColor = "red";
 						}
-					} else {
+						// PC off
+					} else if(update[i].pcState == "2"){
+						if (supportSvg) {
+							img = "img/pc_off";
+						} else {
+							imgobj.style.backgroundColor = "black";
+						}
+						freePcs++;
+					}else {
 						if (supportSvg) {
 							img = "img/pc_defect";
 						} else {
 							imgobj.style.backgroundColor = "black";
 						}
 					}
+
 					if (imgobj != null && supportSvg) {
 						if (eInkMode) {
 							img = img + "_eink";
diff --git a/modules-available/locationinfo/frontend/img/pc_defect.svg b/modules-available/locationinfo/frontend/img/pc_defect.svg
index 9a98f7b5..219175e2 100644
--- a/modules-available/locationinfo/frontend/img/pc_defect.svg
+++ b/modules-available/locationinfo/frontend/img/pc_defect.svg
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">
+	 viewBox="-184 310.3 241.8 172.7" style="enable-background:new -184 310.3 241.8 172.7;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}
 	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}
-	.st2{fill:#3C3C3B;}
-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st2{fill:#FFFFFF;stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st3{fill:#3C3C3B;}
+	.st4{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st5{fill:#C6C6C6;}
 </style>
-<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7
-	v125C361.7,260,358.2,263.4,354,263.4z"/>
-<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>
+<path id="XMLID_1_" class="st0" d="M50.1,450.7h-226.4c-4.3,0-7.7-3.5-7.7-7.7V318c0-4.3,3.5-7.7,7.7-7.7H50.1
+	c4.3,0,7.7,3.5,7.7,7.7v125C57.8,447.3,54.3,450.7,50.1,450.7z"/>
+<rect id="XMLID_3_" x="-90.9" y="454.2" class="st0" width="55.6" height="19.4"/>
 <g id="XMLID_8_">
-	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>
-	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9
-		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>
+	<rect id="XMLID_4_" x="-173.7" y="321" class="st1" width="221.1" height="119"/>
+	<path id="XMLID_6_" class="st2" d="M38.2,447.7h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9
+		l0,0C41.1,446.4,39.8,447.7,38.2,447.7z"/>
 </g>
 <g id="XMLID_10_">
 	<g id="XMLID_14_">
 		<g id="XMLID_72_">
-			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
-				S316.1,282.9,312.6,282.9z"/>
+			<path id="XMLID_73_" class="st3" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4
+				S12.2,470.2,8.7,470.2z"/>
 		</g>
 		<g id="XMLID_56_">
-			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
-				S316.1,282.9,312.6,282.9z"/>
+			<path id="XMLID_67_" class="st4" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4
+				S12.2,470.2,8.7,470.2z"/>
 		</g>
 	</g>
 	<g id="XMLID_26_">
-		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
-			C162.6,289.1,164,286,165.8,286z"/>
-		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
-			C162.6,289.1,164,286,165.8,286z"/>
+		<path id="XMLID_39_" class="st3" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8
+			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>
+		<path id="XMLID_38_" class="st4" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8
+			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>
 	</g>
 	<g id="XMLID_13_">
 		<g id="XMLID_69_">
-			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>
+			<rect id="XMLID_70_" x="-141.3" y="476.5" class="st3" width="156.4" height="6.4"/>
 		</g>
 		<g id="XMLID_63_">
-			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>
+			<rect id="XMLID_66_" x="-141.3" y="476.5" class="st4" width="156.4" height="6.4"/>
 		</g>
 	</g>
 </g>
 <g id="XMLID_2_">
 	<g id="XMLID_21_">
-		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>
+		<path id="XMLID_25_" class="st4" d="M0.3,498.7"/>
+	</g>
+</g>
+<g>
+	<g>
+		<polygon class="st5" points="-45,321 -45.1,321.1 -46.8,323.1 -60.1,338.9 -42.7,390.6 -63.6,385.7 -48.8,420.6 -82,373.3 
+			-59.4,374.1 -83.5,345.3 -76.8,321 		"/>
 	</g>
 </g>
 </svg>
diff --git a/modules-available/locationinfo/frontend/img/pc_off.svg b/modules-available/locationinfo/frontend/img/pc_off.svg
new file mode 100644
index 00000000..9a98f7b5
--- /dev/null
+++ b/modules-available/locationinfo/frontend/img/pc_off.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st2{fill:#3C3C3B;}
+	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}
+</style>
+<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7
+	v125C361.7,260,358.2,263.4,354,263.4z"/>
+<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>
+<g id="XMLID_8_">
+	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>
+	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9
+		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>
+</g>
+<g id="XMLID_10_">
+	<g id="XMLID_14_">
+		<g id="XMLID_72_">
+			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
+				S316.1,282.9,312.6,282.9z"/>
+		</g>
+		<g id="XMLID_56_">
+			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
+				S316.1,282.9,312.6,282.9z"/>
+		</g>
+	</g>
+	<g id="XMLID_26_">
+		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
+			C162.6,289.1,164,286,165.8,286z"/>
+		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
+			C162.6,289.1,164,286,165.8,286z"/>
+	</g>
+	<g id="XMLID_13_">
+		<g id="XMLID_69_">
+			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>
+		</g>
+		<g id="XMLID_63_">
+			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>
+		</g>
+	</g>
+</g>
+<g id="XMLID_2_">
+	<g id="XMLID_21_">
+		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>
+	</g>
+</g>
+</svg>
diff --git a/modules-available/locationinfo/frontend/img/pc_off_eink.svg b/modules-available/locationinfo/frontend/img/pc_off_eink.svg
new file mode 100644
index 00000000..9a98f7b5
--- /dev/null
+++ b/modules-available/locationinfo/frontend/img/pc_off_eink.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}
+	.st2{fill:#3C3C3B;}
+	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}
+</style>
+<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7
+	v125C361.7,260,358.2,263.4,354,263.4z"/>
+<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>
+<g id="XMLID_8_">
+	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>
+	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9
+		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>
+</g>
+<g id="XMLID_10_">
+	<g id="XMLID_14_">
+		<g id="XMLID_72_">
+			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
+				S316.1,282.9,312.6,282.9z"/>
+		</g>
+		<g id="XMLID_56_">
+			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4
+				S316.1,282.9,312.6,282.9z"/>
+		</g>
+	</g>
+	<g id="XMLID_26_">
+		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
+			C162.6,289.1,164,286,165.8,286z"/>
+		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0
+			C162.6,289.1,164,286,165.8,286z"/>
+	</g>
+	<g id="XMLID_13_">
+		<g id="XMLID_69_">
+			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>
+		</g>
+		<g id="XMLID_63_">
+			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>
+		</g>
+	</g>
+</g>
+<g id="XMLID_2_">
+	<g id="XMLID_21_">
+		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>
+	</g>
+</g>
+</svg>
-- 
cgit v1.2.3-55-g7522