Patrick McDonagh
8342efeeee
Updated Tag submodule
2016-05-24 21:30:32 -05:00
Patrick McDonagh
3ae3224880
Closes POCONSOLE-36. PLC Logic for handshaking and corrections to datalogger driver
2016-05-13 10:26:57 -05:00
Patrick McDonagh
742f610ede
Updates webpage to allow input of plc handshake tags
2016-05-13 09:55:59 -05:00
Patrick McDonagh
548288bd29
Changes handshaking to be normal tag with class = 6, allows multiple handshake tags
2016-05-13 09:41:30 -05:00
Patrick McDonagh
01c23b142c
Adds handshaking
2016-05-13 09:26:41 -05:00
Patrick McDonagh
59ec89bd2a
Test Fix for POCONSOLE-34 of tags not clearing data correctl
2016-05-09 15:41:50 -05:00
Patrick McDonagh
6f58daa492
Removed logging
2016-05-08 13:52:30 -05:00
Patrick McDonagh
726ce9eb05
update tag module again
2016-05-06 11:28:31 -05:00
Patrick McDonagh
ca4e00fa2b
Update tag module
2016-05-06 11:23:20 -05:00
Patrick McDonagh
7d42661112
devices were always CLX
2016-05-06 11:19:24 -05:00
Patrick McDonagh
33b8983685
refactored tricky function
2016-05-05 17:29:26 -05:00
Patrick McDonagh
0a045cd2b4
form-group was blocking post data
2016-05-05 16:21:02 -05:00
Patrick McDonagh
7b98b317b2
log request body
2016-05-05 16:13:21 -05:00
Patrick McDonagh
e8cc9f1465
Document Upload and Deletion work great
2016-05-05 15:53:45 -05:00
Patrick McDonagh
4ad91f1271
Class was misspelled
2016-05-05 09:55:08 -05:00
Patrick McDonagh
6e043a1c4a
don't need to track .tmp folder
2016-05-05 09:51:49 -05:00
Patrick McDonagh
2565799059
fixed columns running together
2016-05-05 09:49:34 -05:00
Patrick McDonagh
a171f8c1c0
Fixed post URL
2016-05-05 09:38:19 -05:00
Patrick McDonagh
6700487076
Adds ability to store documents
2016-05-05 09:30:47 -05:00
Patrick McDonagh
3d7806b04d
Trying to ignore .tmp folder
2016-05-04 18:29:23 -05:00
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
