diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f3a7bd0..0b1fabf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,10 @@ + + - + @@ -107,11 +109,11 @@ - + - - + + @@ -182,11 +184,11 @@ - + - - + + @@ -623,10 +625,10 @@ @@ -1399,16 +1401,6 @@ - - - - - - - - - - @@ -1419,8 +1411,18 @@ - - + + + + + + + + + + + + diff --git a/src/main/java/com/henrypump/poc/Database.java b/src/main/java/com/henrypump/poc/Database.java index e578866..046b9f6 100644 --- a/src/main/java/com/henrypump/poc/Database.java +++ b/src/main/java/com/henrypump/poc/Database.java @@ -230,7 +230,7 @@ public class Database { Document doc = new Document("status", runStatus) .append("initiator", initiator) - .append("timesstamp", Date.from(ZonedDateTime.now().toInstant())); + .append("timestamp", Date.from(ZonedDateTime.now().toInstant())); collection.insertOne(doc); return collection.count(); } diff --git a/src/main/java/com/henrypump/poc/Well.java b/src/main/java/com/henrypump/poc/Well.java index 974f8e1..3aec298 100644 --- a/src/main/java/com/henrypump/poc/Well.java +++ b/src/main/java/com/henrypump/poc/Well.java @@ -1017,6 +1017,7 @@ public class Well { pointCounter = -1; if (strokesSinceStart > startupStrokes){ runStatus = RUNSTATUS_RUNNING; + db.newRunStatus("Running", "startup"); } if (runStatus == RUNSTATUS_RUNNING) { diff --git a/www/pocwww/pocwww/__init__.py b/www/pocwww/pocwww/__init__.py index a4d05ef..86df0a9 100644 --- a/www/pocwww/pocwww/__init__.py +++ b/www/pocwww/pocwww/__init__.py @@ -137,8 +137,12 @@ def main(global_config, **settings): config.add_route('welltests_all', '/welltests') config.add_route('json_welltests_all', '/json/welltests') + config.add_route('runstatus', '/runstatus') + config.add_route('json_runstatus', '/json/runstatus') + # JSON-ONLY ROUTES config.add_route('json_lastcard', "/json/lastcard") + config.add_route('json_runstatusnow', "/json/runstatusnow") config.add_route('json_valuesbetween_wparams', "/json/values/between/{startdt}/{enddt}") config.add_route('json_valuesbetween', "/json/values/between") diff --git a/www/pocwww/pocwww/json.py b/www/pocwww/pocwww/json.py index 6befa9b..e8991cc 100644 --- a/www/pocwww/pocwww/json.py +++ b/www/pocwww/pocwww/json.py @@ -102,3 +102,14 @@ def json_singlevaluedaterange(request): }} ]))[0] return {'first_date': date_limits['first'], 'last_date': date_limits['last']} + + +@view_config(route_name="json_runstatusnow", renderer="prettyjson") +def json_runstatusnow(request): + status = False + try: + status = list(request.db['runStatus'].find().sort("timestamp", -1).limit(1))[0] + except IndexError: + pass + + return {'runstatus': status} diff --git a/www/pocwww/pocwww/templates/layout.jinja2 b/www/pocwww/pocwww/templates/layout.jinja2 index ccc498a..92c3afd 100644 --- a/www/pocwww/pocwww/templates/layout.jinja2 +++ b/www/pocwww/pocwww/templates/layout.jinja2 @@ -61,6 +61,8 @@
  • Cards
  • Values
  • Gauge-Off
    • +
  • Fluid Shots
    • +
  • Well Tests
  • Configuration
    • @@ -70,6 +72,11 @@
    +

    Run Status

    +

    +
    at
    +
    History
    +
    • Dashboard
    • Cards
      • @@ -102,4 +109,19 @@ ================================================== --> + + diff --git a/www/pocwww/pocwww/templates/runstatus.jinja2 b/www/pocwww/pocwww/templates/runstatus.jinja2 new file mode 100644 index 0000000..a164774 --- /dev/null +++ b/www/pocwww/pocwww/templates/runstatus.jinja2 @@ -0,0 +1,35 @@ +{% extends "layout.jinja2" %} + +{% block content %} +
      +
      +
      +

      Run Status Log

      + {% if data|length > 0 %} +
      + + + + + + + + + + {% for d in data %} + + + + + + {% endfor %} + +
      TimestampStatusInitiator
      {{d.timestamp | datetime('medium')}}{{d.status}}{{d.initiator}}
      +
      + {% else %} +

      No fluid shots yet...

      + {% endif %} +
      +
      +
      +{% endblock content %} diff --git a/www/pocwww/pocwww/views.py b/www/pocwww/pocwww/views.py index f011534..d771010 100644 --- a/www/pocwww/pocwww/views.py +++ b/www/pocwww/pocwww/views.py @@ -113,3 +113,10 @@ def fluidshots_all(request): def welltests_all(request): welltests = list(request.db['wellTests'].find()) return {'navgroup': 'welltests', 'data': welltests} + + +@view_config(route_name="runstatus", renderer="templates/runstatus.jinja2") +@view_config(route_name="json_runstatus", renderer="prettyjson") +def welltests_all(request): + runStatuses = list(request.db['runStatus'].find()) + return {'navgroup': 'runstatus', 'data': runStatuses}