nmelone/www-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70 Commits 5 Branches 0 Tags
00109d4c39f261bbfcb1ef915fc26c59e79728f4
Commit Graph

70 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick McDonagh
00109d4c39 Merged in POCONSOLE-25-Flask (pull request #1) 
POCONSOLE-25 flask
 2016-11-21 23:32:55 +00:00
Patrick McDonagh
80378a8027 Completes POCONSOLE-47. Adds fluid shot page and latest stroke page 2016-11-21 17:28:01 -06:00
Patrick McDonagh
5456dca799 Completes POCONSOLE-50. Puts finishing touches on daily total page 2016-11-18 18:36:43 -06:00
Patrick McDonagh
a9e9a28989 just kidding, it was working. adds a totals page 2016-11-18 18:11:22 -06:00
Patrick McDonagh
c12f78f66e adds basic, non-working get Totals 2016-11-18 17:48:46 -06:00
Patrick McDonagh
d664c50064 reorganizes files to be more pythonic 2016-11-18 16:58:43 -06:00
Patrick McDonagh
2e43c5ff12 Refactors controllers and factories to return a variable. Enables angular pagination. 2016-11-18 13:51:00 -06:00
Patrick McDonagh
4ab0ccaa1a Fixes tests to add a valid card type, fixes well test verbiage, converts card type from button label 2016-11-17 16:48:04 -06:00
Patrick McDonagh
19738f489f Added requirements.txt for reals this time 2016-11-17 14:56:03 -06:00
Patrick McDonagh
4be1ca25d5 removes node JS files and adds a requirements.txt 2016-11-17 14:39:56 -06:00
Patrick McDonagh
fdd70d3bc7 fixes for empty returns 2016-11-17 14:28:20 -06:00
Patrick McDonagh
b6b8de4893 Completes POCONSOLE-48. Notes page working. 2016-11-16 16:39:29 -06:00
Patrick McDonagh
a3d8b3c95e Completes POCONSOLE-46. Events page working. Need to link event data to tag data 2016-11-16 15:53:47 -06:00
Patrick McDonagh
6f1aedd13d Completes POCONSOLE-46. Well Test entry, edit, and deletion are working. 2016-11-16 15:03:52 -06:00
Patrick McDonagh
891458543a Completes POCONSOLE-46. completes well test page 2016-11-15 17:48:05 -06:00
Patrick McDonagh
cbf3a1b21a Completes initial work on POCONSOLE-44. Adds table for gauge-off data. Still need to add customizable graphs 2016-11-15 16:32:09 -06:00
Patrick McDonagh
84172800de Fixes dates and date parameters for cards 2016-11-15 11:12:02 -06:00
Patrick McDonagh
2a0fbd76c5 Completes POCONSOLE-40 and POCONSOLE-41. Retrieves cards and data associated with cards 2016-11-14 18:55:10 -06:00
Patrick McDonagh
4739bc2a37 adds database tests, removes some models that don't need to be in the database 2016-11-11 17:42:41 -06:00
Patrick McDonagh
9092e1b1ad Adds flask files. Completes POCONSOLE-64 by creating all models 2016-11-10 21:47:16 -06:00
Patrick McDonagh
427ec4f71f Upped ORM and PubSub time 2016-08-05 15:58:48 -05:00
Patrick McDonagh
5c1d4304c3 Completes POCONSOLE-45 and POCONSOLE-46, Events and Well Tests 2016-06-28 15:36:00 -05:00
Patrick McDonagh
579cc03cef Updated gitignore to not track .remote-sync.json 2016-06-23 12:39:25 -05:00
Patrick McDonagh
d78eb48cda POCONSOLE-51 forces HTTPS/SSL using CACert 2016-06-22 11:57:10 -05:00
Patrick McDonagh
0ed709eea5 Fixes POCONSOLE-52. Changes ORM/pubsub timeout from 20 seconds to 60 seconds 2016-06-22 11:55:56 -05:00
Patrick McDonagh
f9f4b59c5e Starting POCONSOLE-45 for Events Page 2016-06-15 17:41:44 -05:00
Patrick McDonagh
e95c72d406 Missing some files for POCONSOLE-44 2016-06-15 17:41:13 -05:00
Patrick McDonagh
fa9c2925b5 Completes POCONSOLE-44. Gauge off Page working 2016-06-15 17:40:06 -05:00
Patrick McDonagh
3c4f63faeb Removes leftover file storage objects 2016-06-15 17:38:53 -05:00
Patrick McDonagh
55df6ed212 Fixes broken link on Card page 2016-06-14 19:16:39 -05:00
Patrick McDonagh
7917a24b74 more work on gauge-off page 2016-06-14 19:09:50 -05:00
Patrick McDonagh
948bd18881 started gauge off page 2016-06-09 13:37:54 -05:00
Patrick McDonagh
67139b4a07 File List fixes 2016-06-08 17:29:12 -05:00
Patrick McDonagh
55d0a0e036 Fixes POCONSOLE-43, card screens working 2016-06-08 16:53:01 -05:00
Patrick McDonagh
bc35d73da0 fixes seed data 2016-06-08 12:46:28 -05:00
Patrick McDonagh
6b87f541b2 Fixes typo in card structure 2016-06-08 12:29:16 -05:00
Patrick McDonagh
2449fbe9b7 Split old controllers into separate files, began working on dashboard 2016-06-07 19:12:01 -05:00
Patrick McDonagh
8add45cc1b Seeding for tags updated 2016-06-06 16:39:59 -05:00
Patrick McDonagh
86f6fb129f added sails files, controllers/models for POConsole data 2016-05-06 16:37:59 -05:00
Patrick McDonagh
1ca2291f31 Fixed SQL query to get tag values at time 2016-04-21 15:13:12 -05:00
Patrick McDonagh
45d99d1465 Start working on updating www to work with new db setup 2016-04-21 09:34:11 -05:00
Patrick McDonagh
b3713541ef Fixed tag query 2016-04-18 09:36:59 -05:00
Patrick McDonagh
019f4db1e8 Converted controllers.js to controllers.coffee 2016-04-04 17:49:14 -05:00
Patrick McDonagh
9b1c9011d3 Duplicated json_sqlite.coffee to json_mysql.coffee 2016-03-31 17:36:24 -05:00
Patrick McDonagh
f187fd7739 Add d3 to npm packages installed 2016-03-31 15:23:15 -05:00
Patrick McDonagh
49c223de61 Merge pull request #2 in POCONSOLE/www from feature/POC-67-show-well-timelines-in-web-view to master 
* commit 'be830d953125dd7f627e4a582c334f7160644afe':
  Added run status for previous 24 hours
  Added StatusBetween function
 2016-03-31 19:54:02 +00:00
Patrick McDonagh
be830d9531 Added run status for previous 24 hours 2016-03-31 14:53:01 -05:00
Patrick McDonagh
772bf1ea8c Added StatusBetween function 2016-03-31 12:06:00 -05:00
Patrick McDonagh
edf73c81fc fixed tag writing 2016-03-29 21:43:54 -05:00
Patrick McDonagh
f923f8f9a1 Merge pull request #1 in POCONSOLE/www from feature/POC-70-update-poconsole-functions-to-read to master 
* commit '6852b31793641a4005ea3603dc4cdd68715bd9b5':
  Fixed tag value searching
  re-fixed file list
  Fixed file list display
  Cards and tag values are showing up on the card overview screen, but the tag data doesn't seem correct
  Dashboard works, but cards still need a bit of work
  Started getting website working with new API data
  Switching server-side scripts over to coffeescript
  bower setup file
  Bower works now!
  Updated everything to coffeescript and fixed functions for database
  Syntax fixes
 2016-03-29 21:48:05 +00:00