Commit Graph

216 Commits

Author SHA1 Message Date
Patrick McDonagh
3628d73452 Ignore files added by the file upload 2016-05-04 18:28:21 -05:00
Patrick McDonagh
7f24d04759 File storage started 2016-05-04 17:51:44 -05:00
Patrick McDonagh
ba7a76ac59 Fixed tag module weirdness 2016-05-04 13:18:19 -05:00
Patrick McDonagh
123f192844 Fixed script to restart loggers 2016-05-04 12:54:38 -05:00
Patrick McDonagh
569e2a4cfc fixed variable error 2016-05-04 11:05:11 -05:00
Patrick McDonagh
b574a1fd83 Moved d3 to being a dependency 2016-05-03 16:06:00 -05:00
Patrick McDonagh
e26359b47c Automatically check logger status on config page 2016-05-03 15:19:08 -05:00
Patrick McDonagh
39b6c1b6a7 Init script is database agnostic 2016-05-03 15:15:44 -05:00
Patrick McDonagh
0982630651 No longer requires tag.tag_mysql 2016-05-03 15:11:23 -05:00
Patrick McDonagh
4207eaf77d Process to restart and check status of logger script 2016-05-03 14:02:37 -05:00
Patrick McDonagh
231039a67a sampleData wasn't setting last_send_time either 2016-05-03 13:27:52 -05:00
Patrick McDonagh
00225bd1fc Fixed tag always writing issue 2016-05-03 13:19:40 -05:00
Patrick McDonagh
28d72d4d92 Fixed print typo 2016-05-03 13:17:45 -05:00
Patrick McDonagh
02b95a282f Include global variables in main routine 2016-05-03 13:02:24 -05:00
Patrick McDonagh
bd0fa77cf9 Update tag submodule to SailsJS testing branch 2016-05-03 12:41:11 -05:00
Patrick McDonagh
e83390d3ce Added seed parameters to make sure data is already in db at startup 2016-05-03 12:39:28 -05:00
Patrick McDonagh
7c4a29dbb1 added sails-mysql to npm package list 2016-05-03 12:39:03 -05:00
Patrick McDonagh
93ba3b23d0 Created db-agnostic tagserver 2016-05-03 12:38:35 -05:00
Patrick McDonagh
69f32187fb Merge branch 'Test-SailsJS' 2016-05-03 11:19:43 -05:00
Patrick McDonagh
606bebbccc Revert "Revert "Formatting changes after already merging""
This reverts commit c2f1ce8369.
2016-05-03 11:18:34 -05:00
Patrick McDonagh
c2f1ce8369 Revert "Formatting changes after already merging"
This reverts commit bec61c56ef.
2016-05-03 11:16:30 -05:00
Patrick McDonagh
cdb2a2b630 Added ability to delete config & devices from the website 2016-05-03 11:11:02 -05:00
Patrick McDonagh
5f09380bae Split huge angularJS controllers and factories into bite-sized chunks 2016-05-03 10:20:22 -05:00
Patrick McDonagh
57211ffee3 Fixed formatting on Readme 2016-05-02 18:47:16 -05:00
Patrick McDonagh
bec61c56ef Formatting changes after already merging 2016-05-02 18:46:43 -05:00
Patrick McDonagh
6c621c7d8e Merge pull request #2 in POCLOUD/tag-server from Test-SailsJS to master
* commit '318e3c3571dd061d9405c52dda4372218bf110e3':
  Updated README with documentation
  Removed old files
  Fixed CSV file download
  Moved files in preparation of going all-in on SailsJS
  Fixed Font-Awesome, set up database cleanup
  Add Device button is fixed
  Adds ability to add devices
  global variables for sampleData
  Added ability to associate individual devices with tags
  Error checking on config and tag entries
  Add config model
  use port 3000 in dev mode
  Multiple tag comparison working
  Can see tags and values now
  Tag Server website works without data
  Setup DB Structure using Models in Sails.js
  Add CRUD for devices
2016-05-02 23:16:40 +00:00
Patrick McDonagh
318e3c3571 Updated README with documentation 2016-05-02 18:10:09 -05:00
Patrick McDonagh
3755db5cad Removed old files 2016-05-02 18:09:30 -05:00
Patrick McDonagh
b2bba6ca6b Fixed CSV file download 2016-05-02 16:38:45 -05:00
Patrick McDonagh
df9726c799 Moved files in preparation of going all-in on SailsJS 2016-05-02 14:33:01 -05:00
Patrick McDonagh
5a2a9b6803 Fixed Font-Awesome, set up database cleanup 2016-05-02 13:10:15 -05:00
Patrick McDonagh
8b643fc1b4 Add Device button is fixed 2016-04-29 17:03:16 -05:00
Patrick McDonagh
46b02d6fd4 Adds ability to add devices 2016-04-29 16:44:53 -05:00
Patrick McDonagh
3684d5c480 global variables for sampleData 2016-04-29 15:10:31 -05:00
Patrick McDonagh
ad40affeb8 Added ability to associate individual devices with tags 2016-04-29 15:02:13 -05:00
Patrick McDonagh
7951ffa210 Error checking on config and tag entries 2016-04-29 15:01:16 -05:00
Patrick McDonagh
9478f9913b Add config model 2016-04-28 18:51:41 -05:00
Patrick McDonagh
b5b7fcd638 use port 3000 in dev mode 2016-04-28 14:28:25 -05:00
Patrick McDonagh
66043c3429 Multiple tag comparison working 2016-04-28 14:26:04 -05:00
Patrick McDonagh
1e5bf85b87 Can see tags and values now 2016-04-27 22:11:33 -05:00
Patrick McDonagh
c64083c20b Tag Server website works without data 2016-04-27 19:23:14 -05:00
Patrick McDonagh
80d965dfcc Setup DB Structure using Models in Sails.js 2016-04-27 09:39:02 -05:00
Patrick McDonagh
4a867430ac Add CRUD for devices 2016-04-26 17:06:41 -05:00
Patrick McDonagh
a277e47fd3 Add tag error fix, db optimization 2016-04-26 13:30:30 -05:00
Patrick McDonagh
30ec348d48 Add MySQL database model 2016-04-26 13:29:46 -05:00
Patrick McDonagh
8f262e1b23 Updated tag submodule. now includes analog and bit alarms 2016-04-20 12:15:20 -05:00
Patrick McDonagh
5a7d40088c fixed a few typos 2016-04-20 11:48:32 -05:00
Patrick McDonagh
4c8ff3f4a5 update tag submodule 2016-04-19 13:13:25 -05:00
Patrick McDonagh
c90bf70360 fix db create function 2016-04-19 13:12:53 -05:00
Patrick McDonagh
f324c33f6b changed to be location agnostic 2016-04-18 15:56:20 -05:00