Adds ability to change mode from website

This commit is contained in:
Patrick McDonagh
2017-03-08 10:01:03 -06:00
parent a0025610f4
commit aab7537972
6 changed files with 134 additions and 95 deletions

129
.idea/workspace.xml generated
View File

@@ -4,9 +4,8 @@
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/__init__.py" afterPath="$PROJECT_DIR$/pocwww/pocwww/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/json.py" afterPath="$PROJECT_DIR$/pocwww/pocwww/json.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/templates/layout.jinja2" afterPath="$PROJECT_DIR$/pocwww/pocwww/templates/layout.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/views.py" afterPath="$PROJECT_DIR$/pocwww/pocwww/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/templates/setpoints.jinja2" afterPath="$PROJECT_DIR$/pocwww/pocwww/templates/setpoints.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
@@ -138,10 +137,12 @@
<file leaf-file-name="Well.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="1357" column="13" lean-forward="false" selection-start-line="1357" selection-start-column="13" selection-end-line="1357" selection-end-column="13" />
<state relative-caret-position="272">
<caret line="112" column="0" lean-forward="true" selection-start-line="112" selection-start-column="0" selection-end-line="112" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#19256#19257#0" expanded="true" />
<element signature="e#19294#19295#0" expanded="true" />
</folding>
</state>
</provider>
@@ -274,30 +275,11 @@
<file leaf-file-name="WellTest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<state relative-caret-position="510">
<caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="true" />
<element signature="e#1340#1341#0" expanded="true" />
</folding>
</state>
</provider>
@@ -346,6 +328,7 @@
<find>index</find>
<find>fluidGasRatio</find>
<find>setupFluidRatio</find>
<find>startupStrokes</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -778,7 +761,7 @@
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-1868" />
<option name="y" value="115" />
<option name="y" value="85" />
<option name="width" value="1613" />
<option name="height" value="913" />
</component>
@@ -1168,7 +1151,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-1868" y="115" width="1613" height="913" extended-state="0" />
<frame x="-1868" y="85" width="1613" height="913" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1252,27 +1235,8 @@
<state relative-caret-position="675">
<caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="true" />
<element signature="e#1340#1341#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1407,6 +1371,8 @@
<caret line="875" column="5" lean-forward="true" selection-start-line="875" selection-start-column="5" selection-end-line="875" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#19256#19257#0" expanded="true" />
<element signature="e#19294#19295#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1814,14 +1780,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="37" column="66" lean-forward="false" selection-start-line="37" selection-start-column="66" selection-end-line="37" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
@@ -1904,36 +1862,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -1960,12 +1888,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
<folding>
<element signature="e#1308#1309#0" expanded="true" />
<element signature="e#1340#1341#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="37" column="66" lean-forward="false" selection-start-line="37" selection-start-column="66" selection-end-line="37" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="1357" column="13" lean-forward="false" selection-start-line="1357" selection-start-column="13" selection-end-line="1357" selection-end-column="13" />
<state relative-caret-position="272">
<caret line="112" column="0" lean-forward="true" selection-start-line="112" selection-start-column="0" selection-end-line="112" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#19256#19257#0" expanded="true" />
<element signature="e#19294#19295#0" expanded="true" />
</folding>
</state>
</provider>