fixed deviation time

NMBGMR · Sep 14, 2018 · b8c9802 · b8c9802
1 parent d4f935a
commit b8c9802
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/wellpy/model.py b/wellpy/model.py
@@ -258,7 +258,9 @@ def _calculate_deviations(self, mxs, mys, cxs, cys):
             idx = where(cxs - mx < 60)[0]
             if idx.size:
                 idx = idx[-1]
-                dev = Deviation(idx=midx, time_s=int(idx), manual=my, continuous=cys[idx])
+                dev = Deviation(idx=midx, time_s=int(idx),
+                                timestamp=datetime.fromtimestamp(mx).strftime('%m/%d/%Y'),
+                                manual=my, continuous=cys[idx])
                 devs.append(dev)
 
         self.deviations = devs

diff --git a/wellpy/tasks/panes.py b/wellpy/tasks/panes.py
@@ -170,7 +170,7 @@ def traits_view(self):
 
 
 class DeviationAdapter(TabularAdapter):
-    columns = [('Time', 'time_s'),
+    columns = [('Time', 'timestamp'),
                ('Manual Index', 'idx'),
                ('Deviation', 'deviation'),
                ('Manual', 'manual'),