Skip to content

Commit 74b225c

Browse files
authored
Merge pull request #2 from dfarrow0/main
welcome to 2020
2 parents 77c0284 + 998059c commit 74b225c

27 files changed

+2299
-7222
lines changed

README.md

Lines changed: 7 additions & 307 deletions
Original file line numberDiff line numberDiff line change
@@ -2,314 +2,14 @@
22
[![Deploy Status](http://delphi.midas.cs.cmu.edu/~automation/public/github_deploy_repo/badge.php?repo=cmu-delphi/www-epivis)](#)
33

44
# About
5-
An interactive tool for visualizing epidemiological time-series data.
6-
7-
The site is live at http://delphi.midas.cs.cmu.edu/epivis/
8-
9-
# Legacy Changelog
10-
````
11-
=== v39: 2017-12-04 ===
12-
./epivis.html
13-
+ source `quidel`
14-
js/epidata.js
15-
+ source `quidel`
16-
(by Lisheng)
17-
18-
=== v38: 2017-02-15 ===
19-
./epivis.html
20-
+ 'run regression','reset' features
21-
js/epivis.js
22-
+ regression related member functions in Dataset class
23-
js/treeview.js
24-
* return full path for dataset in `getDatasets...()` functions
25-
(by Lisheng)
26-
27-
=== v37: 2017-02-07 ===
28-
./epivis.html
29-
+ source `flusurv`
30-
js/epidata.js
31-
+ source `flusurv`
32-
33-
=== v36: 2016-11-15 ===
34-
./epivis.html
35-
* API update for `stateili` param `version`
36-
js/epidata.js
37-
* API update for `stateili` param `version`
38-
39-
=== v35: 2016-11-14 ===
40-
./epivis.html
41-
* link to 3rd party libs instead of hosting them
42-
43-
=== v34: 2016-08-05 ===
44-
./epivis.html
45-
+ added description for authorization token under ILINet
46-
(by Paul)
47-
48-
=== v33: 2016-06-16 ===
49-
js/epivis.js
50-
+ don't request focus if in an iframe
51-
52-
=== v32: 2016-04-20 ===
53-
js/epivis.js
54-
+ don't interpolate missing values (unless enabled)
55-
56-
=== v31: 2016-04-16 ===
57-
./epivis.html
58-
+ location for source `cdc`
59-
js/delphi_epidata.js
60-
* from https://github.com/undefx/delphi-epidata
61-
js/epidata.js
62-
+ location for source `cdc`
63-
64-
=== v30: 2016-04-15 ===
65-
./epivis.html
66-
+ YYYYWW epiweek date column
67-
js/csv.js
68-
+ YYYYWW epiweek date column
69-
70-
=== v29: 2016-04-09 ===
71-
./epivis.html
72-
+ all locations for `nowcast`
73-
js/epidata.js
74-
* new `nowcast` start week
75-
76-
=== v28: 2016-04-07 ===
77-
./epivis.html
78-
+ sources `cdc` and `sensors`
79-
* createDataset handles different dates
80-
js/delphi_epidata.js
81-
* from https://github.com/undefx/delphi-epidata
82-
js/epidata.js
83-
+ sources `cdc` and `sensors`
84-
85-
=== v27: 2016-04-06 ===
86-
./epivis.html
87-
+ source `stateili`
88-
js/delphi_epidata.js
89-
* from https://github.com/undefx/delphi-epidata
90-
js/epidata.js
91-
+ source `stateili`
92-
* fixed first `ght` epiweek
93-
94-
=== v26: 2016-04-01 ===
95-
./epivis.html
96-
+ census regions for fluview, ilinet, and twitter
97-
98-
=== v25: 2016-03-22 ===
99-
./epivis.html
100-
+ added screenshot button and function
101-
102-
=== v24: 2016-02-18 ===
103-
./epivis.html
104-
+ param `auth` for source `ilinet`
105-
js/delphi_epidata.js
106-
* from https://github.com/undefx/delphi-epidata
107-
js/epidata.js
108-
+ param `auth` for source `ilinet`
109-
110-
=== v23: 2016-01-29 ===
111-
./epivis.html
112-
+ signal `ght`
1135

114-
=== v22: 2015-12-15 ===
115-
./epivis.html
116-
+ source `nowcast`
117-
* fixed wording and default value for `fluview` lag parameter
118-
js/delphi_epidata.js
119-
* from https://github.com/undefx/delphi-epidata
120-
js/epidata.js
121-
+ source `nowcast`
122-
123-
=== v21: 2015-12-11 ===
124-
./epivis.html
125-
+ source `signals`
126-
js/delphi_epidata.js
127-
* from https://github.com/undefx/delphi-epidata
128-
js/epidata.js
129-
+ source `signals`
130-
131-
=== v20: 2015-12-03 ===
132-
./epivis.html
133-
+ source `ght`
134-
css/epivis.css
135-
* increased option_label width
136-
js/delphi_epidata.js
137-
* from https://github.com/undefx/delphi-epidata
138-
js/epidata.js
139-
+ source `ght`
140-
141-
=== v19: 2015-09-18 ===
142-
js/epidata.js
143-
+ added `value` column for wiki
144-
145-
=== v18: 2015-09-15 ===
146-
./epivis.html
147-
+ ILINet support
148-
js/delphi_epidata.js
149-
* from https://github.com/undefx/delphi-epidata
150-
js/epidata.js
151-
+ ILINet support
152-
153-
=== v17: 2015-08-20 ===
154-
./epivis.html
155-
+ NIDSS dengue support
156-
js/delphi_epidata.js
157-
* from https://github.com/undefx/delphi-epidata
158-
js/epidata.js
159-
+ NIDSS dengue support
160-
* NIDSS flu update
161-
162-
=== v16: 2015-08-11 ===
163-
./epivis.html
164-
+ NIDSS support
165-
js/delphi_epidata.js
166-
+ from https://github.com/undefx/delphi-epidata
167-
js/epidata.js
168-
+ NIDSS support
169-
+ New wiki field
170-
* wrapper for delphi_epidata.js
171-
172-
=== v15: 2015-07-31 ===
173-
./epivis.html
174-
+ auth token for twitter
175-
js/epidata.js
176-
+ auth token for twitter
177-
178-
=== v14: 2015-07-24 ===
179-
./epivis.html
180-
+ parse CSVOptions from CSV comment
181-
+ auto load file when CSVOptions present
182-
+ bulk add/remove grouped datasets
183-
js/csv.js
184-
+ ignore lines starting with '#'
185-
186-
=== v13: 2015-07-23 ===
187-
./epivis.html
188-
* createDataset requires kernel to be non-null
189-
* fixed preview box wrapping
190-
js/epivis.js
191-
+ range check for week in Date.fromEpiweek
192-
* fix (hack) for week 53 in years with 52 weeks
193-
194-
=== v12: 2015-07-09 ===
195-
./epivis.html
196-
+ draw custom line
197-
js/epivis.js
198-
* fixed autoscale with multiple datasets
199-
200-
=== v11: 2015-07-03 ===
201-
./epivis.html
202-
+ meta viewport tag
203-
+ meta mobile-web-app-capable tag
204-
+ link to manifest.json
205-
+ link to icon.png
206-
+ new buttons for CSV, API, kernels
207-
+ fullscreen support
208-
+ android homescreen support
209-
* improved dialog support
210-
* better tooltip positioning
211-
* hide tooltip after button click
212-
* adjustments to top bar
213-
* import via dialog
214-
- "flag" buttons for UI layout
215-
- sample CSV files
216-
./icon.png
217-
+ basic icon for android homescreen
218-
./manifest.json
219-
+ basic manifest for android homescreen
220-
css/epivis.css
221-
* increased size of top bar
222-
* adjusted button look and feel
223-
* changed import color scheme
224-
- bottom section now inside dialog
225-
js/epivis.js
226-
* default dataset lineWidth 1 to 2
227-
* various linting
228-
229-
=== v10: 2015-07-02 ===
230-
./epivis.html
231-
+ 97 GFT cities
232-
+ UI tooltips for top-bar buttons
233-
css/epivis.css
234-
+ tooltip class
235-
236-
=== v9: 2015-06-30 ===
237-
./epivis.html
238-
+ experimental overlay/dialog
239-
css/epivis.css
240-
+ overlay/dialog classes
241-
242-
=== v8: 2015-06-24 ===
243-
./epivis.html
244-
+ twitter from Epidata API
245-
+ wiki from Epidata API
246-
* major improvements to Epidata API
247-
* tentatively enabled multiscale button
248-
css/epivis.css
249-
* some padding for option labels
250-
* tree view width from 200px to 15%
251-
js/epidata.js
252-
+ Delphi Epidata API (supporting all data sources)
253-
js/epivis.js
254-
+ scale and vertical offset per dataset
255-
+ dataset scale by mean
256-
* small tweaks for jsHint
257-
258-
=== v7: 2015-06-23 ===
259-
./epivis.html
260-
+ page title
261-
+ more documentation for file loading
262-
+ fetch from Epidata API (FluView and GFT)
263-
* better mime type detection (excel types)
264-
* converted double quotes to single quotes
265-
css/epivis.css
266-
+ extra classes for documentation
267-
js/csv.js
268-
+ export CSV.DataGroup
269-
* small syntax adjustments
270-
271-
=== v6: 2015-03-24 ===
272-
./epivis.html
273-
+ automatic file preview
274-
275-
=== v5: 2015-03-17 ===
276-
./epivis.html
277-
+ kernel: product
278-
js/csv.js
279-
* fixed loading without date column
280-
* fixed loading 1-column CSV
281-
js/epivis.js
282-
+ <Chart>.showPoints
283-
+ <Chart>.isShowingPoints
284-
js/treeview.js
285-
+ <TreeView>.getAllDatasets
286-
287-
=== v4: 2015-01-21 ===
288-
./epivis.html
289-
+ kernels: sum and iliplus
6+
An interactive tool for visualizing epidemiological time-series data.
2907

291-
=== v3: 2015-01-20 ===
292-
./changelog.txt
293-
+ separate changelog file
294-
./epivis.html
295-
+ link to this changelog
296-
+ createDataset (very experimental)
297-
+ Kernels (kernel generators)
298-
* fixed randomize button's id
299-
css/epivis.css
300-
+ reasonable anchor colors
301-
js/csv.js
302-
* Use Date.fromEpiweek
303-
js/epivis.js
304-
+ Date.fromEpiweek
305-
+ <Date>.toString
306-
js/treeview.js
307-
+ <TreeView>.getSelectedDatasets
8+
The site is live at https://delphi.cmu.edu/epivis/epivis.html
3089

309-
=== v2: 2014-12-22 ===
310-
+ randomize color button
311-
+ autoscale button
10+
For development, see the
11+
[EpiVis development guide](docs/epivis_development.md).
31212

313-
=== v1: 2014-12-22 ===
314-
* original version
315-
````
13+
Little piece of trivia: the first version of EpiVis was written on 2014-12-22.
14+
See the git history of this file for a legacy changelog which describes changes
15+
made prior to the migration to git around 2017.

deploy.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,12 @@
33
"version": 1,
44
"actions": [
55

6-
"// make changelog",
7-
{
8-
"type": "move",
9-
"src": "README.md",
10-
"dst": "site/changelog.txt"
11-
},
12-
136
"// web sources",
147
{
158
"type": "move",
169
"src": "site/",
1710
"dst": "/var/www/html/epivis/",
18-
"match": "^.*\\.(html|php|txt)$",
11+
"match": "^.*\\.(html|php)$",
1912
"add-header-comment": true
2013
},
2114
{

dev/docker/web/epivis/Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# start with the `delphi_web` image
2+
FROM delphi_web
3+
4+
# deploy the EpiVis website (see `www-epivis/deploy.json`)
5+
COPY repos/delphi/www-epivis/site /var/www/html/epivis
6+
7+
# grab the javascript client library for the Epidata API (it's not included in
8+
# this repo)
9+
COPY repos/delphi/delphi-epidata/src/client/delphi_epidata.js /var/www/html/epidata/lib/delphi_epidata.min.js
10+
11+
RUN chmod o+r /var/www/html/epivis/* /var/www/html/epidata/*

dev/docker/web/epivis/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# `delphi_web_epivis`
2+
3+
This image starts with Delphi's web server and adds the sources necessary for
4+
hosting EpiVis, Delphi's epidata visualization website.
5+
6+
To start a container from this image, run:
7+
8+
```bash
9+
docker run --rm -p 10080:80 --name delphi_web_epivis delphi_web_epivis
10+
```
11+
12+
You should be able to view the site by visiting (or `curl`ing)
13+
http://localhost:10080/epivis/epivis.html.

0 commit comments

Comments
 (0)