Adds ability to send set points from website to poc thru db

This commit is contained in:
Patrick McDonagh
2017-03-07 17:45:51 -06:00
parent f42dfc27e9
commit a0025610f4
9 changed files with 932 additions and 81 deletions

683
.idea/workspace.xml generated
View File

@@ -2,11 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<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$/src/main/java/com/henrypump/poc/POC.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<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/" />
@@ -115,7 +115,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="69" column="5" lean-forward="false" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<folding />
<folding>
<element signature="e#754#755#0" expanded="false" />
<element signature="e#803#804#0" expanded="false" />
<element signature="e#833#834#0" expanded="false" />
<element signature="e#881#882#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -130,17 +135,13 @@
</provider>
</entry>
</file>
<file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
<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="7965">
<caret line="660" column="0" lean-forward="false" selection-start-line="660" selection-start-column="0" selection-end-line="660" selection-end-column="0" />
<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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#21388#21389#0" expanded="true" />
<element signature="e#21434#21435#0" expanded="true" />
<element signature="e#21628#21629#0" expanded="true" />
<element signature="e#21674#21675#0" expanded="true" />
</folding>
</state>
</provider>
@@ -151,7 +152,15 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1406#1407#0" expanded="false" />
<element signature="e#1442#1443#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1518#1519#0" expanded="false" />
<element signature="e#1619#1620#0" expanded="false" />
<element signature="e#1656#1657#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -166,10 +175,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="WebServer.java" pinned="false" current-in-tab="true">
<file leaf-file-name="WebServer.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<state relative-caret-position="169">
<caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
<folding>
<element signature="imports" expanded="true" />
@@ -183,7 +192,81 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -193,7 +276,29 @@
<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 />
<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>
@@ -201,8 +306,8 @@
<file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4455">
<caret line="321" column="54" lean-forward="false" selection-start-line="321" selection-start-column="54" selection-end-line="321" selection-end-column="54" />
<state relative-caret-position="585">
<caret line="326" column="64" lean-forward="true" selection-start-line="326" selection-start-column="64" selection-end-line="326" selection-end-column="64" />
<folding />
</state>
</provider>
@@ -654,10 +759,10 @@
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
</list>
</option>
</component>
@@ -719,6 +824,62 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="POC-Java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="poc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="POC-Java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="poc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Well" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
@@ -1008,7 +1169,7 @@
</component>
<component name="ToolWindowManager">
<frame x="-1868" y="115" width="1613" height="913" extended-state="0" />
<editor active="false" />
<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" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1016,7 +1177,7 @@
<window_info id="Palette&#9;" 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="9" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11205847" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11205847" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -1090,7 +1251,29 @@
<provider selected="true" editor-type-id="text-editor">
<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 />
<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>
@@ -1106,6 +1289,25 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1395">
<caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2809#2810#0" expanded="false" />
<element signature="e#2844#2845#0" expanded="false" />
<element signature="e#2880#2881#0" expanded="false" />
<element signature="e#2912#2913#0" expanded="false" />
<element signature="e#2946#2947#0" expanded="false" />
<element signature="e#2976#2977#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3036#3037#0" expanded="false" />
<element signature="e#3076#3077#0" expanded="false" />
<element signature="e#3114#3115#0" expanded="false" />
<element signature="e#3148#3149#0" expanded="false" />
<element signature="e#3178#3179#0" expanded="false" />
<element signature="e#3213#3214#0" expanded="false" />
<element signature="e#3244#3245#0" expanded="false" />
<element signature="e#3279#3280#0" expanded="false" />
<element signature="e#3310#3311#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1121,7 +1323,81 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1131,10 +1407,6 @@
<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#21388#21389#0" expanded="true" />
<element signature="e#21434#21435#0" expanded="true" />
<element signature="e#21628#21629#0" expanded="true" />
<element signature="e#21674#21675#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1165,7 +1437,81 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1173,7 +1519,81 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1247,6 +1667,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="795">
<caret line="53" column="13" lean-forward="false" selection-start-line="41" selection-start-column="10" selection-end-line="53" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1272,6 +1695,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -1315,6 +1739,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="32" column="8" lean-forward="false" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
@@ -1329,6 +1754,25 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1665">
<caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2809#2810#0" expanded="false" />
<element signature="e#2844#2845#0" expanded="false" />
<element signature="e#2880#2881#0" expanded="false" />
<element signature="e#2912#2913#0" expanded="false" />
<element signature="e#2946#2947#0" expanded="false" />
<element signature="e#2976#2977#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3036#3037#0" expanded="false" />
<element signature="e#3076#3077#0" expanded="false" />
<element signature="e#3114#3115#0" expanded="false" />
<element signature="e#3148#3149#0" expanded="false" />
<element signature="e#3178#3179#0" expanded="false" />
<element signature="e#3213#3214#0" expanded="false" />
<element signature="e#3244#3245#0" expanded="false" />
<element signature="e#3279#3280#0" expanded="false" />
<element signature="e#3310#3311#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1337,7 +1781,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="69" column="5" lean-forward="false" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<folding />
<folding>
<element signature="e#754#755#0" expanded="false" />
<element signature="e#803#804#0" expanded="false" />
<element signature="e#833#834#0" expanded="false" />
<element signature="e#881#882#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1353,7 +1802,15 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1406#1407#0" expanded="false" />
<element signature="e#1442#1443#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1518#1519#0" expanded="false" />
<element signature="e#1619#1620#0" expanded="false" />
<element signature="e#1656#1657#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1365,35 +1822,85 @@
</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="7965">
<caret line="660" column="0" lean-forward="false" selection-start-line="660" selection-start-column="0" selection-end-line="660" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#21388#21389#0" expanded="true" />
<element signature="e#21434#21435#0" expanded="true" />
<element signature="e#21628#21629#0" expanded="true" />
<element signature="e#21674#21675#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
<folding>
<element signature="imports" expanded="true" />
</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">
<caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1401,15 +1908,29 @@
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4455">
<caret line="321" column="54" lean-forward="false" selection-start-line="321" selection-start-column="54" selection-end-line="321" selection-end-column="54" />
<folding />
<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>
@@ -1421,6 +1942,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585">
<caret line="326" column="64" lean-forward="true" selection-start-line="326" selection-start-column="64" selection-end-line="326" selection-end-column="64" />
<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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

View File

@@ -124,7 +124,6 @@ def main(global_config, **settings):
config.add_route('home', '/')
config.add_route('json_snapshot', '/json')
config.add_route('cards_page', '/cards/{cards_date}/{page_num}')
config.add_route('json_cards_page', '/json/cards/{cards_date}/{page_num}')
config.add_route('cards_date', '/cards/{cards_date}')
config.add_route('json_cards_date', '/json/cards/{cards_date}')
@@ -152,7 +151,6 @@ def main(global_config, **settings):
config.add_route('welltests_all', '/welltests')
config.add_route('json_welltests_all', '/json/welltests')
config.add_route('runstatus_page', '/runstatus/{page_num}')
config.add_route('runstatus', '/runstatus')
config.add_route('json_runstatus_page', '/json/runstatus/{page_num}')
config.add_route('json_runstatus', '/json/runstatus')
@@ -160,6 +158,9 @@ def main(global_config, **settings):
config.add_route('json_config', '/json/config', factory='pocwww.security.UserLoginFactory')
config.add_route('config', '/config', factory='pocwww.security.UserLoginFactory')
config.add_route('json_setpoints', '/json/setpoints', factory='pocwww.security.UserLoginFactory')
config.add_route('setpoints', '/setpoints', factory='pocwww.security.UserLoginFactory')
config.add_route('admin', '/admin', factory='pocwww.security.UserLoginFactory')
config.add_route('auth', '/sign/{action}')
config.add_route('register', '/register', factory='pocwww.security.UserLoginFactory')

View File

@@ -246,3 +246,27 @@ def json_updateuser(request):
else:
set_return = set_password(request, jsb['username'], jsb['password'])
return {'status': "OK"}
@view_config(route_name="json_setpoints", renderer="prettyjson", request_method='GET', permission='edit')
def json_setpoints(request):
return {'setpoints': list(request.db['setpoints'].find())}
@view_config(route_name="json_setpoints", renderer="prettyjson", request_method='POST', permission='edit')
def json_setpoints_post(request):
jsb = request.json_body
try:
name = jsb['name']
value = jsb['value']
upsert = request.db['setpoints'].update_one({"name": name}, {"$set": {'value': value, 'storedBy': request.authenticated_userid, 'lastStored': datetime.utcnow()}}, upsert=True)
address = get_poc_address(request) or 'localhost'
url = "http://{}:8000/update?setpoint={}".format(address, name)
print(url)
r = requests.get(url)
update_status = r.text if r.status_code == 200 else {"status": "failure sending command"}
return {"updated": list(request.db['setpoints'].find_one({"name": name})), 'status': update_status}
except KeyError:
return {"status": "bad reqest"}

View File

@@ -64,7 +64,8 @@
<li {% if (navgroup == 'fluidshots') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/fluidshots">Fluid Shots</a></li>
<li {% if (navgroup == 'welltests') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/welltests">Well Tests</a></li>
{% if request.authenticated_userid %}
<li><a href="/config">Configuration</a></li>
<li {% if (navgroup == 'setpoints') %}class="active"{% endif %}><a href="/setpoints">Setpoints</a></li>
<li {% if (navgroup == 'config') %}class="active"{% endif %}><a href="/config">Well Setup</a></li>
<li><a href="/register">{{request.authenticated_userid}}</a></li>
<li><form class="navbar-form"><div class="form-group"><a href="{{request.route_url('auth',action='out')}}" class="btn btn-warning">Sign Out</a></div></form></li>
{% else %}

View File

@@ -0,0 +1,73 @@
{% extends "layout.jinja2" %}
{% block content %}
<div class="content">
<div class="container">
<div class="row">
<div class="col-xs-12">
<h1>POC Setpoints</h1>
<div class="table table-responsive">
<table class="table">
<thead>
<tr>
<td>Name</td>
<td>Value</td>
<td></td>
<td>Stored By</td>
<td>Last Time Stored</td>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<script>
function makeFormForSetpoint(i, s){
var row = '<tr>';
row += '<td>' + s.name +'</td>';
row += '<td><input type="number" class="form-control" id="' + s.name + '" value="' + s.value + '"></td>';
row += '<td><button class="btn btn-default setbtn" data-setpoint="'+ s.name + '">Update</button></td>';
row += '<td><input disabled type="text" class="form-control" id="' + s.name + '-storedBy" value="' + s.storedBy + '"></td>';
row += '<td><input disabled type="text" class="form-control" id="' + s.name + '-lastStored" value="' + s.lastStored + '"></td>';
row += '</tr>';
$('tbody').append(row);
}
function updateSingleRow(data){
var name = data.updated.name;
var storedBy = data.updated.storedBy;
var value = data.updated.value;
$("#"+ name).val(value);
}
function getSetpoints(){
$('tbody').empty();
$.get("/json/setpoints", {}, function(data){
$.each(data.setpoints, makeFormForSetpoint);
$('.setbtn').click(function(e){
e.preventDefault();
var setpoint = $(this).data('setpoint');
var value = $("#"+ setpoint).val();
$.post({
dataType: 'json',
data: JSON.stringify({name: setpoint, value: value}),
contentType: "application/json; charset=utf-8",
url: "/json/setpoints",
success: updateSingleRow
});
});
});
}
getSetpoints();
</script>
{% endblock content %}

View File

@@ -19,7 +19,6 @@ def cards(request):
@view_config(route_name='cards_date', renderer='templates/cardlist.jinja2')
@view_config(route_name='cards_page', renderer='templates/cardlist.jinja2')
@view_config(route_name='json_cards_date', renderer='prettyjson')
@view_config(route_name='json_cards_page', renderer='prettyjson')
def cards_page(request):
@@ -120,7 +119,6 @@ def welltests_all(request):
@view_config(route_name="runstatus", renderer="templates/runstatus.jinja2")
@view_config(route_name="json_runstatus", renderer="prettyjson")
@view_config(route_name="runstatus_page", renderer="templates/runstatus.jinja2")
@view_config(route_name="json_runstatus_page", renderer="prettyjson")
def run_status(request):
page_num = 1
@@ -166,3 +164,8 @@ def sign_in_out(request):
renderer='templates/register.jinja2', permission="edit")
def register(request):
return {"navgroup": "user"}
@view_config(route_name='setpoints', renderer='templates/setpoints.jinja2', permission='edit')
def setpoints(request):
return {"navgroup": "setpoints"}

View File

@@ -322,6 +322,10 @@ public class Database {
setpoint = setpointDoc.getDouble("value");
String storedBy = setpointDoc.getString("storedBy");
System.out.println("Setpoint retrieved from database: [" + setpointName + " = " + setpoint + " stored by " + storedBy + "]");
} catch (ClassCastException e){
setpoint = Double.parseDouble(setpointDoc.getString("value"));
String storedBy = setpointDoc.getString("storedBy");
System.out.println("Setpoint retrieved from database: [" + setpointName + " = " + setpoint + " stored by " + storedBy + "]");
} catch (NullPointerException e){
setpoint = Double.MIN_VALUE;
System.out.println("Could not find a value for " + setpointName + " in the database.");

View File

@@ -525,11 +525,14 @@ public class Well {
switch (runModeString){
case "POC":
runMode = RUNMODE_POC;
System.out.println("Run Mode has been set to POC");
break;
case "MANUAL":
System.out.println("Run Mode has been set to MANUAL");
runMode = RUNMODE_MANUAL;
break;
case "TIMER":
System.out.println("Run Mode has been set to TIMER");
runMode = RUNMODE_TIMER;
break;
default:
@@ -691,6 +694,7 @@ public class Well {
System.out.println("Restarting after pump-off from " + initiator + "...");
runStatus = RUNSTATUS_STARTING;
strokesSinceStart = 0;
pumpStartTime = ZonedDateTime.now();
db.newRunStatus(getRunStatusString(), initiator);
}
}
@@ -1334,7 +1338,7 @@ public class Well {
}
else if (runMode == RUNMODE_TIMER) {
if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
minutesSinceTimerStart = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpStartTime);
minutesSinceTimerStart = ChronoUnit.MINUTES.between(pumpStartTime, ZonedDateTime.now());
if (minutesSinceTimerStart_last != minutesSinceTimerStart) {
System.out.println("Timer stopping in " + (timerRunMinutesSetpoint - minutesSinceTimerStart) + " minutes.");
minutesSinceTimerStart_last = minutesSinceTimerStart;
@@ -1343,9 +1347,9 @@ public class Well {
pumpOff("timer");
}
} else if(runStatus == RUNSTATUS_PUMPEDOFF) {
minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), timerStopTime);
if (minutesSincePumpOff_last != minutesSincePumpOff) {
System.out.println("Timer stopping in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
minutesSinceTimerStop = ChronoUnit.MINUTES.between(timerStopTime, ZonedDateTime.now());
if (minutesSinceTimerStop_last != minutesSinceTimerStop) {
System.out.println("Timer restarting in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
minutesSinceTimerStop_last = minutesSinceTimerStop;
}
if (minutesSinceTimerStop > timerOffMinutesSetpoint) {
@@ -1392,7 +1396,7 @@ public class Well {
if (runMode == RUNMODE_POC) {
if (runStatus == RUNSTATUS_PUMPEDOFF) {
minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpedOffTime);
minutesSincePumpOff = ChronoUnit.MINUTES.between(pumpedOffTime, ZonedDateTime.now());
if (minutesSincePumpOff_last != minutesSincePumpOff) {
System.out.println("Restarting in " + (pumpOffDowntimeMinutesSetpoint - minutesSincePumpOff) + " minutes.");
minutesSincePumpOff_last = minutesSincePumpOff;
@@ -1404,7 +1408,7 @@ public class Well {
}
else if (runMode == RUNMODE_TIMER) {
if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
minutesSinceTimerStart = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpStartTime);
minutesSinceTimerStart = ChronoUnit.MINUTES.between(pumpStartTime, ZonedDateTime.now());
if (minutesSinceTimerStart_last != minutesSinceTimerStart) {
System.out.println("Timer stopping in " + (timerRunMinutesSetpoint - minutesSinceTimerStart) + " minutes.");
minutesSinceTimerStart_last = minutesSinceTimerStart;
@@ -1413,9 +1417,9 @@ public class Well {
pumpOff("timer");
}
} else if(runStatus == RUNSTATUS_PUMPEDOFF) {
minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), timerStopTime);
if (minutesSincePumpOff_last != minutesSincePumpOff) {
System.out.println("Timer stopping in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
minutesSinceTimerStop = ChronoUnit.MINUTES.between(timerStopTime, ZonedDateTime.now());
if (minutesSinceTimerStop_last != minutesSinceTimerStop) {
System.out.println("Timer restarting in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
minutesSinceTimerStop_last = minutesSinceTimerStop;
}
if (minutesSinceTimerStop > timerOffMinutesSetpoint) {

View File

@@ -0,0 +1,192 @@
from pyramid.config import Configurator
from pyramid.authentication import AuthTktAuthenticationPolicy
from pyramid.authorization import ACLAuthorizationPolicy
from datetime import datetime, date
from dateutil import tz
from pyramid.renderers import JSON
from bson.objectid import ObjectId
from .pagination import Pagination
try:
# for python 2
from urlparse import urlparse
except ImportError:
# for python 3
from urllib.parse import urlparse
from pymongo import MongoClient
from_zone = tz.tzutc()
to_zone = tz.tzlocal()
def format_datetime(inpDate, format='medium'):
inpDate = inpDate.replace(tzinfo=from_zone)
localDate = inpDate.astimezone(to_zone)
if format == 'long':
format = "%A, %B %d %Y at %I:%M:%S %p"
elif format == 'medium':
format = "%a, %b %d %Y %I:%M:%S %p"
elif format == 'short':
format = "%m/%d/%Y %I:%M:%S %p"
return localDate.strftime(format)
def format_dateString(inpDate, format='medium'):
iDate = datetime.strptime(inpDate, '%Y-%m-%d')
if format == 'long':
format = "%A, %B %d %Y"
elif format == 'medium':
format = "%a, %b %d %Y"
elif format == 'short':
format = "%m/%d/%Y"
return iDate.strftime(format)
def format_date(inpDate, format='medium'):
if format == 'long':
format = "%A, %B %d %Y"
elif format == 'medium':
format = "%a, %b %d %Y"
elif format == 'short':
format = "%m/%d/%Y"
return inpDate.strftime(format)
def roundDigits(inpValue, digits=2):
return round(inpValue, digits)
# JSON RENDERERS
def datetime_adapter(obj, request):
return obj.strftime("%Y-%m-%d %H:%M:%S.%fZ")
def objectId_adapter(obj, request):
return str(obj)
def date_adapter(obj, request):
return obj.strftime("%Y-%m-%d")
def pagination_adapter(obj, request):
p = {
'page': obj.page,
'per_page': obj.per_page,
'total_count': obj.total_count,
}
return p
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
authentication_policy = AuthTktAuthenticationPolicy('H3nryP7mp')
authorization_policy = ACLAuthorizationPolicy()
config = Configurator(settings=settings,
authentication_policy=authentication_policy,
authorization_policy=authorization_policy)
config.include('pyramid_jinja2')
config.commit() # this is needed or you will get None back on the next line
jinja2_env = config.get_jinja2_environment()
jinja2_env.filters['datetime'] = format_datetime
jinja2_env.filters['date'] = format_date
jinja2_env.filters['datestring'] = format_dateString
db_url = urlparse(settings['mongo_uri'])
config.registry.db = MongoClient(
host=db_url.hostname,
port=db_url.port,
)
config.registry.db.poc.users.update_one({"username": "admin"}, {"$set": {"username": "admin", "password": "l3tm31n"}}, upsert=True)
def add_db(request):
db = config.registry.db[db_url.path[1:]]
if db_url.username and db_url.password:
db.authenticate(db_url.username, db_url.password)
return db
config.add_request_method(add_db, 'db', reify=True)
config.add_static_view('static', 'static', cache_max_age=3600)
# CUSTOM JSON RENDERER
prettyjson = JSON(indent=4)
prettyjson.add_adapter(datetime, datetime_adapter)
prettyjson.add_adapter(date, date_adapter)
prettyjson.add_adapter(ObjectId, objectId_adapter)
prettyjson.add_adapter(Pagination, pagination_adapter)
config.add_renderer('prettyjson', prettyjson)
# SHARED ROUTES
config.add_route('home', '/')
config.add_route('json_snapshot', '/json')
config.add_route('cards', '/cards')
config.add_route('json_cards', '/json/cards')
config.add_route('cards_date', '/cards?date={cards_date}')
config.add_route('json_cards_date', '/json/cards?date={cards_date}')
config.add_route('cards_page', '/cards?date={cards_date}&page={page_num}')
config.add_route('json_cards_page', '/json/cards?date={cards_date}&page={page_num}')
config.add_route('card_single', "/card/view/{stroke_number}")
config.add_route('json_card_single', "/json/card/view/{stroke_number}")
config.add_route('values_all', "/values")
config.add_route('json_values_all', "/json/values")
config.add_route('values_tag', "/values/tag/{tagname}")
config.add_route('values_time', '/values/time/{time}')
config.add_route('json_values_time', '/json/values/time/{time}')
config.add_route('gaugeoff_all', '/gaugeoff')
config.add_route('json_gaugeoff_all', '/json/gaugeoff')
config.add_route('fluidshots_all', '/fluidshots')
config.add_route('json_fluidshots_all', '/json/fluidshots')
config.add_route('welltests_all', '/welltests')
config.add_route('json_welltests_all', '/json/welltests')
config.add_route('runstatus_page', '/runstatus/{page_num}')
config.add_route('runstatus', '/runstatus')
config.add_route('json_runstatus_page', '/json/runstatus/{page_num}')
config.add_route('json_runstatus', '/json/runstatus')
config.add_route('json_config', '/json/config', factory='pocwww.security.UserLoginFactory')
config.add_route('config', '/config', factory='pocwww.security.UserLoginFactory')
config.add_route('json_config', '/json/setpoints', factory='pocwww.security.UserLoginFactory')
config.add_route('config', '/setpoints', factory='pocwww.security.UserLoginFactory')
config.add_route('admin', '/admin', factory='pocwww.security.UserLoginFactory')
config.add_route('auth', '/sign/{action}')
config.add_route('register', '/register', factory='pocwww.security.UserLoginFactory')
# JSON-ONLY ROUTES
config.add_route('json_lastcard', "/json/lastcard")
config.add_route('json_runstatusnow', "/json/runstatusnow")
config.add_route('json_valuesbetween_wparams', "/json/values/between/{startdt}/{enddt}")
config.add_route('json_valuesbetween', "/json/values/between")
config.add_route("json_valuesdaterange", "/json/values/daterange")
config.add_route('json_singlevaluebetween_wparams', "/json/values/tag/{tagname}/between/{startdt}/{enddt}")
config.add_route('json_singlevaluebetween', "/json/values/tag/{tagname}")
config.add_route("json_singlevaluedaterange", "/json/values/tag/{tagname}/daterange")
config.add_route("json_updateconfig", "/json/updateconfig", factory='pocwww.security.UserLoginFactory')
config.add_route("json_shake", '/json/cmd/shake', factory='pocwww.security.UserLoginFactory')
config.add_route("json_cmd", '/json/cmd/{action}', factory='pocwww.security.UserLoginFactory')
config.add_route("json_update_poc_address", "/json/updatepocaddress", factory='pocwww.security.UserLoginFactory')
config.add_route("json_users", "/json/users", factory='pocwww.security.UserLoginFactory')
config.scan()
return config.make_wsgi_app()