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

Commit Graph

  • c8c7e4d59c Adds Webserver service master Patrick McDonagh 2017-05-25 15:05:28 -05:00
  • 4a8d440bae Adds more detail to README, adds service_identity module to pip requirements Patrick McDonagh 2017-02-09 16:38:39 -06:00
  • 18bc2937b5 README.md edited online with Bitbucket Patrick McDonagh 2017-02-07 20:02:33 +00:00
  • aef753a3e8 README.md edited online with Bitbucket Patrick McDonagh 2017-02-07 20:01:19 +00:00
  • 53ddf5fab4 Initial framework for Pyramid POCONSOLE-80-pyramid Patrick McDonagh 2016-12-07 15:02:18 -06:00
  • e751540ee6 Final fix for POCONSOLE-78 Patrick McDonagh 2016-12-06 17:34:52 -06:00
  • 4305685acb force adding /root/www to python path before running Patrick McDonagh 2016-12-06 17:15:41 -06:00
  • cf49309391 Moves files around POCONSOLE-79-python-package Patrick McDonagh 2016-12-06 17:13:15 -06:00
  • b0b964c45a also install hp_webserver.datalogger Patrick McDonagh 2016-12-06 16:39:33 -06:00
  • 5de541fc59 fix package importing for __init__.py Patrick McDonagh 2016-12-06 16:33:56 -06:00
  • 43f9ed378b changes app folder to hp_webserver to match package name Patrick McDonagh 2016-12-06 16:26:44 -06:00
  • a4d078bfa4 Ignores virtual environment files, adds twisted to requirements.txt Patrick McDonagh 2016-12-06 12:17:00 -06:00
  • 81dac8a3a9 Completes POCONSOLE-78 Patrick McDonagh 2016-12-06 12:16:33 -06:00
  • de078584de Fix for POCONSOLE-78. Alters tag factory to get correct local date time Patrick McDonagh 2016-12-06 11:08:21 -06:00
  • a38fd4076f Ignore database.db Patrick McDonagh 2016-12-05 19:19:31 -06:00
  • 5d39a2d327 Fixes restarting of datalogger from website Patrick McDonagh 2016-12-05 17:15:24 -06:00
  • b3e297f26b Should complete POCONSOLE-77 for reading datalogger status and restarting Patrick McDonagh 2016-12-05 16:46:48 -06:00
  • f8a0345c3a Needed to update the start script too Patrick McDonagh 2016-12-05 12:41:06 -06:00
  • b29e1a2b23 Renames file to align with script purpose Patrick McDonagh 2016-12-05 12:26:46 -06:00
  • ad72c83b2f Seed data was missing device_id Patrick McDonagh 2016-12-02 18:36:54 -06:00
  • 315fa9cd8b Completes POCONSOLE-75. adds seed data for default parameters, pagination for backup and restore values Patrick McDonagh 2016-12-02 18:32:22 -06:00
  • 47bb707c1a Fixes a typo in backup_restore.factory.js Patrick McDonagh 2016-12-02 17:48:24 -06:00
  • 7bc6337983 more verbose output for setupdb Patrick McDonagh 2016-12-02 17:38:26 -06:00
  • 51355bc3a3 Changes setupdb.py to allow database creation/updating without seeding data. Patrick McDonagh 2016-12-02 17:37:13 -06:00
  • 7272d0bbf9 More work on POCONSOLE-75. Should be able to backup and restore from PLC Patrick McDonagh 2016-12-02 17:35:52 -06:00
  • 0dfde36eff More work on POCONSOLE-75. Adds Templates for Backup and Restore Patrick McDonagh 2016-12-02 13:57:00 -06:00
  • 9be2903bea Adding gaugeoff.html back in with correct filename Patrick McDonagh 2016-12-02 13:39:08 -06:00
  • ad16b4d31f removing gaugeOff.html to change file name Patrick McDonagh 2016-12-02 13:36:03 -06:00
  • 03bb7ec20c Continuing work on POCONSOLE-75. Restore function written, but not tested. Patrick McDonagh 2016-12-02 11:36:55 -06:00
  • 8b5a89a851 Starts work on POCONSOLE-75 for Backup and Restore of PLC values Patrick McDonagh 2016-12-01 19:10:09 -06:00
  • 680e0f9c19 Removes logging to the console and fixes card id issues for multiple card analysis Patrick McDonagh 2016-11-30 18:14:54 -06:00
  • 68f0007055 Completes POCONSOLE-67. Users can now compare multiple cards. Patrick McDonagh 2016-11-30 16:44:49 -06:00
  • 959b01aff5 Completes POCONSOLE-71 for card CSV downloads Patrick McDonagh 2016-11-30 12:48:06 -06:00
  • 759f478f21 fixes to comply with PEP8 Patrick McDonagh 2016-11-30 11:04:31 -06:00
  • c7bedf9653 fixes card ordering so pages are latest to earliest Patrick McDonagh 2016-11-30 10:10:28 -06:00
  • 92ef84bc0b Completes POCONSOLE-69. Adds gauge-off graphing. Also fixes Tag graphs to allow for showing/hiding tags Patrick McDonagh 2016-11-30 09:55:30 -06:00
  • 446162cfd4 Completes POCONSOLE-73. Adds renew_certs.sh which will regenerate and move ssl certificates Patrick McDonagh 2016-11-28 16:16:17 -06:00
  • fbfa9eb91a Completes POCONSOLE-70. finishes startup scripts for twisted production server Patrick McDonagh 2016-11-22 14:41:42 -06:00
  • 670b9a4191 don't need to write a log file Patrick McDonagh 2016-11-22 12:41:52 -06:00
  • f4d31bda6a adds init script Patrick McDonagh 2016-11-22 12:34:31 -06:00
  • 3759bb3d4a adds start and stop scripts for using with Twisted Patrick McDonagh 2016-11-22 12:18:04 -06:00
  • 00109d4c39 Merged in POCONSOLE-25-Flask (pull request #1) Patrick McDonagh 2016-11-21 23:32:55 +00:00
  • 80378a8027 Completes POCONSOLE-47. Adds fluid shot page and latest stroke page Patrick McDonagh 2016-11-21 17:28:01 -06:00
  • 5456dca799 Completes POCONSOLE-50. Puts finishing touches on daily total page Patrick McDonagh 2016-11-18 18:36:43 -06:00
  • a9e9a28989 just kidding, it was working. adds a totals page Patrick McDonagh 2016-11-18 18:11:22 -06:00
  • c12f78f66e adds basic, non-working get Totals Patrick McDonagh 2016-11-18 17:48:46 -06:00
  • d664c50064 reorganizes files to be more pythonic Patrick McDonagh 2016-11-18 16:58:43 -06:00
  • 2e43c5ff12 Refactors controllers and factories to return a variable. Enables angular pagination. Patrick McDonagh 2016-11-18 13:51:00 -06:00
  • 4ab0ccaa1a Fixes tests to add a valid card type, fixes well test verbiage, converts card type from button label Patrick McDonagh 2016-11-17 16:48:04 -06:00
  • 19738f489f Added requirements.txt for reals this time Patrick McDonagh 2016-11-17 14:56:03 -06:00
  • 4be1ca25d5 removes node JS files and adds a requirements.txt Patrick McDonagh 2016-11-17 14:39:56 -06:00
  • fdd70d3bc7 fixes for empty returns Patrick McDonagh 2016-11-17 14:28:20 -06:00
  • b6b8de4893 Completes POCONSOLE-48. Notes page working. Patrick McDonagh 2016-11-16 16:39:29 -06:00
  • a3d8b3c95e Completes POCONSOLE-46. Events page working. Need to link event data to tag data Patrick McDonagh 2016-11-16 15:53:47 -06:00
  • 6f1aedd13d Completes POCONSOLE-46. Well Test entry, edit, and deletion are working. Patrick McDonagh 2016-11-16 15:03:52 -06:00
  • 891458543a Completes POCONSOLE-46. completes well test page Patrick McDonagh 2016-11-15 17:48:05 -06:00
  • cbf3a1b21a Completes initial work on POCONSOLE-44. Adds table for gauge-off data. Still need to add customizable graphs Patrick McDonagh 2016-11-15 16:32:09 -06:00
  • 84172800de Fixes dates and date parameters for cards Patrick McDonagh 2016-11-15 11:12:02 -06:00
  • 2a0fbd76c5 Completes POCONSOLE-40 and POCONSOLE-41. Retrieves cards and data associated with cards Patrick McDonagh 2016-11-14 18:55:10 -06:00
  • 4739bc2a37 adds database tests, removes some models that don't need to be in the database Patrick McDonagh 2016-11-11 17:42:41 -06:00
  • 9092e1b1ad Adds flask files. Completes POCONSOLE-64 by creating all models Patrick McDonagh 2016-11-10 21:47:16 -06:00
  • 427ec4f71f Upped ORM and PubSub time feature/POCONSOLE-25-SailsJS Patrick McDonagh 2016-08-05 15:58:48 -05:00
  • 5c1d4304c3 Completes POCONSOLE-45 and POCONSOLE-46, Events and Well Tests Patrick McDonagh 2016-06-28 15:36:00 -05:00
  • 579cc03cef Updated gitignore to not track .remote-sync.json Patrick McDonagh 2016-06-23 12:39:25 -05:00
  • d78eb48cda POCONSOLE-51 forces HTTPS/SSL using CACert Patrick McDonagh 2016-06-22 11:57:10 -05:00
  • 0ed709eea5 Fixes POCONSOLE-52. Changes ORM/pubsub timeout from 20 seconds to 60 seconds Patrick McDonagh 2016-06-22 11:55:56 -05:00
  • f9f4b59c5e Starting POCONSOLE-45 for Events Page Patrick McDonagh 2016-06-15 17:41:44 -05:00
  • e95c72d406 Missing some files for POCONSOLE-44 Patrick McDonagh 2016-06-15 17:41:13 -05:00
  • fa9c2925b5 Completes POCONSOLE-44. Gauge off Page working Patrick McDonagh 2016-06-15 17:40:06 -05:00
  • 3c4f63faeb Removes leftover file storage objects Patrick McDonagh 2016-06-15 17:38:53 -05:00
  • 55df6ed212 Fixes broken link on Card page Patrick McDonagh 2016-06-14 19:16:39 -05:00
  • 7917a24b74 more work on gauge-off page Patrick McDonagh 2016-06-14 19:09:50 -05:00
  • 948bd18881 started gauge off page Patrick McDonagh 2016-06-09 13:37:54 -05:00
  • 67139b4a07 File List fixes Patrick McDonagh 2016-06-08 17:29:12 -05:00
  • 55d0a0e036 Fixes POCONSOLE-43, card screens working Patrick McDonagh 2016-06-08 16:53:01 -05:00
  • bc35d73da0 fixes seed data Patrick McDonagh 2016-06-08 12:46:28 -05:00
  • 6b87f541b2 Fixes typo in card structure Patrick McDonagh 2016-06-08 12:29:16 -05:00
  • 2449fbe9b7 Split old controllers into separate files, began working on dashboard Patrick McDonagh 2016-06-07 19:12:01 -05:00
  • 8add45cc1b Seeding for tags updated Patrick McDonagh 2016-06-06 16:39:59 -05:00
  • 86f6fb129f added sails files, controllers/models for POConsole data Patrick McDonagh 2016-05-06 16:37:59 -05:00
  • 1ca2291f31 Fixed SQL query to get tag values at time feature/POC-72-poconsole-storing-to-mysql Patrick McDonagh 2016-04-21 15:13:12 -05:00
  • 45d99d1465 Start working on updating www to work with new db setup Patrick McDonagh 2016-04-21 09:34:11 -05:00
  • b3713541ef Fixed tag query Patrick McDonagh 2016-04-18 09:36:59 -05:00
  • 019f4db1e8 Converted controllers.js to controllers.coffee Patrick McDonagh 2016-04-04 17:49:14 -05:00
  • 9b1c9011d3 Duplicated json_sqlite.coffee to json_mysql.coffee Patrick McDonagh 2016-03-31 17:36:24 -05:00
  • f187fd7739 Add d3 to npm packages installed Patrick McDonagh 2016-03-31 15:23:15 -05:00
  • 49c223de61 Merge pull request #2 in POCONSOLE/www from feature/POC-67-show-well-timelines-in-web-view to master Patrick McDonagh 2016-03-31 19:54:02 +00:00
  • be830d9531 Added run status for previous 24 hours Patrick McDonagh 2016-03-31 14:53:01 -05:00
  • 772bf1ea8c Added StatusBetween function Patrick McDonagh 2016-03-31 12:06:00 -05:00
  • edf73c81fc fixed tag writing Patrick McDonagh 2016-03-29 21:43:54 -05:00
  • f923f8f9a1 Merge pull request #1 in POCONSOLE/www from feature/POC-70-update-poconsole-functions-to-read to master Patrick McDonagh 2016-03-29 21:48:05 +00:00
  • 6852b31793 Fixed tag value searching Patrick McDonagh 2016-03-29 16:46:24 -05:00
  • 1e483a5bbd re-fixed file list Patrick McDonagh 2016-03-26 17:12:51 -05:00
  • 1a9bb6de7a Fixed file list display Patrick McDonagh 2016-03-26 16:45:18 -05:00
  • b3bc0cd90c Cards and tag values are showing up on the card overview screen, but the tag data doesn't seem correct Patrick McDonagh 2016-03-26 16:12:26 -05:00
  • 5b5e1f3227 Dashboard works, but cards still need a bit of work Patrick McDonagh 2016-03-25 17:39:58 -05:00
  • 535762c1c5 Started getting website working with new API data Patrick McDonagh 2016-03-24 18:30:59 -05:00
  • 8b0aa91dea Switching server-side scripts over to coffeescript Patrick McDonagh 2016-03-24 18:30:12 -05:00
  • d9deeaa73b bower setup file Patrick McDonagh 2016-03-24 18:29:10 -05:00
  • 6c53695440 Bower works now! Patrick McDonagh 2016-03-24 18:28:54 -05:00