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

adds well tests and fluid shots

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-23 13:04:43 -06:00
parent a90422b7bd
commit b943c99301
7 changed files with 160 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
.idea/workspace.xml generated
View File

@@ -2,14 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment=""> <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradletasknamecache" afterPath="$PROJECT_DIR$/.gradletasknamecache" /> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/gaugeoff_all.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/gaugeoff_all.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" /> <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$/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$/www/pocwww/pocwww/views.py" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.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/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/valuesall.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/valuesall.jinja2" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -94,7 +90,7 @@
<file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373"> <state relative-caret-position="480">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" /> <caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
<folding /> <folding />
</state> </state>
@@ -105,33 +101,19 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585"> <state relative-caret-position="585">
<caret line="39" column="66" lean-forward="true" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" /> <caret line="39" column="66" lean-forward="false" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Well.java" pinned="false" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5310"> <state relative-caret-position="0">
<caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" /> <caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#14530#14531#0" expanded="true" />
<element signature="e#14570#14571#0" expanded="true" />
<element signature="e#14617#14618#0" expanded="true" />
<element signature="e#14653#14654#0" expanded="true" />
<element signature="e#14697#14698#0" expanded="true" />
<element signature="e#14739#14740#0" expanded="true" />
<element signature="e#14792#14793#0" expanded="true" />
<element signature="e#14841#14842#0" expanded="true" />
<element signature="e#15039#15040#0" expanded="true" />
<element signature="e#15076#15077#0" expanded="true" />
<element signature="e#15133#15134#0" expanded="true" />
<element signature="e#15185#15186#0" expanded="true" />
<element signature="e#15232#15233#0" expanded="true" />
<element signature="e#15277#15278#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -140,7 +122,7 @@
<file leaf-file-name="CLScanner.java" pinned="false" current-in-tab="false"> <file leaf-file-name="CLScanner.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="-735">
<caret line="32" column="8" lean-forward="false" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="64" /> <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 /> <folding />
</state> </state>
@@ -161,7 +143,7 @@
<entry file="file://$PROJECT_DIR$/startup.sh"> <entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <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 /> <folding />
</state> </state>
</provider> </provider>
@@ -170,7 +152,7 @@
<file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508"> <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" /> <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 /> <folding />
</state> </state>
@@ -180,8 +162,8 @@
<file leaf-file-name="Card.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Card.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-690"> <state relative-caret-position="675">
<caret line="52" column="41" lean-forward="true" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" /> <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 />
</state> </state>
</provider> </provider>
@@ -200,11 +182,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Database.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="733"> <state relative-caret-position="1029">
<caret line="230" column="56" lean-forward="true" selection-start-line="230" selection-start-column="56" selection-end-line="230" selection-end-column="56" /> <caret line="194" column="55" lean-forward="false" selection-start-line="194" selection-start-column="55" selection-end-line="194" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@@ -660,10 +642,10 @@
<treeState /> <treeState />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="3600" /> <option name="x" value="30" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1920" /> <option name="width" value="1362" />
<option name="height" value="1057" /> <option name="height" value="918" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
@@ -1011,7 +993,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="3600" y="23" width="1920" height="1057" extended-state="6" /> <frame x="30" y="23" width="1362" height="918" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <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="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" />
@@ -1022,8 +1004,8 @@
<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="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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11303345" 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="false" show_stripe_button="true" weight="0.11303345" 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="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" /> <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" />
<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="Properties" 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="6" side_tool="false" content_ui="tabs" /> <window_info id="Properties" 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="6" side_tool="false" content_ui="tabs" />
<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="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="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" />
@@ -1034,8 +1016,8 @@
<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" /> <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" />
<window_info id="UI 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="5" side_tool="false" content_ui="tabs" /> <window_info id="UI 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" 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="8" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" 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="8" side_tool="false" content_ui="tabs" />
<window_info id="Debug" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
<window_info id="Debug" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="1" side_tool="false" content_ui="tabs" /> <window_info id="Message" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1104,20 +1086,6 @@
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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="true" /> <element signature="imports" expanded="true" />
<element signature="e#14530#14531#0" expanded="true" />
<element signature="e#14570#14571#0" expanded="true" />
<element signature="e#14617#14618#0" expanded="true" />
<element signature="e#14653#14654#0" expanded="true" />
<element signature="e#14697#14698#0" expanded="true" />
<element signature="e#14739#14740#0" expanded="true" />
<element signature="e#14792#14793#0" expanded="true" />
<element signature="e#14841#14842#0" expanded="true" />
<element signature="e#15039#15040#0" expanded="true" />
<element signature="e#15076#15077#0" expanded="true" />
<element signature="e#15133#15134#0" expanded="true" />
<element signature="e#15185#15186#0" expanded="true" />
<element signature="e#15232#15233#0" expanded="true" />
<element signature="e#15277#15278#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -1173,20 +1141,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" /> <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> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#14530#14531#0" expanded="true" />
<element signature="e#14570#14571#0" expanded="true" />
<element signature="e#14617#14618#0" expanded="true" />
<element signature="e#14653#14654#0" expanded="true" />
<element signature="e#14697#14698#0" expanded="true" />
<element signature="e#14739#14740#0" expanded="true" />
<element signature="e#14792#14793#0" expanded="true" />
<element signature="e#14841#14842#0" expanded="true" />
<element signature="e#15039#15040#0" expanded="true" />
<element signature="e#15076#15077#0" expanded="true" />
<element signature="e#15133#15134#0" expanded="true" />
<element signature="e#15185#15186#0" expanded="true" />
<element signature="e#15232#15233#0" expanded="true" />
<element signature="e#15277#15278#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -1205,9 +1159,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" /> <caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1322,20 +1273,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DailyTotal.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DailyTotal.java" />
<entry file="file://$PROJECT_DIR$/poc-java.iml" /> <entry file="file://$PROJECT_DIR$/poc-java.iml" />
<entry file="file://$USER_HOME$/Desktop/new.pas"> <entry file="file://$USER_HOME$/Desktop/new.pas" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$USER_HOME$/Desktop/old.pas" />
<state relative-caret-position="0">
<caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/old.pas">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle"> <entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@@ -1347,9 +1286,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675"> <state relative-caret-position="675">
<caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" /> <caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1365,9 +1301,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="525">
<caret line="39" column="5" lean-forward="false" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" /> <caret line="39" column="5" lean-forward="false" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1397,7 +1330,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
<caret line="1" column="35" lean-forward="false" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" /> <caret line="1" column="35" lean-forward="false" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1405,13 +1337,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
<caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" /> <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508"> <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" /> <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 /> <folding />
</state> </state>
@@ -1430,38 +1361,20 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-690"> <state relative-caret-position="675">
<caret line="52" column="41" lean-forward="true" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" /> <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 />
</state> </state>
</provider> </provider>
</entry> </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="733">
<caret line="230" column="56" lean-forward="true" selection-start-line="230" selection-start-column="56" selection-end-line="230" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373"> <state relative-caret-position="480">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" /> <caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<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>
<entry file="file://$PROJECT_DIR$/poc.service.txt"> <entry file="file://$PROJECT_DIR$/poc.service.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
@@ -1473,7 +1386,7 @@
<entry file="file://$PROJECT_DIR$/startup.sh"> <entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <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 /> <folding />
</state> </state>
</provider> </provider>
@@ -1481,31 +1394,35 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585"> <state relative-caret-position="585">
<caret line="39" column="66" lean-forward="true" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" /> <caret line="39" column="66" lean-forward="false" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5310"> <state relative-caret-position="0">
<caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" /> <caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-735">
<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>
<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="1029">
<caret line="194" column="55" lean-forward="false" selection-start-line="194" selection-start-column="55" selection-end-line="194" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#14530#14531#0" expanded="true" />
<element signature="e#14570#14571#0" expanded="true" />
<element signature="e#14617#14618#0" expanded="true" />
<element signature="e#14653#14654#0" expanded="true" />
<element signature="e#14697#14698#0" expanded="true" />
<element signature="e#14739#14740#0" expanded="true" />
<element signature="e#14792#14793#0" expanded="true" />
<element signature="e#14841#14842#0" expanded="true" />
<element signature="e#15039#15040#0" expanded="true" />
<element signature="e#15076#15077#0" expanded="true" />
<element signature="e#15133#15134#0" expanded="true" />
<element signature="e#15185#15186#0" expanded="true" />
<element signature="e#15232#15233#0" expanded="true" />
<element signature="e#15277#15278#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

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

@@ -70,6 +70,7 @@ def pagination_adapter(obj, request):
} }
return p return p
def main(global_config, **settings): def main(global_config, **settings):
""" This function returns a Pyramid WSGI application. """ This function returns a Pyramid WSGI application.
""" """
@@ -130,6 +131,12 @@ def main(global_config, **settings):
config.add_route('gaugeoff_all', '/gaugeoff') config.add_route('gaugeoff_all', '/gaugeoff')
config.add_route('json_gaugeoff_all', '/json/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')
# JSON-ONLY ROUTES # JSON-ONLY ROUTES
config.add_route('json_lastcard', "/json/lastcard") config.add_route('json_lastcard', "/json/lastcard")

37
www/pocwww/pocwww/templates/fluidshots.jinja2 Normal file
View File

@@ -0,0 +1,37 @@
{% extends "layout.jinja2" %}
{% block content %}
<div class="content">
<div class="row">
<div class="col-xs-12">
<h2>Fluid Shots</h2>
{% if data|length > 0 %}
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Timestamp</th>
<th>Fluid Level</th>
<th>Pump Intake Pressure</th>
<th>Friction Estimate</th>
</tr>
</thead>
<tbody>
{% for d in data %}
<tr>
<td>{{d.timestamp | datetime('medium')}}</td>
<td>{{d.fluidLevel | round(3)}}</td>
<td>{{d.pumpIntakePressure | round(3)}}</td>
<td>{{d.frictionEstimate | round(3)}}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<h3>No fluid shots yet...</h3>
{% endif %}
</div>
</div>
</div>
{% endblock content %}

1
www/pocwww/pocwww/templates/gaugeoff_all.jinja2
View File

@@ -40,5 +40,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="{{request.static_url('pocwww:static/graphs.js')}}"></script>
{% endblock content %} {% endblock content %}

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

@@ -77,8 +77,8 @@
<li {% if (navgroup == 'gaugeoff') %}class="active"{% endif %}><a href="/gaugeoff">Gauge-Off</a></li> <li {% if (navgroup == 'gaugeoff') %}class="active"{% endif %}><a href="/gaugeoff">Gauge-Off</a></li>
</ul> </ul>
<ul class="nav nav-sidebar"> <ul class="nav nav-sidebar">
<li><a href="/fluidshots">Fluid Shots</a></li> <li {% if (navgroup == 'fluidshots') %}class="active"{% endif %}><a href="/fluidshots">Fluid Shots</a></li>
<li><a href="/welltests">Well Tests</a></li> <li {% if (navgroup == 'welltests') %}class="active"{% endif %}><a href="/welltests">Well Tests</a></li>
</ul> </ul>
{% block card_dates %} {% block card_dates %}

49
www/pocwww/pocwww/templates/welltests.jinja2 Normal file
View File

@@ -0,0 +1,49 @@
{% extends "layout.jinja2" %}
{% block content %}
<div class="content">
<div class="row">
<div class="col-xs-12">
<h2>Well Tests</h2>
{% if data|length > 0 %}
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Test Start</th>
<th>Test Hours</th>
<th>Total BBL</th>
<th>Oil BBL</th>
<th>Water BBL</th>
<th>Gas MCF</th>
<th>kFactor</th>
<th>Oil Ratio</th>
<th>Water Ratio</th>
<th>Gas Ratio</th>
</tr>
</thead>
<tbody>
{% for d in data %}
<tr>
<td>{{d.testStartTime | datetime('medium')}}</td>
<td>{{d.testHours}}</td>
<td>{{d.testTotalBBL | round(3)}}</td>
<td>{{d.testOilBBL | round(3)}}</td>
<td>{{d.testWaterBBL | round(3)}}</td>
<td>{{d.testGasMCF | round(3)}}</td>
<td>{{d.kFactor | round(3)}}</td>
<td>{{d.oilRatio | round(3)}}</td>
<td>{{d.waterRatio | round(3)}}</td>
<td>{{d.gasMCFRatio | round(3)}}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<h3>No Well Tests yet...</h3>
{% endif %}
</div>
</div>
</div>
{% endblock content %}

14
www/pocwww/pocwww/views.py
View File

@@ -99,3 +99,17 @@ def gaugeoff_all(request):
newGO['tags'][d['tags'][i]['name']] = newTagObj newGO['tags'][d['tags'][i]['name']] = newTagObj
gaugeoff_list.append(newGO) gaugeoff_list.append(newGO)
return {'navgroup': 'gaugeoff', 'data': gaugeoff_list} return {'navgroup': 'gaugeoff', 'data': gaugeoff_list}
@view_config(route_name="fluidshots_all", renderer="templates/fluidshots.jinja2")
@view_config(route_name="json_fluidshots_all", renderer="prettyjson")
def fluidshots_all(request):
fluidshots = list(request.db['fluidShots'].find())
return {'navgroup': 'fluidshots', 'data': fluidshots}
@view_config(route_name="welltests_all", renderer="templates/welltests.jinja2")
@view_config(route_name="json_welltests_all", renderer="prettyjson")
def welltests_all(request):
welltests = list(request.db['wellTests'].find())
return {'navgroup': 'welltests', 'data': welltests}