nmelone/POC-Java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start, stop, and update config from main webserver

Browse Source
This commit is contained in:
Patrick McDonagh
2017-03-01 17:20:36 -06:00
parent 5ae934ce86
commit a90e776cdb
10 changed files with 263 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

546
.idea/workspace.xml generated
View File

@@ -2,10 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/__init__.py" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/json.py" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/json.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/config.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/config.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/dashboard.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/dashboard.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/layout.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/layout.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/setup.py" afterPath="$PROJECT_DIR$/www/pocwww/setup.py" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path="$PROJECT_DIR$/.gradle/" />
@@ -103,13 +109,16 @@
</state>
</system>
</component>
<component name="FavoritesManager">
<favorites_list name="poc-java" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="915">
<caret line="69" column="5" lean-forward="true" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<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 />
</state>
</provider>
@@ -118,8 +127,8 @@
<file leaf-file-name="POC.java" pinned="false" current-in-tab="false">
<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="1530">
<caret line="102" column="65" lean-forward="false" selection-start-line="102" selection-start-column="65" selection-end-line="102" selection-end-column="65" />
<state relative-caret-position="1245">
<caret line="83" column="31" lean-forward="false" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
<folding />
</state>
</provider>
@@ -128,26 +137,20 @@
<file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
<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="105">
<caret line="637" column="0" lean-forward="true" selection-start-line="637" selection-start-column="0" selection-end-line="637" selection-end-column="0" />
<state relative-caret-position="467">
<caret line="1223" column="30" lean-forward="true" selection-start-line="1223" selection-start-column="30" selection-end-line="1223" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14281#14282#0" expanded="true" />
<element signature="e#14331#14332#0" expanded="true" />
<element signature="e#14393#14394#0" expanded="true" />
<element signature="e#14447#14448#0" expanded="true" />
<element signature="e#14505#14506#0" expanded="true" />
<element signature="e#14555#14556#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Simulation.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Simulation.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Simulation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-70">
<caret line="17" column="33" lean-forward="true" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
<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>
<element signature="e#1619#1620#0" expanded="true" />
<element signature="e#1656#1657#0" expanded="true" />
@@ -166,14 +169,13 @@
</provider>
</entry>
</file>
<file leaf-file-name="WebServer.java" pinned="false" current-in-tab="false">
<file leaf-file-name="WebServer.java" pinned="false" current-in-tab="true">
<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="230">
<caret line="52" column="52" lean-forward="true" selection-start-line="52" selection-start-column="52" selection-end-line="52" selection-end-column="52" />
<state relative-caret-position="643">
<caret line="190" column="43" lean-forward="false" selection-start-line="190" selection-start-column="43" selection-end-line="190" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#958#974#0" expanded="true" />
</folding>
</state>
</provider>
@@ -184,81 +186,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@@ -298,11 +226,9 @@
<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="455">
<caret line="283" column="43" lean-forward="true" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding>
<element signature="e#10364#10374#0" expanded="true" />
</folding>
<state relative-caret-position="3870">
<caret line="283" column="43" lean-forward="false" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
@@ -311,7 +237,7 @@
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -336,6 +262,7 @@
<find>simLoops</find>
<find>fill</find>
<find>arraycopy</find>
<find>nT1</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -751,8 +678,8 @@
<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/WebServer.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" />
</list>
</option>
</component>
@@ -767,10 +694,10 @@
<treeState />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="4014" />
<option name="x" value="3600" />
<option name="y" value="23" />
<option name="width" value="1374" />
<option name="height" value="959" />
<option name="width" value="1920" />
<option name="height" value="1057" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -788,8 +715,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -844,7 +770,8 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -852,7 +779,7 @@
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="reference.settings.project.maven.repository.indices" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/patrickjmcd/Henry_Pump/POC-Java/src/main/java/com/henrypump/poc/Well.java" />
</component>
<component name="RunManager" selected="Application.POC">
@@ -1118,8 +1045,17 @@
</task>
<servers />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="4014" y="23" width="1374" height="959" extended-state="0" />
<frame x="3600" y="23" width="1920" height="1057" 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" />
@@ -1136,7 +1072,8 @@
<window_info id="Terminal" 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="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Designer" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.237988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17092651" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1150,7 +1087,6 @@
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Messages" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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="2" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<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" />
@@ -1232,9 +1168,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1575">
<caret line="129" column="42" lean-forward="true" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
<folding>
<element signature="e#10364#10374#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -1276,81 +1210,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@@ -1360,12 +1220,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#14281#14282#0" expanded="true" />
<element signature="e#14331#14332#0" expanded="true" />
<element signature="e#14393#14394#0" expanded="true" />
<element signature="e#14447#14448#0" expanded="true" />
<element signature="e#14505#14506#0" expanded="true" />
<element signature="e#14555#14556#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1374,9 +1228,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
<folding>
<element signature="e#10364#10374#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -1398,81 +1250,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@@ -1480,81 +1258,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@@ -1741,81 +1445,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@@ -1849,45 +1479,28 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/barneyWell.json.bak">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/barneyWell.json.bak" />
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="915">
<caret line="69" column="5" lean-forward="true" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<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="1530">
<caret line="102" column="65" lean-forward="false" selection-start-line="102" selection-start-column="65" selection-end-line="102" selection-end-column="65" />
<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 />
</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="455">
<caret line="283" column="43" lean-forward="true" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding>
<element signature="e#10364#10374#0" expanded="true" />
</folding>
<state relative-caret-position="3870">
<caret line="283" column="43" lean-forward="false" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
@@ -1899,40 +1512,41 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Simulation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="52" column="52" lean-forward="true" selection-start-line="52" selection-start-column="52" selection-end-line="52" selection-end-column="52" />
<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>
<element signature="imports" expanded="true" />
<element signature="e#958#974#0" expanded="true" />
<element signature="e#1619#1620#0" expanded="true" />
<element signature="e#1656#1657#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="1245">
<caret line="83" column="31" lean-forward="false" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
<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="105">
<caret line="637" column="0" lean-forward="true" selection-start-line="637" selection-start-column="0" selection-end-line="637" selection-end-column="0" />
<state relative-caret-position="467">
<caret line="1223" column="30" lean-forward="true" selection-start-line="1223" selection-start-column="30" selection-end-line="1223" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14281#14282#0" expanded="true" />
<element signature="e#14331#14332#0" expanded="true" />
<element signature="e#14393#14394#0" expanded="true" />
<element signature="e#14447#14448#0" expanded="true" />
<element signature="e#14505#14506#0" expanded="true" />
<element signature="e#14555#14556#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Simulation.java">
<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="-70">
<caret line="17" column="33" lean-forward="true" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
<state relative-caret-position="643">
<caret line="190" column="43" lean-forward="false" selection-start-line="190" selection-start-column="43" selection-end-line="190" selection-end-column="43" />
<folding>
<element signature="e#1619#1620#0" expanded="true" />
<element signature="e#1656#1657#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>

4
src/main/java/com/henrypump/poc/POC.java
View File

@@ -80,8 +80,8 @@ public class POC implements Runnable{
String dbHostname = "localhost";
if (args.length > 3){
dbHostname = args[3];
if (args.length > 2){
dbHostname = args[2];
}
if (args.length == 1){

14
src/main/java/com/henrypump/poc/WebServer.java
View File

@@ -26,6 +26,7 @@ public class WebServer{
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
server.createContext("/command", new CommandHandler());
server.createContext("/config", new ConfigHandler());
server.createContext("/shake", new HandshakeHandler());
server.setExecutor(null); // creates a default executor
server.start();
}
@@ -182,6 +183,19 @@ public class WebServer{
os.close();
}
}
class HandshakeHandler implements HttpHandler {
@Override
public void handle(HttpExchange t) throws IOException {
JSONObject respJSON = new JSONObject();
respJSON.put("shake", "shook");
String response = respJSON.toJSONString();
t.sendResponseHeaders(200, response.getBytes().length);
OutputStream os = t.getResponseBody();
os.write(response.getBytes());
os.close();
}
}
}

56
src/main/java/com/henrypump/poc/Well.java
View File

@@ -27,13 +27,13 @@ import java.util.ArrayList;
*/
public class Well {
private String wellName;
protected Simulation sim;
protected Database db;
protected WellTest wellTest;
Simulation sim;
Database db;
WellTest wellTest;
/* IO */
AnalogIn inclinometer;
AnalogIn loadCell;
private AnalogIn inclinometer;
private AnalogIn loadCell;
private double currentSurfacePosition;
private double currentSurfaceLoad;
private double currentDownholePosition;
@@ -41,7 +41,7 @@ public class Well {
/* CARDS */
private Card currentCard;
public Card[] cardStorage = new Card[100];
Card[] cardStorage = new Card[100];
// CONSTANTS
private static double YM_STEEL = 30.5;
@@ -67,7 +67,6 @@ public class Well {
// CALCULATED TAPER PARAMETERS
private int nT1; // should always be equal to number of tapers + 1
private double frictionEstimate;
private double theoreticalMaxFluidLoad;
private double[] a = new double[11];
@@ -98,12 +97,12 @@ public class Well {
// Statuses
private volatile int runStatus;
public static final int RUNSTATUS_STOPPED = 0;
public static final int RUNSTATUS_STARTING = 1;
public static final int RUNSTATUS_RUNNING = 2;
public static final int RUNSTATUS_PUMPEDOFF = 3;
public static final int RUNSTATUS_FAULTED = 4;
public static final int RUNSTATUS_LOCKEDOUT = 5;
static final int RUNSTATUS_STOPPED = 0;
static final int RUNSTATUS_STARTING = 1;
static final int RUNSTATUS_RUNNING = 2;
static final int RUNSTATUS_PUMPEDOFF = 3;
static final int RUNSTATUS_FAULTED = 4;
static final int RUNSTATUS_LOCKEDOUT = 5;
private boolean permissiveOK;
private long strokesSinceStart = 0;
@@ -120,7 +119,7 @@ public class Well {
private int lastDirection = DIRECTION_UNKNOWN;
// MODES
private volatile int runMode;
private volatile int runMode = 0;
public static final int RUNMODE_POC = 0;
public static final int RUNMODE_MANUAL = 1;
public static final int RUNMODE_TIMER = 2;
@@ -410,6 +409,19 @@ public class Well {
return runMode;
}
public String getRunModeString(){
switch (runMode){
case RUNMODE_POC:
return "POC";
case RUNMODE_MANUAL:
return "MANUAL";
case RUNMODE_TIMER:
return "TIMER";
default:
return "UNKNOWN";
}
}
public double getCurrentSurfacePosition() {
return currentSurfacePosition;
}
@@ -681,6 +693,7 @@ public class Well {
Files.delete(toFile);
Files.move(fromFile, toFile);
}
updateTapers(true);
} catch (FileNotFoundException e) {
System.out.println("No configuration file found. Pulling latest value from database.");
@@ -734,11 +747,12 @@ public class Well {
Object newDampingFactor = taperObj.get("dampingFactor");
if (newDampingFactor != null) setDampingFactor(currentTaperNum, (Double) newDampingFactor);
}
updateTapers(false);
} catch (IOException | ParseException e) {
e.printStackTrace();
System.exit(3);
}
updateTapers();
}
@@ -814,8 +828,8 @@ public class Well {
};
private void updateTapers(){
nT1 = numTapers + 1;
private void updateTapers(boolean storeTapersInDB){
int nT1 = numTapers + 1;
// start by setting everything to 0
a[0] = 0.0;
@@ -902,8 +916,7 @@ public class Well {
frictionEstimate = dbFrictionEstimate;
}
db.storeWellSetup(this);
if (storeTapersInDB) db.storeWellSetup(this);
}
private double position(int p)
@@ -1057,8 +1070,7 @@ public class Well {
}
j++;
}
LPStatus downholeValues = new LPStatus(dPosition, dLoad, status);
return downholeValues;
return new LPStatus(dPosition, dLoad, status);
};
public void endOfStroke(){
@@ -1116,7 +1128,7 @@ public class Well {
}
public void gaugeOff(){
void gaugeOff(){
strokeSpeed.endOfDay();
downholeGrossStroke.endOfDay();
downholeNetStroke.endOfDay();

4
www/pocwww/pocwww/__init__.py
View File

@@ -159,5 +159,9 @@ def main(global_config, **settings):
config.add_route("json_updateconfig", "/json/updateconfig")
config.add_route("json_cmd_start", "/json/cmd/start")
config.add_route("json_cmd_stop", "/json/cmd/stop")
config.add_route("json_cmd_shake", "/json/cmd/shake")
config.scan()
return config.make_wsgi_app()

50
www/pocwww/pocwww/json.py
View File

@@ -1,6 +1,7 @@
from pyramid.view import view_config
from .view_helpers import *
from bson import json_util
import requests
# JSON
@@ -131,7 +132,7 @@ def json_updateconfig(request):
t_conv_to_float = ['length', 'diameter', 'dampingFactor']
jsb = request.json_body
new_config = {}
new_config['timestamp'] = datetime.now()
new_config['timestamp'] = datetime.utcnow()
new_config['storedBy'] = "web"
new_config['wellName'] = jsb['wellName']
new_config['tapers'] = []
@@ -147,4 +148,49 @@ def json_updateconfig(request):
result = request.db['wellConfiguration'].insert(new_config)
return {'new_config': request.json_body, 'stored_result': result}
addr_obj = list(request.db['pocConfiguration'].find({"_id": "pocIPAddress"}))
address = 'localhost'
if len(addr_obj) > 0:
address = addr_obj[0]['pocIPAddress']
update_url = "http://{}:8000/config?update=true".format(address)
r = requests.get(update_url)
pocCmdSts = "OK" if r.status_code == 200 else "failed"
return {'new_config': request.json_body, 'stored_result': result, 'updated': pocCmdSts}
@view_config(route_name="json_cmd_start", renderer="prettyjson")
def json_start(request):
addr_obj = list(request.db['pocConfiguration'].find({"_id": "pocIPAddress"}))
address = 'localhost'
if len(addr_obj) > 0:
address = addr_obj[0]['pocIPAddress']
start_url = "http://{}:8000/command?start=true".format(address)
r = requests.get(start_url)
return r.text if r.status_code == 200 else {"status": "failure sending command"}
@view_config(route_name="json_cmd_stop", renderer="prettyjson")
def json_stop(request):
addr_obj = list(request.db['pocConfiguration'].find({"_id": "pocIPAddress"}))
address = 'localhost'
if len(addr_obj) > 0:
address = addr_obj[0]['pocIPAddress']
stop_url = "http://{}:8000/command?stop=true".format(address)
r = requests.get(stop_url)
return r.text if r.status_code == 200 else {"status": "failure sending command"}
@view_config(route_name="json_cmd_shake", renderer="prettyjson")
def json_shake(request):
addr_obj = list(request.db['pocConfiguration'].find({"_id": "pocIPAddress"}))
address = 'localhost'
if len(addr_obj) > 0:
address = addr_obj[0]['pocIPAddress']
shake_url = "http://{}:8000/shake".format(address)
r = requests.get(shake_url)
return r.text if r.status_code == 200 else {"status": "failure sending command"}

27
www/pocwww/pocwww/templates/config.jinja2
View File

@@ -2,6 +2,7 @@
{% extends "layout.jinja2" %}
{% block content %}
<div class="content">
<div class="row">
<div class="col-xs-12">
@@ -88,10 +89,21 @@
</tbody>
</table>
<button id="add-row" class="btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Taper</button>
<hr />
<button id="submit" class="btn btn-default">Submit</button>
<div class="alert alert-success alert-dismissable hidden" id="update-success">
<span>
<p>Configuration successfully updated!</p>
</span>
</div>
<div class="alert alert-danger alert-dismissable hidden" id="update-failed">
<span>
<p>Failed to update configuration.</p>
</span>
</div>
<button id="submit" class="btn btn-default">Update Well Configuration</button><span id="update-result"></span>
</form>
</div>
</div>
</div>
@@ -106,12 +118,19 @@
}
});
function printOut(data){
function configUpdatedSuccessfully(data){
console.log(data);
if(data.stored_result){
$('#update-success').removeClass('hidden');
} else {
$('#update-failed').removeClass('hidden');
}
}
$("#submit").click(function(event){
event.preventDefault();
$('#update-success').addClass('hidden');
$('#update-failed').addClass('hidden');
var newObject = {};
newObject.wellName = $("#wellName").val();
newObject.deltaT = parseFloat($("#deltaT").val());
@@ -145,7 +164,7 @@
data: JSON.stringify(newObject),
contentType: "application/json; charset=utf-8",
url: "/json/updateconfig",
success: printOut
success: configUpdatedSuccessfully
});
})
</script>

13
www/pocwww/pocwww/templates/dashboard.jinja2
View File

@@ -65,11 +65,14 @@
</div>
<script>
$.ajax({
dataType: 'json',
url:"/json",
success: drawCards
});
function getCardData(){
$.ajax({
dataType: 'json',
url:"/json",
success: drawCards
});
};
getCardData();
$(function () {
$('[data-toggle="popover"]').popover({html: true})

55
www/pocwww/pocwww/templates/layout.jinja2
View File

@@ -53,7 +53,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Henry POC</a>
<a class="navbar-brand" href="/"><span id="shake-status"></span> | Henry POC</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
@@ -77,6 +77,8 @@
<h4><span id="runstatus"></span></h4>
<p>at</p>
<h5><span id="runstatustimestamp"></span></h5>
<button onclick="start()" class="btn btn-success">Start</button>
<button onclick="stop()" class="btn btn-danger">Stop</button>
</div>
<hr />
<ul class="nav nav-sidebar">
@@ -118,12 +120,53 @@ function setRunStatus(data){
var ts_date = new Date(Date.parse(data.runstatus.timestamp))
$("#runstatustimestamp").text(ts_date.toString());
}
function getRunStatus(){
$.ajax({
dataType: 'json',
url: "/json/runstatusnow",
success: setRunStatus
});
};
getRunStatus();
$.ajax({
dataType: 'json',
url: "/json/runstatusnow",
success: setRunStatus
});
function start(){
$.ajax({
dataType: 'json',
url: "/json/cmd/start",
success: getRunStatus
});
}
function stop(){
$.ajax({
dataType: 'json',
url: "/json/cmd/stop",
success: getRunStatus
});
}
function shakeOK(){
$('#shake-status').html('<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>')
}
function shakeFail(){
$('#shake-status').html('<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>')
}
function shake(){
$.ajax({
dataType: 'json',
url: "/json/cmd/shake",
success: shakeOK,
error: shakeFail
});
}
shake();
setInterval(function() {
getRunStatus();
shake();
}, 10000);
</script>

1
www/pocwww/setup.py
View File

@@ -14,6 +14,7 @@ requires = [
'pyramid_debugtoolbar',
'waitress',
'pymongo',
'requests'
]
tests_require = [