diff options
author | Jannik Schönartz | 2017-01-19 17:42:50 +0100 |
---|---|---|
committer | Jannik Schönartz | 2017-01-19 17:42:50 +0100 |
commit | 114e5e684000f630ee51b644e8abb7142d390b7c (patch) | |
tree | 95c6dba3a0f427f3f65f76e02b75375da1e3b3d0 /modules-available/locationinfo | |
parent | frontend: fixed not showing free pc ount sometimes (diff) | |
download | slx-admin-114e5e684000f630ee51b644e8abb7142d390b7c.tar.gz slx-admin-114e5e684000f630ee51b644e8abb7142d390b7c.tar.xz slx-admin-114e5e684000f630ee51b644e8abb7142d390b7c.zip |
Deleted the pcsubtable. Bugs/Usability fixes.
Diffstat (limited to 'modules-available/locationinfo')
4 files changed, 25 insertions, 59 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 515ac81f..60537d5b 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -136,12 +136,28 @@ function getOpeningTimesFromParent($locationID) { $parentlocationid = (int)$dbdata['parentlocationid']; } if ($parentlocationid == 0) { - echo json_encode(array()); + echo json_encode(createBasicClosingTime(), true); }else { getOpeningTimes($parentlocationid); } } +function createBasicClosingTime() { + $weekarray = array ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"); + $array = array(); + foreach ($weekarray as $d) { + $a = array(); + $arr['HourOpen'] = '00'; + $arr['MinutesOpen'] = '00'; + + $arr['HourClose'] = '23'; + $arr['MinutesClose'] = '59'; + $a[] = $arr; + $array[$d] = $a; + } + return $array; +} + function getOpeningTimes($locationID) { $error = checkIfHidden($locationID); if ($error == true) { diff --git a/modules-available/locationinfo/templates/location-info.html b/modules-available/locationinfo/templates/location-info.html index 98786934..82b0ad15 100644 --- a/modules-available/locationinfo/templates/location-info.html +++ b/modules-available/locationinfo/templates/location-info.html @@ -78,9 +78,9 @@ </tr> {{#list}} - <tr id="row{{locationid}}" class="tablerow" onclick="{{#hasPcs}}slxOpenLocationInfo(this, {{locationid}}){{/hasPcs}}"> + <tr id="row{{locationid}}" class="tablerow"> - <td><div style="display:inline-block;width:{{depth}}em"></div>{{#hasPcs}}<a>{{/hasPcs}}{{locationname}}{{#hasPcs}}</a>{{/hasPcs}}</td> + <td><div style="display:inline-block;width:{{depth}}em"></div>{{locationname}}</td> <td align="center">[{{locationid}}]</td> <td align="center">{{#hasPcs}}{{pcState}} / {{total}}{{/hasPcs}}</td> @@ -134,32 +134,6 @@ function cbClick(cb, locID) { window.location.href = "?do=locationinfo&action=hide&id=" + locID + "&value=" + value; } -function slxOpenLocationInfo(e, locationId) { - if (lastPcSubTable !== false) { - lastPcSubTable.hide(); - $(lastPcSubTable).prev().removeClass('active slx-bold'); - } - - var existing = $('#subtable' + locationId); - if (existing.length > 0) { - if (existing.is(lastPcSubTable)) { - lastPcSubTable = false; - } else { - existing.show(); - $(e).closest('tr').addClass('active slx-bold'); - lastPcSubTable = existing; - } - return; - } - - 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); - td.load("?do=locationinfo&action=pcsubtable&id=" + locationId); - lastPcSubTable = tr; -} - function loadTimeModal(locationId, locationName) { $('#myModalHeader').text("[" + locationId + "] " + locationName).css("font-weight","Bold"); diff --git a/modules-available/locationinfo/templates/pcsubtable.html b/modules-available/locationinfo/templates/pcsubtable.html deleted file mode 100644 index 59aa28b2..00000000 --- a/modules-available/locationinfo/templates/pcsubtable.html +++ /dev/null @@ -1,24 +0,0 @@ -<div> -<br> -<table style="margin-bottom:0"> - <tr> - <th width=320>{{lang_pcID}}</th> - <th width=120>{{lang_pcIP}}</th> - <th width=50>{{lang_pcX}}</th> - <th width=50>{{lang_pcY}}</th> - <th width=20>{{lang_pcState}}</th> - </tr> - -{{#list}} - <tr class="tablerow"> - <td>{{id}}</td> - <td>{{ip}}</td> - <td>{{x}}</td> - <td>{{y}}</td> - <td align="center">{{pcState}}</td> - </tr> -{{/list}} - -</table> -<br> -</div> diff --git a/modules-available/locationinfo/templates/timetable.html b/modules-available/locationinfo/templates/timetable.html index 05ef7c65..bb3f7991 100644 --- a/modules-available/locationinfo/templates/timetable.html +++ b/modules-available/locationinfo/templates/timetable.html @@ -27,7 +27,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime0}}"> + <input type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime0}}"> </div> </td> <td> @@ -35,7 +35,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime0}}"> + <input type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime0}}"> </div> </td> </tr> @@ -46,7 +46,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime1}}"> + <input type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime1}}"> </div> </td> <td> @@ -54,7 +54,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime1}}"> + <input type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime1}}"> </div> </td> </tr> @@ -65,7 +65,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime2}}"> + <input type="text" class="form-control timepicker2" name="openingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{openingtime2}}"> </div> </td> <td> @@ -73,7 +73,7 @@ <span class="input-group-addon"> <span class="glyphicon glyphicon-time"></span> </span> - <input required type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime2}}"> + <input type="text" class="form-control timepicker2" name="closingtime[]" id="openingtimepicker" pattern="[0-9]{1,2}:[0-9]{2}" value="{{closingtime2}}"> </div> </td> </tr> |