genofire
/
ordersprinter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OrderSprinter 1.5.1

This commit is contained in:
Geno 2020-11-19 23:11:29 +01:00
parent a29e2865af
commit 37fdb1055d
34 changed files with 1817 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gastsystem/index.php
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.0" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.5.1" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.0" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.1" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@ -105,7 +105,7 @@
<div data-role="footer" data-theme="b" id="thefooter1"> <div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div> <div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.0&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.5.1&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
} else { } else {
echo "<html>"; echo "<html>";
echo "<head><title>Installation Gastsystem</title>"; echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.0">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.1">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.0</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.1</span><br><br>";
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />"; echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
echo "<br><input type=submit value='Installation starten' class=installbtn />"; echo "<br><input type=submit value='Installation starten' class=installbtn />";
echo "</form></div></html>"; echo "</form></div></html>";

BIN
printserver/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
spider/install/installer.php
View File

@ -85,7 +85,7 @@ class Installer {
} }
Database::dropTables($pdo); Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix); Database::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.5.0"); Database::setVersion($pdo,$prefix,"1.5.1");
Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful"); return array("status" => "OK","msg" => "Installation successful");

BIN
webapp/OrderSprinterPrintserver.exe
View File

Binary file not shown.

12
webapp/bar.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.0"></script> <script src="utilities.js?v=1.5.1"></script>
<script src="kitchenbar.js?v=1.5.0"></script> <script src="kitchenbar.js?v=1.5.1"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
@ -102,13 +102,13 @@ function initializeEverything() {
</script> </script>
<!--first page --> <!--first page -->
<div data-role="page" id="bar-page"> <div data-role="page" id="bar-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="headerline"> <div data-role="header" data-theme="b" data-position="fixed" id="headerline" style="background-color:black;">
<h1>Bar <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1>Bar <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -119,7 +119,7 @@ function initializeEverything() {
<hr id="hrline"> <hr id="hrline">
<div id=listWithCookedEntries></div> <div id=listWithCookedEntries></div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo"><span id="loggedinuser"></span></div> <div class="ui-block-a userinfo"><span id="loggedinuser"></span></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

12
webapp/bill.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -457,13 +457,13 @@ $(document).on("pageinit", "#bill-page", function () {
</script> </script>
<div data-role="page" id="bill-page"> <div data-role="page" id="bill-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b">Hauptmenü</li> <li data-role="list-divider" data-theme="b">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="billtitletxt">Kassenbons</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="billtitletxt">Kassenbons</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a>
@ -484,15 +484,15 @@ $(document).on("pageinit", "#bill-page", function () {
<h3><span id="batchheadertxt">Stapelverarbeitung</span></h3> <h3><span id="batchheadertxt">Stapelverarbeitung</span></h3>
<p> <p>
<form> <form>
<span id="fromjobidtxt">Erste Bon-ID:</span><input type="text" id="fromjobidfield" style="background-color:white;"/><br> <span id="fromjobidtxt">Erste Bon-ID:</span><input type="text" id="fromjobidfield" style="background-color:white;color:black;"/><br>
<span id="tojobidtxt">Letzte Bon-ID:</span><input type="text" id="tojobidfield" style="background-color:white;" /><br> <span id="tojobidtxt">Letzte Bon-ID:</span><input type="text" id="tojobidfield" style="background-color:white;color:black;" /><br>
<a href="#" data-role="button" data-icon="check" id="printjobsbtn" data-theme="f"><span id="printjobstxt">Drucken</span></a> <a href="#" data-role="button" data-icon="check" id="printjobsbtn" data-theme="f"><span id="printjobstxt">Drucken</span></a>
</form> </form>
</div> </div>
<div id=receiptbill></div> <div id=receiptbill></div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

2
webapp/css/bestformat.css
View File

File diff suppressed because one or more lines are too long

6
webapp/customers.html
View File

@ -118,13 +118,13 @@ $(document).on("pageinit", "#info-page", function () {
</script> </script>
<div data-role="page" id="info-page"> <div data-role="page" id="info-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="reportttitletxt">Gäste</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="reportttitletxt">Gäste</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -261,7 +261,7 @@ $(document).on("pageinit", "#info-page", function () {
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

4
webapp/elements/product.js
View File

@ -361,7 +361,7 @@ function newProduct(id, longname, shortname,priceA,priceB,priceC,unit,display,da
function createInputField(idForNameOfField,idForInputField,nameOfInputField) { function createInputField(idForNameOfField,idForInputField,nameOfInputField) {
var txt = '<p><div data-role="fieldcontain">' var txt = '<p><div data-role="fieldcontain">'
+ '<label for="' + idForInputField + '"><span id="' + idForNameOfField + '"></span></label>' + '<label for="' + idForInputField + '"><span id="' + idForNameOfField + '"></span></label>'
+ '<input type="text" name="' + nameOfInputField + '" id="' + idForInputField + '" style="background:white;" /></div></p>'; + '<input type="text" name="' + nameOfInputField + '" id="' + idForInputField + '" style="background:white;color:black;" /></div></p>';
return txt; return txt;
} }
@ -400,7 +400,7 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
createTableStructureLine: function (depth) { createTableStructureLine: function (depth) {
var depthstr = ident(depth); var depthstr = ident(depth);
var trline = "<tr class='prodtype' id='prodtype_" + this.id + "'>" var trline = "<tr class='prodtype' id='prodtype_" + this.id + "'>"
+ "<td>" + depthstr + "<input type='text' class='typename'></input>" + "<td>" + depthstr + "<input type='text' class='typename whiteinput'></input>"
+ "<td class='type_kind'>" + this.createTwoValSelection(kind,PROD_FOOD,PROD_DRINKS) + "<td class='type_kind'>" + this.createTwoValSelection(kind,PROD_FOOD,PROD_DRINKS)
+ "<td class='type_usekitchen'>" + this.createTwoValSelection(usekitchen,PROD_NO,PROD_YES) + "<td class='type_usekitchen'>" + this.createTwoValSelection(usekitchen,PROD_NO,PROD_YES)
+ "<td class='type_usesupply'>" + this.createTwoValSelection(usesupplydesk,PROD_NO,PROD_YES) + "<td class='type_usesupply'>" + this.createTwoValSelection(usesupplydesk,PROD_NO,PROD_YES)

8
webapp/feedback.html
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -207,13 +207,13 @@ $(document).on("pageinit", "#feedback-page", function () {
</script> </script>
<!--first page --> <!--first page -->
<div data-role="page" id="feedback-page"> <div data-role="page" id="feedback-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed"> <div data-role="header" data-theme="b" data-position="fixed" style="background-color:black;">
<h1>Feedback</h1> <h1>Feedback</h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -251,7 +251,7 @@ $(document).on("pageinit", "#feedback-page", function () {
<button type="submit" data-theme="f" data-icon="check" id="sendMail"><span id="sendtxt">Absenden</span></button> <button type="submit" data-theme="f" data-icon="check" id="sendMail"><span id="sendtxt">Absenden</span></button>
</form> </form>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

6
webapp/help.php
View File

@ -32,13 +32,13 @@ $(document).on("pageinit", "#help-page", function () {
</script> </script>
<div data-role="page" id="help-page"> <div data-role="page" id="help-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1>OrderSprinter Hilfe <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1>OrderSprinter Hilfe <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -70,7 +70,7 @@ $(document).on("pageinit", "#help-page", function () {
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

28
webapp/index.html
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.1">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -39,6 +39,20 @@ function fillUserList(userinfo) {
text += '</select>'; text += '</select>';
$("#userlist").html(text); $("#userlist").html(text);
$("#passwordfield").val(""); $("#passwordfield").val("");
// set preselection of view
createViewSelBox(userinfo.defaultview);
}
function createViewSelBox(preselection) {
var txt = '<select name="modus" id="modus" data-theme="e">';
if (preselection == 0) {
txt += '<option value="0" selected>Mobil</option><option value="1">Desktop</option>';
} else {
txt += '<option value="0">Mobil</option><option value="1" selected>Desktop</option>';
}
txt += '</select>';
$("#moduscell").html(txt);
$("#loginmask").trigger("create"); $("#loginmask").trigger("create");
} }
@ -215,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") { if (is_installed == "Yes") {
useInstallation(); useInstallation();
} else { } else {
setTimeout(function(){document.location.href = "install.html?v=1.5.0"},500); setTimeout(function(){document.location.href = "install.html?v=1.5.1"},500);
} }
} }
@ -233,13 +247,13 @@ $(document).on("pageinit", "#index-page", function () {
</script> </script>
<div data-role="page" id="index-page"> <div data-role="page" id="index-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1>OrderSprinter <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1>OrderSprinter <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -255,7 +269,7 @@ $(document).on("pageinit", "#index-page", function () {
<form method="post"> <form method="post">
<table border=0> <table border=0>
<tr><td>Username: <td id="userlist"></tr> <tr><td>Username: <td id="userlist"></tr>
<tr><td>Modus: <td> <tr><td>Modus: <td id="moduscell">
<select name="modus" id="modus" data-theme="e"> <select name="modus" id="modus" data-theme="e">
<option value="0">Mobil</option> <option value="0">Mobil</option>
<option value="1">Desktop</option> <option value="1">Desktop</option>
@ -320,7 +334,7 @@ $(document).on("pageinit", "#index-page", function () {
<div id=demoarea></div> <div id=demoarea></div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

2
webapp/install.html
View File

@ -727,7 +727,7 @@ $(document).ready(function() {
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn">Update -> 1.5.0</button> <button id="updatebtn">Update -> 1.5.1</button>
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -413,7 +413,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones); echo json_encode($zones);
} else if ($command == 'update') { } else if ($command == 'update') {
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "1.5.0"; $installerVersion = "1.5.1";
$admin = new InstallAdmin(); $admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);

12
webapp/kitchen.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.0"></script> <script src="utilities.js?v=1.5.1"></script>
<script src="kitchenbar.js?v=1.5.0"></script> <script src="kitchenbar.js?v=1.5.1"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
@ -104,13 +104,13 @@ function initializeEverything() {
</script> </script>
<!--first page --> <!--first page -->
<div data-role="page" id="kitchen-page"> <div data-role="page" id="kitchen-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="headerline"> <div data-role="header" data-theme="b" data-position="fixed" id="headerline" style="background-color:black;">
<h1><span id="moduleheadline">Küche</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="moduleheadline">Küche</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -121,7 +121,7 @@ function initializeEverything() {
<hr id="hrline"> <hr id="hrline">
<div id=listWithCookedEntries></div> <div id=listWithCookedEntries></div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo"><span id="loggedinuser"></span></div> <div class="ui-block-a userinfo"><span id="loggedinuser"></span></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

75
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -234,6 +234,8 @@ var MAN_WORKFLOW_WR_AND_TRANSFER = ["Arbeitsbons mit Serverübermittlung", "Work
var MAN_WORKFLOW_WR_AND_TRANSFER_HLP = ["Hinweis: 'Arbeitsbons mit Serverübermittlung': In der Bestellansicht werden die Artikel bei Druck auf 'Bestellung senden' an den Server übermittelt, durchlaufen aber nicht die Ansichten Küche/Bar und Bereitstellung und es wird in diesem Fall kein Arbeitsbon gedruckt.", var MAN_WORKFLOW_WR_AND_TRANSFER_HLP = ["Hinweis: 'Arbeitsbons mit Serverübermittlung': In der Bestellansicht werden die Artikel bei Druck auf 'Bestellung senden' an den Server übermittelt, durchlaufen aber nicht die Ansichten Küche/Bar und Bereitstellung und es wird in diesem Fall kein Arbeitsbon gedruckt.",
"Hint: 'Work receipts and server transmit': In the waiter's view the orders can be sent to the server without printining a work receipt. In this case the items won't pass the modules kitchen/bar and supplydesk.", "Hint: 'Work receipts and server transmit': In the waiter's view the orders can be sent to the server without printining a work receipt. In this case the items won't pass the modules kitchen/bar and supplydesk.",
"Información: 'Tiques de trabajar y enviar a servidor': El camarero puede enviar las ordenes al servidor sin imprimir un tique de trabajo."]; "Información: 'Tiques de trabajar y enviar a servidor': El camarero puede enviar las ordenes al servidor sin imprimir un tique de trabajo."];
var MAN_DEFAULTVIEW_MOBILE = ["Mobilansicht","Mobile view","Movil"];
var MAN_DEFAULTVIEW_DESKTOP = ["Desktopansicht","Desktop view","Desktop"];
var MAN_RECTEMPLATE_HINT = ["Hinweis: Die Anpassung der Bonvorlage ist in der Anleitung und auf der Produktwebseite beschrieben.", var MAN_RECTEMPLATE_HINT = ["Hinweis: Die Anpassung der Bonvorlage ist in der Anleitung und auf der Produktwebseite beschrieben.",
"Hint: The customization of the receipt template is described in the manual and on the product home page.", "Hint: The customization of the receipt template is described in the manual and on the product home page.",
"Nota: La adapción del template esta explicada en la página web y el manual."]; "Nota: La adapción del template esta explicada en la página web y el manual."];
@ -350,6 +352,7 @@ var MAN_CASH = ["Kassenfunktion aktiviert","Enabled cash function","Caja activad
var MAN_RETURNTOORDER = ["Rücksprung Bestellung","Go back to order","Volver a ordenar"]; var MAN_RETURNTOORDER = ["Rücksprung Bestellung","Go back to order","Volver a ordenar"];
var MAN_BEEP_COOKED = ["Signalton, wenn neues Produkt serviert werden kann","Audio signal if new product can be served","Señal audio si un producto nuevo esta cocinado"]; var MAN_BEEP_COOKED = ["Signalton, wenn neues Produkt serviert werden kann","Audio signal if new product can be served","Señal audio si un producto nuevo esta cocinado"];
var MAN_BEEP_ORDERED = ["Signalton in Küchen-/Baransicht","Audio signal in kitchen and bar view","Señal audio si un producto nuevo tiene que ser preparado"]; var MAN_BEEP_ORDERED = ["Signalton in Küchen-/Baransicht","Audio signal in kitchen and bar view","Señal audio si un producto nuevo tiene que ser preparado"];
var MAN_DEFAULTVIEW = ["Vorauswahl","Preselection View","Vista estandardo"];
var MAN_CLOSSHOWCI = ["Betriebsinfo auf Tagesabschlussbon","Print company info on closing receipt","Imprimir info del café en el cerramiento"]; var MAN_CLOSSHOWCI = ["Betriebsinfo auf Tagesabschlussbon","Print company info on closing receipt","Imprimir info del café en el cerramiento"];
var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tagesabschluss","Print each tax per payment way on closing","Imprimir cada impuesto por cada camino de pagar en el cerramiento"]; var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tagesabschluss","Print each tax per payment way on closing","Imprimir cada impuesto por cada camino de pagar en el cerramiento"];
var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"]; var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"];
@ -370,7 +373,7 @@ var MAN_ASK_DAYCODE = ["Abfrage Tageslosung","Require input of day code in guest
var MAN_SHOW_DAYCODE = ["Tageslosung in Bestellansicht anzeigen","Show day code in order view","Mostrat códiga del dia en vista de ordenes"]; var MAN_SHOW_DAYCODE = ["Tageslosung in Bestellansicht anzeigen","Show day code in order view","Mostrat códiga del dia en vista de ordenes"];
var MAN_ASK_TABLECODE = ["Abfrage Tischcode","Require input of table code","Pregunta código de la mesa en sistem de huéspedes"]; var MAN_ASK_TABLECODE = ["Abfrage Tischcode","Require input of table code","Pregunta código de la mesa en sistem de huéspedes"];
var MAN_GUEST_TIMEOUT = ["Timeout (Min)","Timeout (min)","Timeout (min)"]; var MAN_GUEST_TIMEOUT = ["Timeout (Min)","Timeout (min)","Timeout (min)"];
var MAN_GUESTTIMEOUT_HINT = ["Ein Timeout von 0 bedeutet, dass gar ein Timeout abläuft.","A timeout value of 0 means that there is no timeout at all.","Un valor de timeout de 0 significa que no hay ningún timeout."]; var MAN_GUESTTIMEOUT_HINT = ["Ein Timeout von 0 bedeutet, dass kein Timeout abläuft.","A timeout value of 0 means that there is no timeout at all.","Un valor de timeout de 0 significa que no hay ningún timeout."];
var MAN_RESTAURANT_MODE = ["Restaurantmodus","Restaurant mode","Usar para restaurantes"]; var MAN_RESTAURANT_MODE = ["Restaurantmodus","Restaurant mode","Usar para restaurantes"];
var MAN_REST_MODE_HINT = ["Hinweis: Wird der Restaurantmodus auf <i>Nein</i> gesetzt, wird in der <b>Desktopansicht</b> die Tischauswahl deaktiviert. Alle Produkte werden als Außer-Haus-Verkauf gebucht.","Hint: If the restautant mode is set to <i>no</i> in the <b>desktop view</b> the table selection is deactivated and all products are ordered as <i>to-go</i>","Nota: Si el modus del restaurante es configurado a <i>no</i> en la vista de <b>Desktop</b> la selección de las mesas es deactivada y todos los productos son ordenados como <i>to-go</i>"]; var MAN_REST_MODE_HINT = ["Hinweis: Wird der Restaurantmodus auf <i>Nein</i> gesetzt, wird in der <b>Desktopansicht</b> die Tischauswahl deaktiviert. Alle Produkte werden als Außer-Haus-Verkauf gebucht.","Hint: If the restautant mode is set to <i>no</i> in the <b>desktop view</b> the table selection is deactivated and all products are ordered as <i>to-go</i>","Nota: Si el modus del restaurante es configurado a <i>no</i> en la vista de <b>Desktop</b> la selección de las mesas es deactivada y todos los productos son ordenados como <i>to-go</i>"];
var MAN_SPECIAL_SETTINGS_TXT = ["Einstellungen für spezielle Abläufe:","Settings for special workflows:","Configuración para workflows muy escpeciales:"]; var MAN_SPECIAL_SETTINGS_TXT = ["Einstellungen für spezielle Abläufe:","Settings for special workflows:","Configuración para workflows muy escpeciales:"];
@ -419,7 +422,7 @@ var MAN_FOOD_CAT = ["Speisen","Food","Comidas"];
var MAN_DRINKS_CAT = ["Getränke","Drinks","Bebidas"]; var MAN_DRINKS_CAT = ["Getränke","Drinks","Bebidas"];
var lang = 0; var lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0]; var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0];
var numberOfClosings = 0; var numberOfClosings = 0;
@ -538,7 +541,8 @@ var generalValuesSettings = [
["showdaycode",MAN_SHOW_DAYCODE[lang],"s",45], ["showdaycode",MAN_SHOW_DAYCODE[lang],"s",45],
["forceprint",MAN_FORCE_PRINT[lang],"s",46], ["forceprint",MAN_FORCE_PRINT[lang],"s",46],
["printextras",MAN_PRINT_EXTRAS[lang],"s",47], ["printextras",MAN_PRINT_EXTRAS[lang],"s",47],
["beepordered",MAN_BEEP_ORDERED[lang],"s",48] ["beepordered",MAN_BEEP_ORDERED[lang],"s",48],
["defaultview",MAN_DEFAULTVIEW[lang],"s",49]
]; ];
var predef = ""; var predef = "";
@ -803,6 +807,7 @@ function insertGeneralConfigItems(configResult) {
$("#partOfPaymentConfig").html(createPaymentConfigPart(values.paymentconfig)); $("#partOfPaymentConfig").html(createPaymentConfigPart(values.paymentconfig));
$("#partOfAddRecPrinter").html(createAddRecPrinterPart(values.addreceipttoprinter)); $("#partOfAddRecPrinter").html(createAddRecPrinterPart(values.addreceipttoprinter));
$("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig)); $("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig));
$("#partOfDefaultView").html(createDefaultViewPart(values.defaultview));
$("#partOfDashslot1").html(createDashslotPart(1,values.dashslot1)); $("#partOfDashslot1").html(createDashslotPart(1,values.dashslot1));
$("#partOfDashslot2").html(createDashslotPart(2,values.dashslot2)); $("#partOfDashslot2").html(createDashslotPart(2,values.dashslot2));
$("#partOfDashslot3").html(createDashslotPart(3,values.dashslot3)); $("#partOfDashslot3").html(createDashslotPart(3,values.dashslot3));
@ -923,6 +928,7 @@ function insertGeneralConfigItems(configResult) {
generalVals[46] = values.forceprint; generalVals[46] = values.forceprint;
generalVals[47] = values.printextras; generalVals[47] = values.printextras;
generalVals[48] = values.beepordered; generalVals[48] = values.beepordered;
generalVals[49] = values.defaultview;
defaulttmp = values.defaulttmp; defaulttmp = values.defaulttmp;
@ -1173,6 +1179,23 @@ function createWorkflowConfigPart(workflow) {
return html; return html;
} }
function createDefaultViewPart(item) {
var html = '<div class="ui-field-contain">';
html += '<label for="defaultview">' + MAN_DEFAULTVIEW[lang] + ':</label>';
html += '<select name="defaultview" id="defaultview" data-theme="e">';
if (item == 0) {
html += '<option value="0" selected>' + MAN_DEFAULTVIEW_MOBILE[lang] + '</option>';
html += '<option value="1">' + MAN_DEFAULTVIEW_DESKTOP[lang] + '</option>';
} else {
html += '<option value="0">' + MAN_DEFAULTVIEW_MOBILE[lang] + '</option>';
html += '<option value="1" selected>' + MAN_DEFAULTVIEW_DESKTOP[lang] + '</option>';
}
html += '</select></div>';
return html;
}
function createSMTPAuth(smtpauth) { function createSMTPAuth(smtpauth) {
var html = '<div class="ui-field-contain">'; var html = '<div class="ui-field-contain">';
html += '<label for="smtpauth">' + MAN_SMTPAUTH[lang] + ':</label>'; html += '<label for="smtpauth">' + MAN_SMTPAUTH[lang] + ':</label>';
@ -1291,7 +1314,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=1.5.0"; document.location.href = "index.html?v=1.5.1";
},250); },250);
} }
}, },
@ -1831,9 +1854,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis(); var millis=getMillis();
setTimeout(function(){ setTimeout(function(){
document.location.href = "install.html?v=1.5.0&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.1&mode=onlyupdate&n=" + millis;
},250); },250);
document.location.href = "install.html?v=1.5.0&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.1&mode=onlyupdate&n=" + millis;
} }
function handleUpdateReplace(answer) { function handleUpdateReplace(answer) {
@ -1977,6 +2000,15 @@ function bindSelectionsWithActions() {
$("#configpart").trigger("create"); $("#configpart").trigger("create");
bindSelectionsWithActions(); bindSelectionsWithActions();
}); });
$("#defaultview").off("change").on("change", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
var newworkflowSel = $("#defaultview").find(":selected").val();
$("#partOfDefaultView").html(createDefaultViewPart(newworkflowSel));
setVisibilityDueToWorkflow();
$("#configpart").trigger("create");
bindSelectionsWithActions();
});
$("#dashslot1").off("change").on("change", function (e) { $("#dashslot1").off("change").on("change", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
@ -2361,14 +2393,14 @@ function createLabelWithTextField(aLabel,displayedName,defaultText) {
var labelid = aLabel; var labelid = aLabel;
var text = '<div class="ui-field-contain">'; var text = '<div class="ui-field-contain">';
text += '<label for="' + labelid + '">' + displayedName + '</label>'; text += '<label for="' + labelid + '">' + displayedName + '</label>';
text += '<input type="text" id="' + labelid + '" value="" data-mini="true" placeholder="' + defaultText + '" style="background-color:white;" />'; text += '<input type="text" id="' + labelid + '" value="" data-mini="true" placeholder="' + defaultText + '" style="background-color:white;color:black;" />';
text += '</div>'; text += '</div>';
return text; return text;
} }
function createButtonWithTextField(id,displayedName,defaultText) { function createButtonWithTextField(id,displayedName,defaultText) {
var text = '<div class="ui-field-contain">'; var text = '<div class="ui-field-contain">';
text += '<input id="userpassword_' + id + '" type="text" value="" data-mini="true" placeholder="' + defaultText + '" style="background-color:white;" />'; text += '<input id="userpassword_' + id + '" type="text" value="" data-mini="true" placeholder="' + defaultText + '" style="background-color:white;color:black;" />';
text += '<button data-theme="f" data-icon="check" class="changepassword" id="changepassword_' + id + '" >' + displayedName + '</button>'; text += '<button data-theme="f" data-icon="check" class="changepassword" id="changepassword_' + id + '" >' + displayedName + '</button>';
text += '</div>'; text += '</div>';
return text; return text;
@ -3196,14 +3228,14 @@ $(document).on("pageinit", "#admin-page", function () {
</script> </script>
<div data-role="page" id="admin-page"> <div data-role="page" id="admin-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay" class="noprint"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay" class="noprint">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader" class="noprint"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" class="noprint" style="background-color:black;">
<h1>Administration <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1>Administration <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -3355,6 +3387,7 @@ $(document).on("pageinit", "#admin-page", function () {
<input type="password" value="" data-mini="true" id="remoteaccesscode" class="genConfigEl"/> <input type="password" value="" data-mini="true" id="remoteaccesscode" class="genConfigEl"/>
</div> </div>
<div id="partOfDefaultView"></div>
<div id="partOfForceprint"></div> <div id="partOfForceprint"></div>
<div id="partOfPrintextras"></div> <div id="partOfPrintextras"></div>
<i id="printextrashint" style="padding-left: 50px;padding-right: 50px;">Hinweis: erfordert 1.4.17</i> <i id="printextrashint" style="padding-left: 50px;padding-right: 50px;">Hinweis: erfordert 1.4.17</i>
@ -3364,43 +3397,43 @@ $(document).on("pageinit", "#admin-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="companyinfo">Betriebsinfo:</label> <label for="companyinfo">Betriebsinfo:</label>
<textarea cols="40" rows="8" name="companyinfo" id="companyinfo" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="companyinfo" id="companyinfo" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="rectemplate">Bonvorlage:</label> <label for="rectemplate">Bonvorlage:</label>
<textarea cols="40" rows="8" name="rectemplate" id="rectemplate" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="rectemplate" id="rectemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=rectemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=rectemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="hosttext"><span id="hosttexttxt">Bewirtungsbeleg</span>:</label> <label for="hosttext"><span id="hosttexttxt">Bewirtungsbeleg</span>:</label>
<textarea cols="40" rows="8" name="hosttext" id="hosttext" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="hosttext" id="hosttext" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="foodtemplate">Vorlage Speisebons:</label> <label for="foodtemplate">Vorlage Speisebons:</label>
<textarea cols="40" rows="8" name="foodtemplate" id="foodtemplate" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="foodtemplate" id="foodtemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=foodtemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=foodtemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="drinktemplate">Vorlage Getränkebons:</label> <label for="drinktemplate">Vorlage Getränkebons:</label>
<textarea cols="40" rows="8" name="drinktemplate" id="drinktemplate" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="drinktemplate" id="drinktemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=drinktemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=drinktemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="canceltemplate">Vorlage Storno-Arbeitsbon:</label> <label for="canceltemplate">Vorlage Storno-Arbeitsbon:</label>
<textarea cols="40" rows="8" name="canceltemplate" id="canceltemplate" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="canceltemplate" id="canceltemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=canceltemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=canceltemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="reservationnote">Reservierungstemplate Email:</label> <label for="reservationnote">Reservierungstemplate Email:</label>
<textarea cols="40" rows="8" name="reservationnote" id="reservationnote" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="8" name="reservationnote" id="reservationnote" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="serverUrl">Webserver:</label> <label for="serverUrl">Webserver:</label>
<textarea cols="40" rows="1" name="serverUrl" id="serverUrl" class="genConfigEl" style="background-color:#FFFFFF;">localhost</textarea> <textarea cols="40" rows="1" name="serverUrl" id="serverUrl" class="genConfigEl" style="background-color:#FFFFFF;color:black;">localhost</textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="webimpressum">Webimpressum:</label> <label for="webimpressum">Webimpressum:</label>
<textarea cols="40" rows="1" name="webimpressum" id="webimpressum" class="genConfigEl" style="background-color:#FFFFFF;"></textarea> <textarea cols="40" rows="1" name="webimpressum" id="webimpressum" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="email"><span id="fromemailtxt">Sender-Email:</span></label> <label for="email"><span id="fromemailtxt">Sender-Email:</span></label>
@ -3997,7 +4030,7 @@ $(document).on("pageinit", "#admin-page", function () {
<div id="printserverdownloadpart" style="display:none;"> <div id="printserverdownloadpart" style="display:none;">
<a class="noprint" href="OrderSprinterPrintserver.exe" data-role="button" data-icon="arrow-d" data-ajax="false">Download Windows-Printserver</a> <a class="noprint" href="OrderSprinterPrintserver.exe" data-role="button" data-icon="arrow-d" data-ajax="false">Download Windows-Printserver</a>
</div> <!-- printerdownloadpart --> </div> <!-- printerdownloadpart -->
<div data-role="footer" data-theme="b" id="thefooterr" class="noprint"> <div data-role="footer" data-theme="b" id="thefooterr" class="noprint" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

8
webapp/paydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -35,13 +35,13 @@ var CALC_TIP=0;var CALC_TOTAL=1;var lang=0;var receiptfontsize=12;var paymentcon
} }
</style> </style>
<div data-role="page" id="info-page"> <div data-role="page" id="info-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="paydesktitle">Kasse</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="paydesktitle">Kasse</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -100,7 +100,7 @@ var CALC_TIP=0;var CALC_TOTAL=1;var lang=0;var receiptfontsize=12;var paymentcon
</div> </div>
<div data-role="footer" data-theme="b" id="thefooter"> <div data-role="footer" data-theme="b" id="thefooter" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

1238
webapp/php/3rdparty/orderstyle/orderstyle-darksoul.css vendored Normal file
View File

File diff suppressed because it is too large Load Diff

217
webapp/php/3rdparty/orderstyle/orderstyle-darksoul.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

78
webapp/php/admin.php
View File

@ -799,24 +799,41 @@ class Admin {
self::getUserValue('keeptypelevel',1); self::getUserValue('keeptypelevel',1);
} }
function getmobilecss() { private function getUsersMobileTheme($pdo) {
$cssFile = "orderstyle.min.css";
if (isset($_SESSION['userid'])) { if (isset($_SESSION['userid'])) {
$userid = $_SESSION['userid']; $userid = $_SESSION['userid'];
$pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "SELECT mobiletheme FROM %user% WHERE id=?"; $sql = "SELECT mobiletheme FROM %user% WHERE id=?";
$mobileTheme = CommonUtils::getRowSqlObject($pdo, $sql, array($userid)); $res = CommonUtils::fetchSqlAll($pdo, $sql, array($userid));
$cssFile = "orderstyle.min.css"; if (count($res) > 0) {
if ($mobileTheme->mobiletheme == 1) { return $res[0]["mobiletheme"];
$cssFile = "orderstyle-pale.min.css"; } else {
return 0;
} }
} }
return 0;
}
function getmobilecss() {
$pdo = DbUtils::openDbAndReturnPdoStatic();
$mobileTheme = $this->getUsersMobileTheme($pdo);
$cssFile = "orderstyle.min.css";
$cssAppend = ".opentable { color:black;} .timeline { color:black;}";
$cssFile = "orderstyle.min.css";
if ($mobileTheme == 1) {
$cssFile = "orderstyle-pale.min.css";
$cssAppend = ".opentable { color:black;} .timeline { color:black;}";
} else if ($mobileTheme == 2) {
$cssFile = "orderstyle-darksoul.min.css";
$cssAppend = ".opentable { color:white;} .timeline { color:black;}";
}
$file = "3rdparty/orderstyle/$cssFile"; $file = "3rdparty/orderstyle/$cssFile";
header('Content-type: text/css'); header('Content-type: text/css');
readfile($file); readfile($file);
echo $cssAppend;
} }
function getMobileTheme() { function getMobileTheme() {
@ -1099,6 +1116,7 @@ class Admin {
$showpayment8 = CommonUtils::getConfigValueStmt($pdo,$stmt,"showpayment8",1); $showpayment8 = CommonUtils::getConfigValueStmt($pdo,$stmt,"showpayment8",1);
$restaurantmode = CommonUtils::getConfigValueStmt($pdo,$stmt,"restaurantmode",1); $restaurantmode = CommonUtils::getConfigValueStmt($pdo,$stmt,"restaurantmode",1);
$defaultview = CommonUtils::getConfigValueStmt($pdo,$stmt,"defaultview",0);
$dblog = CommonUtils::getConfigValueStmt($pdo,$stmt,"dblog",1); $dblog = CommonUtils::getConfigValueStmt($pdo,$stmt,"dblog",1);
$printextras = CommonUtils::getConfigValueStmt($pdo,$stmt,"printextras",0); $printextras = CommonUtils::getConfigValueStmt($pdo,$stmt,"printextras",0);
$forceprint = CommonUtils::getConfigValueStmt($pdo,$stmt,"forceprint",0); $forceprint = CommonUtils::getConfigValueStmt($pdo,$stmt,"forceprint",0);
@ -1188,7 +1206,8 @@ class Admin {
"dashslot1" => $dashslot1,"dashslot2" => $dashslot2,"dashslot3" => $dashslot3, "dashslot1" => $dashslot1,"dashslot2" => $dashslot2,"dashslot3" => $dashslot3,
"priceinlist" => $priceinlist, "priceinlist" => $priceinlist,
"defaulttmp" => $defaultTmp, "defaulttmp" => $defaultTmp,
"ftphost" => $ftphost,"ftpuser" => $ftpuser, "ftppass" => $ftppass "ftphost" => $ftphost,"ftpuser" => $ftpuser, "ftppass" => $ftppass,
"defaultview" => $defaultview
); );
@ -1282,7 +1301,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=1.5.0"); echo json_encode($view . "?v=1.5.1");
} }
} }
@ -1494,28 +1513,28 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.0"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.1"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.0"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.1"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.0"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.1"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.0"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.1"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.0"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.1"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.0"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.1"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.0"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.1"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.0"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.1"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.0"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.1"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.0"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.1"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.0"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.1"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.0"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.1"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.0"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.1"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.0"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.1"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.0"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.1");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.0"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.1"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.0"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.1");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.0"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.1");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -1695,7 +1714,9 @@ class Admin {
$roles = $this->getRoleListCore($pdo); $roles = $this->getRoleListCore($pdo);
echo json_encode(array("users" => $users,"roles" => $roles)); $defaultview = CommonUtils::getConfigValue($pdo, "defaultview", 0);
echo json_encode(array("users" => $users,"roles" => $roles,"defaultview" => $defaultview));
} }
function setTime($day,$month,$year,$hour,$min) { function setTime($day,$month,$year,$hour,$min) {
@ -2027,6 +2048,7 @@ class Admin {
"showpayment8" => array("dbcol" => "showpayment8","checknum" => 0), "showpayment8" => array("dbcol" => "showpayment8","checknum" => 0),
"restaurantmode" => array("dbcol" => "restaurantmode","checknum" => 0), "restaurantmode" => array("dbcol" => "restaurantmode","checknum" => 0),
"defaultview" => array("dbcol" => "defaultview", "checknum" => 0),
"dblog" => array("dbcol" => "dblog","checknum" => 0), "dblog" => array("dbcol" => "dblog","checknum" => 0),
"printextras" => array("dbcol" => "printextras","checknum" => 0), "printextras" => array("dbcol" => "printextras","checknum" => 0),
"forceprint" => array("dbcol" => "forceprint","checknum" => 0), "forceprint" => array("dbcol" => "forceprint","checknum" => 0),

172
webapp/php/bill.php
View File

@ -178,6 +178,54 @@ class Bill {
return $ret; return $ret;
} }
private function createBillOverallInfo($billid,$thetimedate,$tablename,$brutto,$netto,$username,$printer,$host) {
$thetimedate_arr = explode ( ' ', $thetimedate );
$thedate = $thetimedate_arr[0];
$datearr = explode ( '-', $thedate );
$day = sprintf("%02s", $datearr[2]);
$month = sprintf("%02s", $datearr[1]);
$year = sprintf("%04s", $datearr[0]);
$thetime = $thetimedate_arr[1];
$thetimearr = explode ( ':', $thetime );
$hour = $thetimearr[0];
$min = $thetimearr[1];
$thetimedate = "$day.$month.$year $hour:$min";
$billoverallinfo = array(
"id" => $billid,
"billdate" => $thetimedate,
"billday" => $day,
"billmonth" => $month,
"billyear" => $year,
"billhour" => $hour,
"billmin" => $min,
"brutto" => $brutto,
"netto" => $netto,
"table" => $tablename,
"username" => $username,
"printer" => $printer,
"host" => $host
);
return $billoverallinfo;
}
private function createBillTranslations($language) {
$billtranslations = array(
"sum" => $this->P_SUM[$language],
"total" => $this->P_TOTAL[$language],
"mwst" => $this->P_MWST[$language],
"netto" => $this->P_NETTO[$language],
"brutto" => $this->P_BRUTTO[$language],
"id" => $this->P_ID[$language],
"table" => $this->P_TABLE[$language],
"waiter" => $this->P_WAITER[$language],
"no" => $this->P_NO[$language],
"descr" => $this->P_DESCR[$language],
"price" => $this->P_PRICE[$language]
);
return $billtranslations;
}
/** /**
* get the content of a bill (to be used for printserver etc.) * get the content of a bill (to be used for printserver etc.)
* *
@ -194,15 +242,14 @@ class Bill {
} }
$sql = "SELECT tableid FROM %bill% WHERE id=?"; $sql = "SELECT tableid,status FROM %bill% WHERE id=?";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $row = CommonUtils::getRowSqlObject($pdo, $sql,array($billid));
$stmt->execute(array($billid)); if ($row->status == 'c') {
$row = $stmt->fetchObject(); return $this->getCashBill($pdo,$billid,$language,$printer);
}
$sql = "SELECT count(id) as countid FROM %queue% WHERE billid=?"; $sql = "SELECT count(id) as countid FROM %queue% WHERE billid=?";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $qrow = CommonUtils::getRowSqlObject($pdo, $sql, array($billid));
$stmt->execute(array($billid));
$qrow = $stmt->fetchObject();
$tableid = $row->tableid; $tableid = $row->tableid;
if ($qrow->countid == 0) { if ($qrow->countid == 0) {
@ -218,18 +265,14 @@ class Bill {
$sql = "SELECT DISTINCT billdate,brutto,ROUND(netto,2) as netto,tableno as tablename,username,host,IFNULL(%bill%.status,'') as status,guestinfo,paymentid,printextras FROM %bill%,%user%,%resttables%,%queue% WHERE %bill%.id=? AND %bill%.id=%queue%.billid AND userid=%user%.id AND tableid=%resttables%.id AND paidtime is not null "; $sql = "SELECT DISTINCT billdate,brutto,ROUND(netto,2) as netto,tableno as tablename,username,host,IFNULL(%bill%.status,'') as status,guestinfo,paymentid,printextras FROM %bill%,%user%,%resttables%,%queue% WHERE %bill%.id=? AND %bill%.id=%queue%.billid AND userid=%user%.id AND tableid=%resttables%.id AND paidtime is not null ";
} }
} }
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $row = CommonUtils::getRowSqlObject($pdo, $sql, array($billid));
$stmt->execute(array($billid));
$row = $stmt->fetchObject();
$status = $row->status; $status = $row->status;
$sign = ($status == "s" ? "-" : ""); $sign = ($status == "s" ? "-" : "");
if ($tableid != 0) { if ($tableid != 0) {
$sql = "SELECT abbreviation FROM %room%,%resttables% WHERE %resttables%.id=? AND %resttables%.roomid=%room%.id"; $sql = "SELECT abbreviation FROM %room%,%resttables% WHERE %resttables%.id=? AND %resttables%.roomid=%room%.id";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $trow = CommonUtils::getRowSqlObject($pdo, $sql, array($tableid));
$stmt->execute(array($tableid));
$trow = $stmt->fetchObject();
if (is_null($trow->abbreviation) || ($trow->abbreviation == '')) { if (is_null($trow->abbreviation) || ($trow->abbreviation == '')) {
$tablename = $row->tablename; $tablename = $row->tablename;
} else { } else {
@ -254,33 +297,9 @@ class Bill {
if ($printextrasOfReceipt == 1) { if ($printextrasOfReceipt == 1) {
$printExtras = true; $printExtras = true;
} }
$thetimedate_arr = explode ( ' ', $thetimedate );
$thedate = $thetimedate_arr[0]; $billoverallinfo = $this->createBillOverallInfo($billid,$thetimedate,$tablename,$row->brutto,$row->netto,$row->username,$printer,$host);
$datearr = explode ( '-', $thedate );
$day = sprintf("%02s", $datearr[2]);
$month = sprintf("%02s", $datearr[1]);
$year = sprintf("%04s", $datearr[0]);
$thetime = $thetimedate_arr[1];
$thetimearr = explode ( ':', $thetime );
$hour = $thetimearr[0];
$min = $thetimearr[1];
$thetimedate = "$day.$month.$year $hour:$min";
$billoverallinfo = array(
"id" => $billid,
"billdate" => $thetimedate,
"billday" => $day,
"billmonth" => $month,
"billyear" => $year,
"billhour" => $hour,
"billmin" => $min,
"brutto" => $row->brutto,
"netto" => $row->netto,
"table" => $tablename,
"username" => $row->username,
"printer" => $printer,
"host" => $host
);
if ($includeGuestInfo) { if ($includeGuestInfo) {
if (is_null($row->guestinfo)) { if (is_null($row->guestinfo)) {
$billoverallinfo["guestinfo"] = ''; $billoverallinfo["guestinfo"] = '';
@ -302,19 +321,7 @@ class Bill {
$billoverallinfo["payment"] = $paymentname->name; $billoverallinfo["payment"] = $paymentname->name;
} }
$billtranslations = array( $billtranslations = $this->createBillTranslations($language);
"sum" => $this->P_SUM[$language],
"total" => $this->P_TOTAL[$language],
"mwst" => $this->P_MWST[$language],
"netto" => $this->P_NETTO[$language],
"brutto" => $this->P_BRUTTO[$language],
"id" => $this->P_ID[$language],
"table" => $this->P_TABLE[$language],
"waiter" => $this->P_WAITER[$language],
"no" => $this->P_NO[$language],
"descr" => $this->P_DESCR[$language],
"price" => $this->P_PRICE[$language]
);
} }
$sql = "select productname,price,%pricelevel%.name as pricelevelname,togo,count(%queue%.productname) as count,%prodtype%.kind as kind from %queue%,%pricelevel%,%billproducts%,%prodtype%,%products% where %billproducts%.billid=? AND %billproducts%.queueid=%queue%.id AND %queue%.pricelevel = %pricelevel%.id AND %queue%.productid = %products%.id AND %products%.category = %prodtype%.id group by kind, productname,price,pricelevelname,togo"; $sql = "select productname,price,%pricelevel%.name as pricelevelname,togo,count(%queue%.productname) as count,%prodtype%.kind as kind from %queue%,%pricelevel%,%billproducts%,%prodtype%,%products% where %billproducts%.billid=? AND %billproducts%.queueid=%queue%.id AND %queue%.pricelevel = %pricelevel%.id AND %queue%.productid = %products%.id AND %products%.category = %prodtype%.id group by kind, productname,price,pricelevelname,togo";
@ -395,6 +402,44 @@ class Bill {
return $out; return $out;
} }
private function getCashBill($pdo,$billid,$language,$printer) {
$sql = "SELECT billdate,ROUND(brutto,2) as brutto,ROUND(netto,2) as netto,ROUND(tax,2) as tax,username,userid,reason FROM %bill% B, %user% U WHERE B.id=? AND B.userid=U.id";
$result = CommonUtils::fetchSqlAll($pdo, $sql, array($billid));
$r = $result[0];
$brutto = $r["brutto"];
$netto = $r["netto"];
$billoverallinfo = $this->createBillOverallInfo($billid,$r["billdate"],' ',$brutto,$netto,$r["username"],$printer,0);
$billoverallinfo["guestinfo"] = '';
$billtranslations = $this->createBillTranslations($language);
$prods = array();
$prods[] = array(
"productname" => "Barein-/auslage",
"price" => $r["brutto"],
"pricelevel" => "A",
"count" => 1
);
$reason = $r["reason"];
if (!is_null($reason)) {
$prods[] = array(
"productname" => "($reason)",
"price" => 0,
"pricelevel" => "A",
"count" => 0
);
}
$taxes = array(
array("tax"=> "0.00","mwst" => "0.00", "netto" => $netto,"brutto" => $brutto)
);
$out = array("billoverallinfo" => $billoverallinfo,"translations" => $billtranslations,"products" => $prods, "taxes" => $taxes);
return $out;
}
public function getAustriaTaxes($pdo,$billid) { public function getAustriaTaxes($pdo,$billid) {
$sql = "select tax,IF(taxaustria is not null, taxaustria, 0) as taxaustria,concat('$sign',round(sum(price) - sum(price / (1.0 + tax/100.0)),2)) as mwst, concat('$sign',round(sum(price / (1.0 + tax/100.0)),2)) as netto, concat('$sign',sum(price)) as brutto FROM %queue%,%billproducts% WHERE %billproducts%.billid=? AND %billproducts%.queueid=%queue%.id group by tax ORDER BY taxaustria"; $sql = "select tax,IF(taxaustria is not null, taxaustria, 0) as taxaustria,concat('$sign',round(sum(price) - sum(price / (1.0 + tax/100.0)),2)) as mwst, concat('$sign',round(sum(price / (1.0 + tax/100.0)),2)) as netto, concat('$sign',sum(price)) as brutto FROM %queue%,%billproducts% WHERE %billproducts%.billid=? AND %billproducts%.queueid=%queue%.id group by tax ORDER BY taxaustria";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
@ -535,10 +580,11 @@ class Bill {
$commonUtils = new CommonUtils(); $commonUtils = new CommonUtils();
$sql = "SELECT id,billdate,brutto,tableid,closingid,status,host FROM %bill% WHERE tableid >= '0' AND $whenClause ORDER BY id DESC,billdate DESC "; $sql = "SELECT id,billdate,brutto,tableid,closingid,status,host FROM %bill% WHERE tableid >= '0' AND $whenClause ";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $sql .= "UNION ";
$stmt->execute(array($startDate,$endDate)); $sql .= "SELECT id,billdate,brutto,tableid,closingid,status,host FROM %bill% WHERE status='c' AND $whenClause ";
$result = $stmt->fetchAll(); $sql .= "ORDER BY id DESC,billdate DESC";
$result = CommonUtils::fetchSqlAll($pdo, $sql,array($startDate,$endDate,$startDate,$endDate));
$resultarray = array(); $resultarray = array();
foreach($result as $zeile) { foreach($result as $zeile) {
@ -552,6 +598,14 @@ class Bill {
$shortdate = $date->format('H:i'); $shortdate = $date->format('H:i');
$closingID = $zeile['closingid']; $closingID = $zeile['closingid'];
$isClosed = (is_null($closingID) ? 0 : 1); $isClosed = (is_null($closingID) ? 0 : 1);
$host = 0;
$tablename = "-";
if ($zeile["status"] != 'c') {
$host = $zeile['host'];
$tablename = $commonUtils->getTableNameFromId($pdo,$zeile['tableid']);
}
if ($this->billIsCancelled($pdo,$theId)) { if ($this->billIsCancelled($pdo,$theId)) {
$isClosed = 1; $isClosed = 1;
} }
@ -560,12 +614,12 @@ class Bill {
"longdate" => $zeile['billdate'], "longdate" => $zeile['billdate'],
"shortdate" => $shortdate, "shortdate" => $shortdate,
"brutto" => $zeile['brutto'], "brutto" => $zeile['brutto'],
"tablename" => $commonUtils->getTableNameFromId($pdo,$zeile['tableid']), "tablename" => $tablename,
"billcontent" => $this->getBillWithId($pdo,$theId,$l,0,true,false), "billcontent" => $this->getBillWithId($pdo,$theId,$l,0,true,false),
"isClosed" => $isClosed, "isClosed" => $isClosed,
"host" => $zeile['host'] "host" => $host
); );
$resultarray[] = $arr; $resultarray[] = $arr;
} }

5
webapp/php/closing.php
View File

@ -165,9 +165,8 @@ CommonUtils::callPlugin($pdo, "createClosing", "before");
CommonUtils::execSql($pdo, 'DELETE FROM %recordsqueue%', null); CommonUtils::execSql($pdo, 'DELETE FROM %recordsqueue%', null);
CommonUtils::execSql($pdo, 'DELETE FROM %records%', null); CommonUtils::execSql($pdo, 'DELETE FROM %records%', null);
$closingEntrySql = "INSERT INTO `%closing%` (`id` , `closingdate`,`remark`,`billcount`,`billsum`,`signature`) VALUES (NULL ,?,?,?,?,?)"; $closingEntrySql = "INSERT INTO `%closing%` (`closingdate`,`remark`,`billcount`,`billsum`,`signature`) VALUES (?,?,?,?,?)";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($closingEntrySql)); CommonUtils::execSql($pdo, $closingEntrySql, array($closingTime,$remark,0,0.0,null));
$stmt->execute(array($closingTime,$remark,0,0.0,null));
$newClosingId = $pdo->lastInsertId(); $newClosingId = $pdo->lastInsertId();
// test for consistency of bills // test for consistency of bills

2
webapp/php/debug.php
View File

@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) { if (strlen($status) > 150) {
$status = substr($status, 0,149); $status = substr($status, 0,149);
} }
$version = "1.5.0"; $version = "1.5.1";
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
} else { } else {

12
webapp/php/utilities/version.php
View File

@ -889,6 +889,15 @@ class Version {
} }
} }
public static function upd_1500_1501($pdo, $prefix, $dbname) {
try {
self::insertOrUpdateConfigItem($pdo, 'defaultview', '0');
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -936,7 +945,8 @@ class Version {
"1.4.15" => array("upd_1415_1416","1.4.16"), "1.4.15" => array("upd_1415_1416","1.4.16"),
"1.4.16" => array("upd_1416_1417","1.4.17"), "1.4.16" => array("upd_1416_1417","1.4.17"),
"1.4.17" => array("upd_1417_1418","1.4.18"), "1.4.17" => array("upd_1417_1418","1.4.18"),
"1.4.18" => array("upd_1418_1500","1.5.0") "1.4.18" => array("upd_1418_1500","1.5.0"),
"1.5.0" => array("upd_1500_1501","1.5.1")
); );
// RE;* also for install process no check is required // RE;* also for install process no check is required

10
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -75,6 +75,7 @@ var PREF_THEME_TITEL = ["Design","Appearance","Design"];
var PREF_THEME = ["Mobil-Ansicht","Mobile view","Vista movíl"]; var PREF_THEME = ["Mobil-Ansicht","Mobile view","Vista movíl"];
var PREF_THEME_COLORFUL = ["bunt","colorful","colorido"]; var PREF_THEME_COLORFUL = ["bunt","colorful","colorido"];
var PREF_THEME_PALE = ["blass","pale","pálido"]; var PREF_THEME_PALE = ["blass","pale","pálido"];
var PREF_THEME_DARK_SOUL = ["Dark Soul","Dark Soul","Dark Soul"];
var PREF_THEME_HINT = ["Bitte beachten: Möglicherweise wirkt eine Änderung erst, wenn die jeweilige Ansicht im Internetbrowser erneut geladen wird (Reload-Button).", var PREF_THEME_HINT = ["Bitte beachten: Möglicherweise wirkt eine Änderung erst, wenn die jeweilige Ansicht im Internetbrowser erneut geladen wird (Reload-Button).",
"It may be necessary to press the reload button of a view to get the changed design to be applied.", "It may be necessary to press the reload button of a view to get the changed design to be applied.",
"Quizás es necesario reload las paginas despues de un cambio."]; "Quizás es necesario reload las paginas despues de un cambio."];
@ -325,6 +326,7 @@ function createPreferMobileThemePart(prefervalue,label,labeltxt) {
html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_THEME_COLORFUL[l] + '</option>'; html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_THEME_COLORFUL[l] + '</option>';
html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_THEME_PALE[l] + '</option>'; html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_THEME_PALE[l] + '</option>';
html += '<option value="2"' + isSelected(2,prefervalue) + '>' + PREF_THEME_DARK_SOUL[l] + '</option>';
html += '</select></div>'; html += '</select></div>';
return html; return html;
@ -559,14 +561,14 @@ $(document).on("pageinit", "#pref-page", function () {
</script> </script>
<div data-role="page" id="pref-page"> <div data-role="page" id="pref-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay" class="noprint"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay" class="noprint">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader" class="noprint"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" class="noprint" style="background-color:black;">
<h1><span id=prefheader></span></span><span id="username"></span></h1> <h1><span id=prefheader></span></span><span id="username"></span></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -635,7 +637,7 @@ $(document).on("pageinit", "#pref-page", function () {
</div> </div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

12
webapp/products.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -360,7 +360,7 @@ function setLanguage(language) {
if (ct == null) { if (ct == null) {
// on highest levels show fields to create types on highest level // on highest levels show fields to create types on highest level
txt += '<br><input id="topleveltypefield" placeholder="' + PROD_PLACEHOLDER_NEW_PRODTYPE[lang] + '" style="background:white;" />'; txt += '<br><input id="topleveltypefield" placeholder="' + PROD_PLACEHOLDER_NEW_PRODTYPE[lang] + '" style="background:white;color:black;" />';
txt += '<div class="ui-grid-a">'; txt += '<div class="ui-grid-a">';
txt += '<div class="ui-block-a"><button id="createtoptypebtn_food" class="oscmd" type="submit" data-theme="c">' + PROD_NEW_CAT[lang] + " (" + PROD_FOOD[lang] + ") </button></div>"; txt += '<div class="ui-block-a"><button id="createtoptypebtn_food" class="oscmd" type="submit" data-theme="c">' + PROD_NEW_CAT[lang] + " (" + PROD_FOOD[lang] + ") </button></div>";
@ -1183,13 +1183,13 @@ function setLanguage(language) {
</script> </script>
<div data-role="page" id="info-page"> <div data-role="page" id="info-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="prodtitletxt">Angebot</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="prodtitletxt">Angebot</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -1223,7 +1223,7 @@ function setLanguage(language) {
<h3><span id="prodimagesheader">Bildzuweisung</span></h3> <h3><span id="prodimagesheader">Bildzuweisung</span></h3>
<p><div id="prodsetimageuploadarea"> <p><div id="prodsetimageuploadarea">
<div class="roundedborderarea"> <div class="roundedborderarea">
<h3><span id="headeroffullprodset">Setmanipulation</span></h3> <h3><span id="headeroffullprodset" style="color:black;">Setmanipulation</span></h3>
<div id="uploadprodsetfilearea">Bildset-Upload</div> <div id="uploadprodsetfilearea">Bildset-Upload</div>
<div id="uploadprodsetstatus"></div> <div id="uploadprodsetstatus"></div>
@ -1238,7 +1238,7 @@ function setLanguage(language) {
</div> </div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;" >
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

8
webapp/rating.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -129,13 +129,13 @@ function setLanguage(language) {
</script> </script>
<div data-role="page" id="info-page"> <div data-role="page" id="info-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="reportttitletxt">Bewertung</span></h1> <h1><span id="reportttitletxt">Bewertung</span></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -187,7 +187,7 @@ function setLanguage(language) {
<button type="submit" data-theme="f" id="submitrating"><span id=sendbtntxt>Absenden</span></button> <button type="submit" data-theme="f" id="submitrating"><span id=sendbtntxt>Absenden</span></button>
</form> </form>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

8
webapp/reports.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -214,13 +214,13 @@ function setLanguage(language) {
</script> </script>
<div data-role="page" id="info-page"> <div data-role="page" id="info-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="reportttitletxt">Statistik</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="reportttitletxt">Statistik</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -229,7 +229,7 @@ function setLanguage(language) {
<div data-role="content" id="content"> <div data-role="content" id="content">
<h3>Kein Inhalt</h3> <h3>Kein Inhalt</h3>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

30
webapp/reservation.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -602,13 +602,13 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
</script> </script>
<div data-role="page" id="res-page"> <div data-role="page" id="res-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="restitletxt">Reservierung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="restitletxt">Reservierung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a>
@ -695,7 +695,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="customer" class="select" style="width: 100%;"><span id="customertxt">Kunde</span>: </label> <label for="customer" class="select" style="width: 100%;"><span id="customertxt">Kunde</span>: </label>
<input type="text" id="customer" class="reservationinputfield" value="" data-mini="true" placeholder="Name / Telefon"/> <input type="text" id="customer" class="reservationinputfield whiteinput" value="" data-mini="true" placeholder="Name / Telefon"/>
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div id="customerlist"></div> <div id="customerlist"></div>
@ -703,22 +703,22 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<p><div data-role="fieldcontain"> <p><div data-role="fieldcontain">
<label for="guestname" class="select" style="width: 100%;"><span id="nametxt">Name</span>: </label> <label for="guestname" class="select" style="width: 100%;"><span id="nametxt">Name</span>: </label>
<input type="text" id="guestname" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="guestname" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="email" class="select" style="width: 100%;"><span id="emailtxt">Email</span>: </label> <label for="email" class="select" style="width: 100%;"><span id="emailtxt">Email</span>: </label>
<input type="text" id="email" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="email" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="telno" class="select" style="width: 100%;"><span id="teltxt">Telefon</span>: </label> <label for="telno" class="select" style="width: 100%;"><span id="teltxt">Telefon</span>: </label>
<input type="text" id="telno" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="telno" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="remark" class="select" style="width: 100%;"><span id="remarktxt">Notiz</span>: </label> <label for="remark" class="select" style="width: 100%;"><span id="remarktxt">Notiz</span>: </label>
<input type="text" id="remark" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="remark" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<a href="#" data-role="button" data-theme="f" id="newbtn"><span id="newtxt">Neu</span></a> <a href="#" data-role="button" data-theme="f" id="newbtn"><span id="newtxt">Neu</span></a>
@ -733,7 +733,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<table id="dayschedule"></table> <table id="dayschedule"></table>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>
@ -750,12 +750,12 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<form> <form>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="emailfield">Email:</label> <label for="emailfield">Email:</label>
<textarea cols="40" rows="8" name="emailfield" id="emailfield"></textarea> <textarea cols="40" rows="8" name="emailfield" id="emailfield" style="background-color: white; color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="emailtofield"><span id="sendemailtotxt">An</span>:</label> <label for="emailtofield"><span id="sendemailtotxt">An</span>:</label>
<input type="text" id="emailtofield" value="" data-mini="true" disabled /> <input type="text" id="emailtofield" style="background-color: white; color:black;" value="" data-mini="true" disabled />
</div> </div>
<p> <p>
<fieldset class="ui-grid-a" id="changecancelarea"> <fieldset class="ui-grid-a" id="changecancelarea">
@ -856,22 +856,22 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cguestname" class="select" style="width: 200px;"><span id="cnametxt">Name</span>: </label> <label for="cguestname" class="select" style="width: 200px;"><span id="cnametxt">Name</span>: </label>
<input type="text" id="cguestname" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="cguestname" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain cguestname --> </div> <!-- fieldcontain cguestname -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cemail" class="select" style="width: 200px;"><span id="cemailtxt">Name</span>: </label> <label for="cemail" class="select" style="width: 200px;"><span id="cemailtxt">Name</span>: </label>
<input type="text" id="cemail" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="cemail" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain cemail --> </div> <!-- fieldcontain cemail -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="ctelno" class="select" style="width: 200px;"><span id="cteltxt">Telefon</span>: </label> <label for="ctelno" class="select" style="width: 200px;"><span id="cteltxt">Telefon</span>: </label>
<input type="text" id="ctelno" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="ctelno" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain ctelno --> </div> <!-- fieldcontain ctelno -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cremark" class="select" style="width: 200px;"><span id="cremarktxt">Notiz</span>: </label> <label for="cremark" class="select" style="width: 200px;"><span id="cremarktxt">Notiz</span>: </label>
<input type="text" id="cremark" class="reservationinputfield" value="" data-mini="true" /> <input type="text" id="cremark" class="reservationinputfield whiteinput" value="" data-mini="true" />
</div> <!-- fieldcontain cremark --> </div> <!-- fieldcontain cremark -->
<p> <p>

8
webapp/supplydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -278,13 +278,13 @@ function initializeEverything() {
</script> </script>
<!--first page --> <!--first page -->
<div data-role="page" id="supplydesk-page"> <div data-role="page" id="supplydesk-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed"> <div data-role="header" data-theme="b" data-position="fixed" style="background-color:black;">
<h1><span id="supplyheadline">Bereitstellung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="supplyheadline">Bereitstellung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -296,7 +296,7 @@ function initializeEverything() {
<hr> <hr>
<div id="prodsalreadydelivered"></div> <div id="prodsalreadydelivered"></div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

6
webapp/time.html
View File

@ -108,13 +108,13 @@ $(document).on("pageinit", "#index-page", function () {
</script> </script>
<div data-role="page" id="index-page"> <div data-role="page" id="index-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li> <li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1>Zeitabgleich</h1> <h1>Zeitabgleich</h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
@ -139,7 +139,7 @@ $(document).on("pageinit", "#index-page", function () {
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

24
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.0"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.1">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -121,9 +121,7 @@ function getGeneralConfigItems() {
function insertGenConfigStartRest(configResult) { function insertGenConfigStartRest(configResult) {
if (configResult.status == "OK") { if (configResult.status == "OK") {
var values = configResult.msg; var values = configResult.msg;
setLanguage(values.userlanguage); setLanguage(values.userlanguage);
} else { } else {
setTimeout(function(){document.location.href = "index.html";},250); // not logged in setTimeout(function(){document.location.href = "index.html";},250); // not logged in
} }
@ -278,14 +276,14 @@ function handleOverviewAnswer(answer) {
if (answer.status == "OK") { if (answer.status == "OK") {
var txt = ""; var txt = "";
txt += "<p><i><b>" + TIME_TOTAL_SUM[lang] + ": <u>"; txt += "<p><i><b><span class='timeline'>" + TIME_TOTAL_SUM[lang] + ": <u>";
if (answer.msg.totalduration.status == "OK") { if (answer.msg.totalduration.status == "OK") {
txt += minutesToHourMin(answer.msg.totalduration.minutes); txt += minutesToHourMin(answer.msg.totalduration.minutes);
} else { } else {
txt += TIME_NON_CALCULABLE[lang]; txt += TIME_NON_CALCULABLE[lang];
} }
txt += "</u></i><b><p>"; txt += "</u></i></span><b><p>";
answer.msg.times.forEach(function(aTimeEntry, index) { answer.msg.times.forEach(function(aTimeEntry, index) {
var aDate = aTimeEntry.date; var aDate = aTimeEntry.date;
@ -390,13 +388,13 @@ $(document).on("pageinit", "#time-page", function () {
</script> </script>
<div data-role="page" id="time-page"> <div data-role="page" id="time-page" data-theme="c">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true"> <ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
<li data-theme="b" data-role="heading">Hauptmenü</li> <li data-theme="b" data-role="heading">Hauptmenü</li>
</ul> </ul>
</div><!-- /panel --> </div><!-- /panel -->
<div data-role="header" data-theme="b" data-position="fixed" id="theheader"> <div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
<h1><span id="timetitletxt">Zeiterfassung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1> <h1><span id="timetitletxt">Zeiterfassung</span> <img src="img/connection.png" class="connectionstatus" style="display:none;" /> <img src="img/printerstatus.png" class="printerstatus" style="display:none;" /></h1>
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right"> <div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a> <a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch"><span id="modulstxt2">Hauptmenü</span></a>
@ -427,18 +425,18 @@ $(document).on("pageinit", "#time-page", function () {
</div> </div>
<p><div class="roundedborderarea"> <p><div class="roundedborderarea">
<h2><span id="listofentriestxt">Liste</span> <span id="selectedusername"></span></h2> <h2><span id="listofentriestxt" class="timeline">Liste</span> <span id="selectedusername" class="timeline"></span></h2>
<div id="overviewtable"></div> <div id="overviewtable"></div>
</div> </div>
<p><div id="newentrypart" style="display:none;" class="roundedborderarea"> <p><div id="newentrypart" style="display:none;" class="roundedborderarea">
<h2><span id="newentrytxt">Neueintrag</span></h2> <h2><span id="newentrytxt" class="timeline">Neueintrag</span></h2>
<div data-role="fieldcontain" > <div data-role="fieldcontain" >
<label for="datepickernew"><span id=datetxt>Datum </span>: </label> <label for="datepickernew"><span id=datetxt class="timeline">Datum </span>: </label>
<input data-role="date" data-inline="true" type="text" id="datepickernew" data-theme="d" > <input data-role="date" data-inline="true" type="text" id="datepickernew" data-theme="d" >
</div> </div>
<div data-role="fieldcontain" > <div data-role="fieldcontain" >
<label for="timenew"><span id=timetxt>Uhrzeit</span>: </label> <label for="timenew"><span id=timetxt class="timeline">Uhrzeit</span>: </label>
<input type="text" id="timenew" name="timenew" class="whiteinput" placeholder="hh:mm" > <input type="text" id="timenew" name="timenew" class="whiteinput" placeholder="hh:mm" >
</div> </div>
<input name="commentnewentry" id="commentnewentry" type="text" class="whiteinput" placeholder="Kommentar" /> <input name="commentnewentry" id="commentnewentry" type="text" class="whiteinput" placeholder="Kommentar" />
@ -449,7 +447,7 @@ $(document).on("pageinit", "#time-page", function () {
</div> <!-- newentrypart --> </div> <!-- newentrypart -->
<p><div id="listofalluserspart" class="roundedborderarea" style="display:none;"> <p><div id="listofalluserspart" class="roundedborderarea" style="display:none;">
<h2><span id="listofalluserstimestxt">Liste</span></h2> <h2><span id="listofalluserstimestxt" class="timeline">Liste</span></h2>
<div id="allusersoverviewtable"></div> <div id="allusersoverviewtable"></div>
</div> </div>
@ -458,7 +456,7 @@ $(document).on("pageinit", "#time-page", function () {
<br> <br>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a userinfo" id="loggedinuser"></div> <div class="ui-block-a userinfo" id="loggedinuser"></div>
<div class="ui-block-b grid_right" id="versioninfo"></div> <div class="ui-block-b grid_right" id="versioninfo"></div>

28
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long