From 959b01aff57194b0535ef76876ca3a661af5ec83 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Wed, 30 Nov 2016 12:48:06 -0600 Subject: [PATCH] Completes POCONSOLE-71 for card CSV downloads --- app/datalogger/views.py | 27 +++++++++++++++++++++++++++ app/static/js/cards.controller.js | 2 +- app/static/templates/card.html | 2 +- app/static/templates/cardlist.html | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/datalogger/views.py b/app/datalogger/views.py index ab69aa8..7575291 100644 --- a/app/datalogger/views.py +++ b/app/datalogger/views.py @@ -176,3 +176,30 @@ def get_tags_at_time(datetime): @app.route('/api/today_totals') def today_totals(): return jsonify(getTotals()) + + +@app.route('/api/csv_stroke/') +def get_csv_for_stroke(stroke_number): + """returns a CSV of the given stroke""" + res = Card.query.filter(Card._id == stroke_number).one() + res.surf_pos = json.loads(res.surf_pos) + res.surf_lod = json.loads(res.surf_lod) + res.down_pos = json.loads(res.down_pos) + res.down_lod = json.loads(res.down_lod) + nl = "\n" + csv_string = "" + csv_string += "Card_ID,{}".format(res._id) + nl + csv_string += "datetime,{}".format(res.created_on) + nl + csv_string += nl + csv_string += "Surface Position,Surface Load" + nl + for i in range(0, len(res.surf_pos)): + csv_string += "{},{}".format(res.surf_pos[i], res.surf_lod[i]) + nl + csv_string += nl + csv_string += "Downhole Position, Downhole Load" + nl + for i in range(0, len(res.down_pos)): + csv_string += "{},{}".format(res.down_pos[i], res.down_lod[i]) + nl + return Response( + csv_string, + mimetype="text/csv", + headers={"Content-disposition": + "attachment; filename=card_{}.csv".format(res._id)}) diff --git a/app/static/js/cards.controller.js b/app/static/js/cards.controller.js index 5b0d104..a066cf5 100644 --- a/app/static/js/cards.controller.js +++ b/app/static/js/cards.controller.js @@ -29,7 +29,7 @@ poconsole.controller('cardListCtrl', function($scope, $routeParams, Card, Page) for(var j = 0; j < d.cards.length; j++){ d.cards[j].created_on = Date.create(d.cards[j].created_on); } - $scope.cards = d.cards.reverse(); + $scope.cards = d.cards; $scope.num_pages = d.num_pages; $scope.per_page = d.per_page; $scope.page_list = []; diff --git a/app/static/templates/card.html b/app/static/templates/card.html index 1771ebd..78b2e58 100644 --- a/app/static/templates/card.html +++ b/app/static/templates/card.html @@ -15,7 +15,7 @@
<< Prev. Card Next Card >>
diff --git a/app/static/templates/cardlist.html b/app/static/templates/cardlist.html index a350dc2..3e74641 100644 --- a/app/static/templates/cardlist.html +++ b/app/static/templates/cardlist.html @@ -37,7 +37,7 @@ {{card.created_on | date: "medium"}}
{{card.stroke_type}}
- Download CSV + Download CSV