Settings added. All settings can be configured now in the slx-admin panel. It will load/save from/in the db. Also minor fixes.

3 files changed, 174 insertions, 12 deletions

diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html
new file mode 100644
index 00000000..0fac50fa
--- /dev/null
+++ b/modules-available/locationinfo/templates/config.html
@@ -0,0 +1,152 @@
+<div>
+  <form method="post" action="?do=locationinfo" id="configForm">
+    <input type="hidden" name="token" value="{{token}}">
+    <input type="hidden" name="action" value="updateConfig">
+    <input type="hidden" name="id" value="{{id}}">
+
+    <div style="float: left;">
+      <Label>{{lang_language}}</Label><br>
+      <select name="language">
+        <option value="en" id="en">{{lang_languageEn}}</option>
+        <option value="de" id="de">{{lang_languageDe}}</option>
+        <option value="pt" id="pt">{{lang_languagePt}}</option>
+      </select>
+    </div>
+    <div style="float: left; margin-left: 15px;">
+      <Label>{{lang_mode}}</Label><br>
+      <select name="mode" onchange=vertical_cb(this.value);>
+        <option value="1" id="mode1">{{lang_mode1}}</option>
+        <option value="2" id="mode2">{{lang_mode2}}</option>
+        <option value="3" id="mode3">{{lang_mode3}}</option>
+        <option value="4" id="mode4">{{lang_mode4}}</option>
+      </select>
+    </div>
+    <div style="float: left; margin-left: 15px;">
+      <input name="vertical" id="cb_vertical" type="checkbox"/> {{lang_vertical}}<br>
+      <input name="eco" id="cb_eco" type="checkbox"/> {{lang_ecoMode}}
+    </div>
+
+    <div style="float: left; margin-left: 15px;">
+      <Label data-toggle="tooltip" title="{{lang_daysToShowTooltip}}">{{lang_daysToShow}}</Label><br>
+      <select name="daystoshow">
+        <option value="1" id="day1">1</opton>
+        <option value="2" id="day2">2</option>
+        <option value="3" id="day3">3</option>
+        <option value="4" id="day4">4</option>
+        <option value="5" id="day5">5</option>
+        <option value="6" id="day6">6</option>
+        <option value="7" id="day7">7</option>
+      </select>
+    </div>
+
+    <div style="float: left; margin-left: 15px;">
+      <Label>{{lang_rotation}}</Label><br>
+      <select name="rotation">
+        <option value="1" id="rotation1">{{lang_rotation1}}</option>
+        <option value="2" id="rotation2">{{lang_rotation2}}</option>
+        <option value="3" id="rotation3">{{lang_rotation3}}</option>
+        <option value="4" id="rotation4">{{lang_rotation4}}</option>
+      </select>
+    </div>
+
+    <br><br><br><br>
+
+    <Label data-toggle="tooltip" title="{{lang_scaleTooltip}}">{{lang_scale}}</Label><br>
+    <span id="scale">50 %</span><input name="scale" id="sl_scale" type="range" step="1" min="10" max="90" value="50" style="width: 300px;" oninput="showScaleValue(this.value)"/>
+
+    <br><br>
+
+    <Label data-toggle="tooltip" title="{{lang_switchTimeTooltip}}">{{lang_switchTime}}</Label><br>
+    <span id="switch">20 {{lang_sec}}</span><input name="switchtime" id="sl_switch" type="range" step="1" min="1" max="120" value="20" style="width: 300px;" oninput="showSwitchValue(this.value)"/>
+
+    <br><br>
+
+    <div>
+      <div style="float: left;">
+        <Label data-toggle="tooltip" title="{{lang_calupdateTooltip}}">{{lang_calupdate}}</Label><br>
+        <input id="updateCalendar" name="calupdate" type="number" style="width: 50px; text-align: center;" min="0" max="1440"/> {{lang_min}}
+      </div>
+      <div style="float: left; margin-left: 15px;">
+        <Label data-toggle="tooltip" title="{{lang_roomupdateTooltip}}">{{lang_roomupdate}}</Label><br>
+        <input id="updateRoom" name="roomupdate" type="number" style="width: 50px; text-align: center;" min="0" max="86400"/> {{lang_sec}}
+      </div>
+      <div style="float: left; margin-left: 15px;">
+        <Label data-toggle="tooltip" title="{{lang_configupdateTooltip}}">{{lang_configupdate}}</Label><br>
+        <input id="updateConfig" name="configupdate" type="number" style="width: 50px; text-align: center;" min="0" max="1440"/> {{lang_min}}
+      </div>
+    </div>
+
+    <br><br><br><br>
+
+    <button type="submit" class="btn btn-primary">{{lang_save}}</button>
+
+  </form>
+</div>
+
+<script type="text/javascript">
+loadValues();
+
+function loadValues() {
+  $("#{{language}}").attr("selected","selected");
+
+  var mode = $("#{{mode}}");
+  if (!mode.length) {
+    mode = $("#mode1");
+  }
+  mode.attr("selected","selected");
+  vertical_cb(mode.val());
+  if('{{vertical}}' == true){
+    $("#cb_vertical").prop("checked", true);
+  }
+  if('{{eco}}' == true){
+    $("#cb_eco").prop("checked", true);
+  }
+
+  var day = $("#{{daystoshow}}");
+  if (!day.length) {
+    day = $("#day7");
+  }
+  day.attr("selected","selected");
+
+  var rotation = $("#{{rotation}}");
+  if (!rotation.length) {
+    rotation = $("#rotation1");
+  }
+  rotation.attr("selected","selected");
+
+  var scaleVal = '{{scale}}';
+  if (scaleVal == '') {
+    scaleVal = 50;
+  }
+  $('#sl_scale').attr('value', '{{scale}}');
+  showScaleValue(scaleVal);
+
+  var switchVal = '{{switchtime}}';
+  if (switchVal == '') {
+    switchVal = 20;
+  }
+  $("#sl_switch").attr('value', switchVal);
+  showSwitchValue(switchVal);
+
+  $("#updateCalendar").attr("value", '{{calupdate}}');
+  $("#updateRoom").attr("value", '{{roomupdate}}');
+  $("#updateConfig").attr("value", '{{configupdate}}');
+}
+
+function showScaleValue(newValue) {
+	$("#scale").text(newValue + " %");
+}
+
+function showSwitchValue(newValue) {
+	$("#switch").text(newValue + " " + '{{lang_sec}}');
+}
+
+function vertical_cb(value) {
+  if (value == 1) {
+    $("#cb_vertical").prop("disabled", false);
+  } else {
+    $("#cb_vertical").prop("disabled", true);
+    $("#cb_vertical").prop("checked", false);
+  }
+}
+</script>
diff --git a/modules-available/locationinfo/templates/location-info.html b/modules-available/locationinfo/templates/location-info.html
index 254eae8b..b0165eb4 100644
--- a/modules-available/locationinfo/templates/location-info.html
+++ b/modules-available/locationinfo/templates/location-info.html
@@ -8,19 +8,17 @@
 		<th width=10>{{lang_locationID}}</th>
 		<th width=80>{{lang_locationInUse}}</th>
     <th width=50>{{lang_locationIsHidden}}</th>
+		<th width=50>{{lang_openingTime}}</th>
     <th width=50>{{lang_locationSettings}}</th>
-    <th width=1/>
 	</tr>
 
 {{#list}}
 	<tr class="tablerow" onclick="{{#hasPcs}}slxOpenLocationInfo(this, {{locationid}}){{/hasPcs}}">
-		<td><div style="display:inline-block;width:{{depth}}em"></div>{{#hasPcs}}<a>{{/hasPcs}}{{locationname}}</td>
-		<td align="center">{{locationid}}</td>
-
 
+		<td><div style="display:inline-block;width:{{depth}}em"></div>{{#hasPcs}}<a>{{/hasPcs}}{{locationname}}</td>
+		<td align="center">[{{locationid}}]</td>
 		<td align="center">{{#hasPcs}}{{inUse}} / {{total}}{{/hasPcs}}</td>
 
-
 		<td id={{locationid}} onclick="event.cancelBubble = true;" align="center"></td>
 		<script>
       var cbh = document.getElementById('{{locationid}}');
@@ -36,8 +34,8 @@
 			}
 			cb.addEventListener("click", function() { cbClick(this, {{locationid}}); });
     </script>
-
-    <td onclick="event.cancelBubble = true;"><a class="btn btn-sm btn-default" role="button" onclick="loadModal({{locationid}});">{{lang_locationSettings}}</a><td>
+		<td onclick="event.cancelBubble = true;"><a class="btn btn-sm btn-default" role="button" onclick="loadTimeModal({{locationid}}, '{{locationname}}');">{{lang_openingTime}}</a></td>
+		<td onclick="event.cancelBubble = true;"><a class="btn btn-sm btn-default" role="button" onclick="loadConfigModal({{locationid}}, '{{locationname}}');">{{lang_locationSettings}}</a></td>
 	</tr>
 
 {{/list}}
@@ -47,7 +45,7 @@
   <div class="modal-dialog">
 
     <div class="modal-content">
-      <div class="modal-header"></div>
+      <div class="modal-header" id="myModalHeader"></div>
       <div class="modal-body" id="myModalBody"></div>
       <div class="modal-footer">
         <a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
@@ -90,7 +88,7 @@ function slxOpenLocationInfo(e, locationId) {
 		return;
 	}
 
-	var td = $('<td>').attr('colspan', '2').css('padding', '0px 0px 12px');
+	var td = $('<td>').attr('colspan', '3').css('padding', '0px 0px 12px');
 	var tr = $('<tr>').attr('id', 'subtable' + locationId);
 	tr.append(td);
 	$(e).closest('tr').addClass('active slx-bold').after(tr);
@@ -98,8 +96,20 @@ function slxOpenLocationInfo(e, locationId) {
 	lastPcSubTable = tr;
 }
 
-function loadModal(locationId) {
-  $('#myModal').modal('show')
+function loadTimeModal(locationId, locationName) {
+	$('#myModalHeader').text("[" + locationId + "] " + locationName).css("font-weight","Bold");
+
+	$('#myModal').modal('show');
   $('#myModalBody').load("?do=locationinfo&action=timetable&id=" + locationId);
+
+}
+
+function loadConfigModal(locationId, locationName) {
+	$('#myModalHeader').text("[" + locationId + "] " + locationName).css("font-weight","Bold");
+
+  $('#myModal').modal('show');
+	$('#myModalBody').load("?do=locationinfo&action=config&id=" + locationId);
+
 }
+
 </script>
diff --git a/modules-available/locationinfo/templates/timetable.html b/modules-available/locationinfo/templates/timetable.html
index c06a70eb..2484ddc8 100644
--- a/modules-available/locationinfo/templates/timetable.html
+++ b/modules-available/locationinfo/templates/timetable.html
@@ -1,5 +1,5 @@
 <div>
-  <form method="post" action="?do=locationinfo">
+  <form method="post" action="?do=locationinfo" id="timeForm">
     <input type="hidden" name="token" value="{{token}}">
     <input type="hidden" name="action" value="updateOpeningTime">
     <input type="hidden" name="id" value="{{id}}">