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

Commit Graph

  • 5a5f576e8f Initial front-end commit React Patrick McDonagh 2018-05-22 13:07:25 -05:00
  • 61f90ec04a formatting changes NodeJS-Conversion Patrick McDonagh 2018-02-01 11:57:33 -06:00
  • 3e37d88d6e Adds PEP formatting convert-to-pyramid-project Patrick McDonagh 2017-05-25 15:01:59 -05:00
  • 7f0aff3c9c Adds basic mongo and pyramid framework Patrick McDonagh 2017-05-16 21:51:04 -05:00
  • fb3e708a74 Fixes writing, removes broken functions, adds services master Patrick McDonagh 2017-05-11 17:26:42 -05:00
  • 435ad05ff5 Fixes for raspi-related docker containers Patrick McDonagh 2017-05-11 10:58:33 -05:00
  • 79ac9ccca1 Tries to fix travis builds by using cd Patrick McDonagh 2017-05-10 18:19:52 -05:00
  • 5d250bfac4 Lots of fixes, docker optimization Patrick McDonagh 2017-05-10 18:09:10 -05:00
  • 604d21c012 Removes pycomm-helper and pycomm folders Patrick McDonagh 2017-05-09 15:24:04 -05:00
  • 064be4fc73 Updates taglogger to working state Patrick McDonagh 2017-05-09 15:19:46 -05:00
  • 613f92156f Dummy commit for starting testing with TravisCI Patrick McDonagh 2017-05-08 12:08:18 -05:00
  • fb662ba04f Adds a file for Travis CI testing Patrick McDonagh 2017-05-08 12:06:51 -05:00
  • c38b165051 Fixes RPi docker files and adds RPi docker compose file Patrick McDonagh 2017-05-08 11:52:02 -05:00
  • d5fb6571b1 Modifies docker file to install via pip vs copying Patrick McDonagh 2017-05-08 09:59:57 -05:00
  • 4cb15c2390 Updates docker files Patrick McDonagh 2017-05-08 09:52:11 -05:00
  • ab005f9cce Removes unnecessary files and sets allowed files Patrick McDonagh 2016-11-04 17:50:53 -05:00
  • cf98beae33 Merged in POCONSOLE-33-Docker-Container (pull request #2) Patrick McDonagh 2016-11-04 22:49:56 +00:00
  • b5f93f9a31 Merged in POCONSOLE-62-Flask (pull request #1) Patrick McDonagh 2016-11-04 22:43:36 +00:00
  • 7082fd0fd2 Adds docker-compose file and fixes upload folder for docker container Patrick McDonagh 2016-11-01 20:23:42 -05:00
  • 849b4e5d82 Fixes all functions except CSV for time period. Patrick McDonagh 2016-11-01 16:56:22 -05:00
  • 72f1cb6684 Working with SampleData.py and SSL. Issues still exist with tag graphs Patrick McDonagh 2016-10-28 18:22:23 -05:00
  • 611502c74a Ditched Backbone in favor of Angular Patrick McDonagh 2016-10-27 17:19:25 -05:00
  • d0f329bc7f Adds backbone and marionette functions Patrick McDonagh 2016-10-26 17:45:25 -05:00
  • c9b4c2f4d7 First commit for this branch. Adds files for Flask and flask-restless Patrick McDonagh 2016-10-25 19:01:36 -05:00
  • 49c8012532 Uses pycomm_helper package instead of that janky old tag package Patrick McDonagh 2016-10-14 19:19:02 -05:00
  • 4b9dd1bc71 Instead of cloning pycomm (which may require installing git), just copy it and install it locally Patrick McDonagh 2016-10-14 10:06:52 -05:00
  • 6dcbcd2846 Reorganizes for 2 docker containers Patrick McDonagh 2016-10-13 17:18:52 -05:00
  • e374169c71 Silences npm install Patrick McDonagh 2016-10-13 13:41:40 -05:00
  • 14dd0ff29b Instead of migrate behavior being alter, added default db structure Patrick McDonagh 2016-10-13 12:15:15 -05:00
  • 84fc2fbccc Changes migrate behavior to alter Patrick McDonagh 2016-10-13 09:49:44 -05:00
  • 069c9a9915 First attempt at docker configuration Patrick McDonagh 2016-10-12 19:05:52 -05:00
  • 5e5cfde3cf per POCONSOLE-59, updates submodule URL Patrick McDonagh 2016-09-09 18:24:21 -05:00
  • f1603aec41 Adds modal to confirm Tag Data Deletion Patrick McDonagh 2016-07-28 14:20:57 -05:00
  • 871bf70161 Converts CSV Method for getting all data to new separate column method Patrick McDonagh 2016-07-28 13:11:18 -05:00
  • 8fe01d0a7d rewrites CSV method to give a separate column for each tag Patrick McDonagh 2016-07-28 10:52:04 -05:00
  • 7cb4a38841 POCONSOLE-57 needed a few changes Patrick McDonagh 2016-07-27 17:39:38 -05:00
  • 3dda1c48eb Fixes POCONSOLE-57, Adds Delete All Tag Data button to Config page Patrick McDonagh 2016-07-27 17:30:49 -05:00
  • 67a5ef3ee5 Fixes POCONSOLE-56. Start/End times are now working and enough data points are being pulled. Patrick McDonagh 2016-07-27 17:30:17 -05:00
  • 5ea8697662 Merged branch master into master Patrick McDonagh 2016-07-27 16:04:46 -05:00
  • af943599db changes migrate behavior to "safe" vs "alter" Patrick McDonagh 2016-07-27 16:04:07 -05:00
  • e03dd1294d changes migrate behavior to "save" vs "alter" Patrick McDonagh 2016-07-27 16:04:07 -05:00
  • 325d4affbd Completes POCONSOLE-51. Forces SSL/HTTPS Patrick McDonagh 2016-06-22 11:47:58 -05:00
  • 1ec4035ea9 Adds SSL certificate use Patrick McDonagh 2016-06-22 11:03:06 -05:00
  • 99d989790c Fixes timeouts for raspberry pi devices Patrick McDonagh 2016-06-22 11:02:39 -05:00
  • c778152e36 Fixes POCloud Driver to work with Sails framework Patrick McDonagh 2016-05-27 17:33:06 -05:00
  • 8342efeeee Updated Tag submodule Patrick McDonagh 2016-05-24 21:30:32 -05:00
  • 3ae3224880 Closes POCONSOLE-36. PLC Logic for handshaking and corrections to datalogger driver Patrick McDonagh 2016-05-13 10:26:57 -05:00
  • 742f610ede Updates webpage to allow input of plc handshake tags Patrick McDonagh 2016-05-13 09:55:59 -05:00
  • 548288bd29 Changes handshaking to be normal tag with class = 6, allows multiple handshake tags Patrick McDonagh 2016-05-13 09:41:30 -05:00
  • 01c23b142c Adds handshaking Patrick McDonagh 2016-05-13 09:26:41 -05:00
  • 59ec89bd2a Test Fix for POCONSOLE-34 of tags not clearing data correctl Patrick McDonagh 2016-05-09 15:41:50 -05:00
  • 6f58daa492 Removed logging Patrick McDonagh 2016-05-08 13:52:30 -05:00
  • 726ce9eb05 update tag module again Patrick McDonagh 2016-05-06 11:28:31 -05:00
  • ca4e00fa2b Update tag module Patrick McDonagh 2016-05-06 11:23:20 -05:00
  • 7d42661112 devices were always CLX Patrick McDonagh 2016-05-06 11:19:24 -05:00
  • 33b8983685 refactored tricky function Patrick McDonagh 2016-05-05 17:29:26 -05:00
  • 0a045cd2b4 form-group was blocking post data Patrick McDonagh 2016-05-05 16:21:02 -05:00
  • 7b98b317b2 log request body Patrick McDonagh 2016-05-05 16:13:21 -05:00
  • e8cc9f1465 Document Upload and Deletion work great Patrick McDonagh 2016-05-05 15:53:45 -05:00
  • 4ad91f1271 Class was misspelled Patrick McDonagh 2016-05-05 09:55:08 -05:00
  • 6e043a1c4a don't need to track .tmp folder Patrick McDonagh 2016-05-05 09:51:49 -05:00
  • 2565799059 fixed columns running together Patrick McDonagh 2016-05-05 09:49:34 -05:00
  • a171f8c1c0 Fixed post URL Patrick McDonagh 2016-05-05 09:38:19 -05:00
  • 6700487076 Adds ability to store documents Patrick McDonagh 2016-05-05 09:30:47 -05:00
  • 3d7806b04d Trying to ignore .tmp folder Patrick McDonagh 2016-05-04 18:29:23 -05:00
  • 3628d73452 Ignore files added by the file upload Patrick McDonagh 2016-05-04 18:28:21 -05:00
  • 7f24d04759 File storage started Patrick McDonagh 2016-05-04 17:51:44 -05:00
  • ba7a76ac59 Fixed tag module weirdness Patrick McDonagh 2016-05-04 13:18:19 -05:00
  • 123f192844 Fixed script to restart loggers Patrick McDonagh 2016-05-04 12:54:38 -05:00
  • 569e2a4cfc fixed variable error Patrick McDonagh 2016-05-04 11:05:11 -05:00
  • b574a1fd83 Moved d3 to being a dependency Patrick McDonagh 2016-05-03 16:06:00 -05:00
  • e26359b47c Automatically check logger status on config page Patrick McDonagh 2016-05-03 15:19:08 -05:00
  • 39b6c1b6a7 Init script is database agnostic Patrick McDonagh 2016-05-03 15:15:44 -05:00
  • 0982630651 No longer requires tag.tag_mysql Patrick McDonagh 2016-05-03 15:11:23 -05:00
  • 4207eaf77d Process to restart and check status of logger script Patrick McDonagh 2016-05-03 14:02:37 -05:00
  • 231039a67a sampleData wasn't setting last_send_time either Patrick McDonagh 2016-05-03 13:27:52 -05:00
  • 00225bd1fc Fixed tag always writing issue Patrick McDonagh 2016-05-03 13:19:40 -05:00
  • 28d72d4d92 Fixed print typo Patrick McDonagh 2016-05-03 13:17:45 -05:00
  • 02b95a282f Include global variables in main routine Patrick McDonagh 2016-05-03 13:02:24 -05:00
  • bd0fa77cf9 Update tag submodule to SailsJS testing branch Patrick McDonagh 2016-05-03 12:41:11 -05:00
  • e83390d3ce Added seed parameters to make sure data is already in db at startup Patrick McDonagh 2016-05-03 12:39:28 -05:00
  • 7c4a29dbb1 added sails-mysql to npm package list Patrick McDonagh 2016-05-03 12:39:03 -05:00
  • 93ba3b23d0 Created db-agnostic tagserver Patrick McDonagh 2016-05-03 12:38:35 -05:00
  • 69f32187fb Merge branch 'Test-SailsJS' Patrick McDonagh 2016-05-03 11:19:43 -05:00
  • 606bebbccc Revert "Revert "Formatting changes after already merging"" Patrick McDonagh 2016-05-03 11:18:34 -05:00
  • c2f1ce8369 Revert "Formatting changes after already merging" Patrick McDonagh 2016-05-03 11:16:30 -05:00
  • cdb2a2b630 Added ability to delete config & devices from the website Patrick McDonagh 2016-05-03 11:11:02 -05:00
  • 5f09380bae Split huge angularJS controllers and factories into bite-sized chunks Patrick McDonagh 2016-05-03 10:20:22 -05:00
  • 57211ffee3 Fixed formatting on Readme Patrick McDonagh 2016-05-02 18:47:16 -05:00
  • bec61c56ef Formatting changes after already merging Test-SailsJS Patrick McDonagh 2016-05-02 18:46:43 -05:00
  • 6c621c7d8e Merge pull request #2 in POCLOUD/tag-server from Test-SailsJS to master Patrick McDonagh 2016-05-02 23:16:40 +00:00
  • 318e3c3571 Updated README with documentation Patrick McDonagh 2016-05-02 18:10:09 -05:00
  • 3755db5cad Removed old files Patrick McDonagh 2016-05-02 18:09:30 -05:00
  • b2bba6ca6b Fixed CSV file download Patrick McDonagh 2016-05-02 16:38:45 -05:00
  • df9726c799 Moved files in preparation of going all-in on SailsJS Patrick McDonagh 2016-05-02 14:33:01 -05:00
  • 5a2a9b6803 Fixed Font-Awesome, set up database cleanup Patrick McDonagh 2016-05-02 13:10:15 -05:00
  • 8b643fc1b4 Add Device button is fixed Patrick McDonagh 2016-04-29 17:03:16 -05:00
  • 46b02d6fd4 Adds ability to add devices Patrick McDonagh 2016-04-29 16:44:53 -05:00
  • 3684d5c480 global variables for sampleData Patrick McDonagh 2016-04-29 15:10:31 -05:00
  • ad40affeb8 Added ability to associate individual devices with tags Patrick McDonagh 2016-04-29 15:02:13 -05:00