--- a/www-thermferm/profiles.php Tue Sep 15 17:29:15 2015 +0200
+++ b/www-thermferm/profiles.php Wed Sep 16 22:05:05 2015 +0200
@@ -22,6 +22,8 @@
*****************************************************************************/
require_once('utilities.php');
+$my_style = 'ui-redmond';
+
/*
* Each time this page is loaded, get the profiles from the server.
@@ -68,14 +70,14 @@
* $steps contains all steps of a profile
*/
$steps = array (
- 1 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 2 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 3 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 4 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 5 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 6 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 7 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
- 8 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ),
+ 1 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 2 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 3 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 4 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 5 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 6 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 7 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
+ 8 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ),
);
$answer = send_cmd("PROFILE GETS ".$UUID);
@@ -89,7 +91,9 @@
$f = explode(",", $psteps[$j]);
$steps[$j]["steptime"] = $f[0];
$steps[$j]["resttime"] = $f[1];
- $steps[$j]["target"] = $f[2];
+ $steps[$j]["target_lo"] = $f[2];
+ $steps[$j]["target_hi"] = $f[3];
+ $steps[$j]["fridge_mode"] = $f[4];
$j++;
}
}
@@ -111,7 +115,9 @@
$outstr .= ' <td>Step</td>'.PHP_EOL;
$outstr .= ' <td>Steptime</td>'.PHP_EOL;
$outstr .= ' <td>Resttime</td>'.PHP_EOL;
- $outstr .= ' <td>Temperature</td>'.PHP_EOL;
+ $outstr .= ' <td>Temp low</td>'.PHP_EOL;
+ $outstr .= ' <td>Temp high</td>'.PHP_EOL;
+ $outstr .= ' <td>Fridge mode</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
for ($i = 1; $i <= 8; $i++) {
@@ -119,7 +125,12 @@
$outstr .= ' <td>Step '.$i.'</td>'.PHP_EOL;
$outstr .= ' <td><input type="text" name="steptime'.$i.'" size="4" value="'.$steps[$i]["steptime"].'"></td>'.PHP_EOL;
$outstr .= ' <td><input type="text" name="resttime'.$i.'" size="4" value="'.$steps[$i]["resttime"].'"></td>'.PHP_EOL;
- $outstr .= ' <td><input type="text" name="target'.$i.'" size="4" value="'.$steps[$i]["target"].'"></td>'.PHP_EOL;
+ $outstr .= ' <td><input type="text" name="target_lo'.$i.'" size="4" value="'.$steps[$i]["target_lo"].'"></td>'.PHP_EOL;
+ $outstr .= ' <td><input type="text" name="target_hi'.$i.'" size="4" value="'.$steps[$i]["target_hi"].'"></td>'.PHP_EOL;
+ $outstr .= ' <td><input type="hidden" name="fridge_mode'.$i.'" value="0"><input type="checkbox" name="fridge_mode'.$i.'" value="1"';
+ if ($steps[$i]["fridge_mode"] == 1)
+ $outstr .= ' checked';
+ $outstr .= '></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
@@ -143,6 +154,11 @@
$outstr .= ' Lines with a zero steptime and zero resttime are ignored.'.PHP_EOL;
$outstr .= ' The step- and resttimes are in hours.'.PHP_EOL;
$outstr .= ' </div> <!-- atable -->'.PHP_EOL;
+ $outstr .= ' <script type="text/javascript">'.PHP_EOL;
+ $outstr .= ' $(document).ready(function () {'.PHP_EOL;
+ $outstr .= ' $("#maintenance").jqxButton({ width: 150, height: 25, theme: \'ui-redmond\' });'.PHP_EOL;
+ $outstr .= ' });'.PHP_EOL;
+ $outstr .= ' </script>'.PHP_EOL;
$outstr .= build_footer();
echo $outstr;
}
@@ -175,7 +191,9 @@
*
* @param string $_POST['UUID'] The profile UUID
* @param string $_POST['Name'] The profile name
- * @param string $_POST['Inittemp'] The profile initial temperature
+ * @param string $_POST['Inittemp_lo'] The profile initial temperature low
+ * @param string $_POST['Inittemp_hi'] The profile initial temperature high
+ * @param string $_POST['Fridge_mode'] The profile fridge/beer mode
* @param string $_POST['key'] The button pressed.
*/
function profile_update() {
@@ -189,14 +207,18 @@
if ($_POST['key'] == 'Save') {
$cmd = array("PROFILE PUT ".$_POST['UUID']);
$cmd[] = "NAME,".$_POST['Name'];
- $cmd[] = "INITTEMP,".$_POST['Inittemp'];
+ $cmd[] = "INITTEMP_LO,".$_POST['Inittemp_lo'];
+ $cmd[] = "INITTEMP_HI,".$_POST['Inittemp_hi'];
+ $cmd[] = "FRIDGE_MODE,".$_POST['Fridge_mode'];
$cmd[] = ".";
send_array($cmd);
}
unset($_POST['UUID']);
unset($_POST['Name']);
- unset($_POST['Inittemp']);
+ unset($_POST['Inittemp_lo']);
+ unset($_POST['Inittemp_hi']);
+ unset($_POST['Fridge_mode']);
unset($_POST['key']);
unset($_POST['command']);
load('profiles.php');
@@ -210,7 +232,9 @@
* @param string $_POST['UUID'] Unique record UUID
* @param int $_POST['steptime'n] Profile steptime
* @param int $_POST['resttime'n] Profile resttime
- * @param float $_POST['target'n] Profile target temperature
+ * @param float $_POST['target_lo'n] Profile target temperature low
+ * @param float $_POST['target_hi'n] Profile target temperature high
+ * @param int $_POST['fridge_mode'n] Profile fridge mode
* @param string $_POST['key'] Key choice, Save or Cancel
*
* Return: 0 = Ok
@@ -223,9 +247,9 @@
global $arr;
for ($i = 1; $i <= 8; $i++) {
- if ((! isset($_POST['steptime'.$i])) || (! isset($_POST['resttime'.$i])) || (! isset($_POST['target'.$i])))
+ if ((! isset($_POST['steptime'.$i])) || (! isset($_POST['resttime'.$i])) || (! isset($_POST['target_lo'.$i])) || (! isset($_POST['target_hi'.$i])) || (! isset($_POST['fridge_mode'.$i])))
return 1;
- if ((strlen($_POST['steptime'.$i]) == 0) || (strlen($_POST['resttime'.$i]) == 0) || (strlen($_POST['target'.$i]) == 0))
+ if ((strlen($_POST['steptime'.$i]) == 0) || (strlen($_POST['resttime'.$i]) == 0) || (strlen($_POST['target_lo'.$i]) == 0) || (strlen($_POST['target_hi'.$i]) == 0) || (strlen($_POST['fridge_mode'.$i]) == 0))
return 1;
}
@@ -236,8 +260,12 @@
for ($i = 1; $i <= 8; $i++) {
- if (($_POST['target'.$i] < -5) || ($_POST['target'.$i] > 30))
- return 3;
+ if (($_POST['target_lo'.$i] < -5) || ($_POST['target_lo'.$i] > 30))
+ return 3;
+ if (($_POST['target_hi'.$i] < -5) || ($_POST['target_hi'.$i] > 30))
+ return 3;
+ if ($_POST['target_lo'.$i] > $_POST['target_hi'.$i])
+ return 3;
}
} else {
return 1;
@@ -260,11 +288,13 @@
case 0: $cmd = array("PROFILE PUTS ".$_POST['UUID']);
for ($i = 1; $i <= 8; $i++) {
if (($_POST['steptime'.$i] > 0) || ($_POST['resttime'.$i] > 0)) {
- $cmd[] = $_POST['steptime'.$i].','.$_POST['resttime'.$i].','.$_POST['target'.$i];
+ $cmd[] = $_POST['steptime'.$i].','.$_POST['resttime'.$i].','.$_POST['target_lo'.$i].','.$_POST['target_hi'.$i].','.$_POST['fridge_mode'.$i];
}
unset($_POST['steptime'.$i]);
unset($_POST['resttime'.$i]);
- unset($_POST['target'.$i]);
+ unset($_POST['target_lo'.$i]);
+ unset($_POST['target_hi'.$i]);
+ unset($_POST['fridge_mode'.$i]);
}
$cmd[] = ".";
send_array($cmd);
@@ -285,14 +315,14 @@
}
$steps = array (
- 1 => array("steptime" => $_POST['steptime1'], "resttime" => $_POST['resttime1'], "target" => $_POST['target1'] ),
- 2 => array("steptime" => $_POST['steptime2'], "resttime" => $_POST['resttime2'], "target" => $_POST['target2'] ),
- 3 => array("steptime" => $_POST['steptime3'], "resttime" => $_POST['resttime3'], "target" => $_POST['target3'] ),
- 4 => array("steptime" => $_POST['steptime4'], "resttime" => $_POST['resttime4'], "target" => $_POST['target4'] ),
- 5 => array("steptime" => $_POST['steptime5'], "resttime" => $_POST['resttime5'], "target" => $_POST['target5'] ),
- 6 => array("steptime" => $_POST['steptime6'], "resttime" => $_POST['resttime6'], "target" => $_POST['target6'] ),
- 7 => array("steptime" => $_POST['steptime7'], "resttime" => $_POST['resttime7'], "target" => $_POST['target7'] ),
- 8 => array("steptime" => $_POST['steptime8'], "resttime" => $_POST['resttime8'], "target" => $_POST['target8'] ),
+ 1 => array("steptime" => $_POST['steptime1'], "resttime" => $_POST['resttime1'], "target_lo" => $_POST['target_lo1'], "target_hi" => $_POST['target_hi1'], "fridge_mode" => $_POST['mode_fridge1'] ),
+ 2 => array("steptime" => $_POST['steptime2'], "resttime" => $_POST['resttime2'], "target_lo" => $_POST['target_lo2'], "target_hi" => $_POST['target_hi2'], "fridge_mode" => $_POST['mode_fridge2'] ),
+ 3 => array("steptime" => $_POST['steptime3'], "resttime" => $_POST['resttime3'], "target_lo" => $_POST['target_lo3'], "target_hi" => $_POST['target_hi3'], "fridge_mode" => $_POST['mode_fridge3'] ),
+ 4 => array("steptime" => $_POST['steptime4'], "resttime" => $_POST['resttime4'], "target_lo" => $_POST['target_lo4'], "target_hi" => $_POST['target_hi4'], "fridge_mode" => $_POST['mode_fridge4'] ),
+ 5 => array("steptime" => $_POST['steptime5'], "resttime" => $_POST['resttime5'], "target_lo" => $_POST['target_lo5'], "target_hi" => $_POST['target_hi5'], "fridge_mode" => $_POST['mode_fridge5'] ),
+ 6 => array("steptime" => $_POST['steptime6'], "resttime" => $_POST['resttime6'], "target_lo" => $_POST['target_lo6'], "target_hi" => $_POST['target_hi6'], "fridge_mode" => $_POST['mode_fridge6'] ),
+ 7 => array("steptime" => $_POST['steptime7'], "resttime" => $_POST['resttime7'], "target_lo" => $_POST['target_lo7'], "target_hi" => $_POST['target_hi7'], "fridge_mode" => $_POST['mode_fridge7'] ),
+ 8 => array("steptime" => $_POST['steptime8'], "resttime" => $_POST['resttime8'], "target_lo" => $_POST['target_lo8'], "target_hi" => $_POST['target_hi8'], "fridge_mode" => $_POST['mode_fridge8'] ),
);
edit_steps($_POST['UUID'], $steps, $error, "ThermFerm - Edit Profile Steps");
@@ -305,7 +335,9 @@
*
* @param string $_POST['UUID'] Unique record UUID
* @param string $_POST['Name'] Profile name
- * @param float $_POST['Inittemp'] Profile initial temperature
+ * @param float $_POST['Inittemp_lo'] Profile initial temperature
+ * @param float $_POST['Inittemp_hi'] Profile initial temperature
+ * @param float $_POST['Fridge_mode'] Profile fridge mode
* @param string $_POST['key'] Key choice, Save or Cancel
* @param string $_POST['command'] Command used, 'add' or 'update'
*
@@ -319,7 +351,7 @@
global $arr;
- if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Inittemp']) && isset($_POST['key']) && isset($_POST['command'])) {
+ if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Inittemp_lo']) && isset($_POST['Inittemp_hi']) && isset($_POST['key']) && isset($_POST['command'])) {
if ($_POST['key'] == 'Cancel')
return 99;
@@ -426,12 +458,28 @@
$outstr .= ' <td class="editfield"><input type="text" name="Name" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
- if ($f[0] == "INITTEMP") {
+ if ($f[0] == "INITTEMP_LO") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
- $outstr .= ' <td class="editname">Initial temperature</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="Inittemp" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' <td class="editname">Initial temperature low</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="text" name="Inittemp_lo" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "INITTEMP_HI") {
+ $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Initial temperature high</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="text" name="Inittemp_hi" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' </tr>'.PHP_EOL;
+ }
+ if ($f[0] == "FRIDGE_MODE") {
+ $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Fridge mode</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="hidden" name="Fridge_mode" value="0"><input type="checkbox" name="Fridge_mode" value="1"';
+ if ($f[1] == "1")
+ $outstr .= " checked";
+ $outstr .= '></td>'.PHP_EOL;
+ $outstr .= ' </tr>'.PHP_EOL;
+ }
+
$i++;
}
}
@@ -446,6 +494,11 @@
$outstr .= ' </table>'.PHP_EOL;
$outstr .= ' </form>'.PHP_EOL;
$outstr .= ' </div> <!-- etable -->'.PHP_EOL;
+ $outstr .= ' <script type="text/javascript">'.PHP_EOL;
+ $outstr .= ' $(document).ready(function () {'.PHP_EOL;
+ $outstr .= ' $("#maintenance").jqxButton({ width: 150, height: 25, theme: \'ui-redmond\' });'.PHP_EOL;
+ $outstr .= ' });'.PHP_EOL;
+ $outstr .= ' </script>'.PHP_EOL;
$outstr .= build_footer();
echo $outstr;
}
@@ -525,12 +578,18 @@
$outstr .= '<input type="hidden" value="testdata" name="action">';
$outstr .= '<input type="hidden" value="add" name="command">';
$outstr .= '<input type="hidden" value="00000000-0000-0000-0000-000000000000" name="UUID">';
- $outstr .= '<input type="hidden" value="20.0" name="Inittemp"></td>';
+ $outstr .= '<input type="hidden" value="19.8" name="Inittemp_lo"></td>';
+ $outstr .= '<input type="hidden" value="20.2" name="Inittemp_hi"></td>';
$outstr .= ' </tr>'.PHP_EOL;
$outstr .= ' </table>'.PHP_EOL;
$outstr .= ' </form>'.PHP_EOL;
$outstr .= ' </div> <!-- atable -->'.PHP_EOL;
+ $outstr .= ' <script type="text/javascript">'.PHP_EOL;
+ $outstr .= ' $(document).ready(function () {'.PHP_EOL;
+ $outstr .= ' $("#maintenance").jqxButton({ width: 150, height: 25, theme: \'ui-redmond\' });'.PHP_EOL;
+ $outstr .= ' });'.PHP_EOL;
+ $outstr .= ' </script>'.PHP_EOL;
$outstr .= build_footer();
echo $outstr;
}