Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.1.0 #117

Merged
merged 73 commits into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
1e6e71b
Update metadata.md
vipileggi Jan 31, 2021
5dd7007
Add files via upload
vipileggi Feb 2, 2021
15345c6
added in tables to help generate metadata
hswerdfe Feb 9, 2021
2ea56b5
made R script to generate SQL code that will make a DB
hswerdfe Feb 10, 2021
9281d09
sql generator now adds comments, and works to create a blank sqlite db
hswerdfe Feb 10, 2021
ec36aa2
removed special charaters from csv files
hswerdfe Feb 10, 2021
67367f6
sql db genorator now includes table desciptions as comments.
hswerdfe Feb 10, 2021
6faec57
sql db generator now add forgin keys to sql statments
hswerdfe Feb 11, 2021
398bb7a
all variables now have english and french labels, that were auto gene…
hswerdfe Feb 11, 2021
8e8c46d
plural tables
hswerdfe Feb 11, 2021
0dcb853
added auto generated markdown file.
hswerdfe Feb 11, 2021
ca58aed
metadata file generated from template file, with some header and foo…
hswerdfe Feb 11, 2021
e0dd1b8
add labels in en and fr to the tables table.
hswerdfe Feb 11, 2021
bc86aa4
I think this fixed the issue with the push failure
hswerdfe Feb 11, 2021
3767ab2
Removed one of the template files for the metadata, kept one of them …
hswerdfe Feb 11, 2021
c562088
fix bug in metadata generation.
hswerdfe Feb 11, 2021
82ef9f6
[feature] add comment header for metadata_template.md
DougManuel Feb 12, 2021
3b8b0aa
[feature] include instructions to generate metadata_template.md
DougManuel Feb 12, 2021
633c5f7
added naming conventions section
hswerdfe Feb 15, 2021
e9267cc
added naming conventions section
hswerdfe Feb 15, 2021
534936b
added naming conventions section
hswerdfe Feb 15, 2021
fcdfbb7
Merge pull request #96 from Big-Life-Lab/dev_hswerdfe
DougManuel Feb 15, 2021
1e1c872
[feature] Variant reporting #59
DougManuel Feb 17, 2021
9c70234
[feature] additional category for variant reporting #59
DougManuel Feb 17, 2021
f6a9bbf
[bug] typos from 1e6e71befcf1e26b62edd8ea251d4f3072285e5f
DougManuel Feb 18, 2021
0b3fa3f
[feature] update changelog for v1.1.0.
DougManuel Feb 18, 2021
c7d9112
[bug] update variable names with lowercase first character
DougManuel Feb 18, 2021
de8f188
[feature] addition of organization to Reporter table
DougManuel Feb 23, 2021
133f1f5
[feature] addition of organization to Reporter table #97
DougManuel Feb 23, 2021
b500365
Merge remote-tracking branch 'origin/dev' into dev
DougManuel Feb 23, 2021
1cc2afd
[feature] add reporterID to siteMeasure table
DougManuel Feb 23, 2021
e3fa5da
[feature] add reporterID to siteMeasure table #93
DougManuel Feb 23, 2021
7c7be8d
Merge remote-tracking branch 'origin/dev' into dev
DougManuel Feb 23, 2021
267ec18
Added french descriptions to ODM variables
jeandavidt Feb 25, 2021
46e4c0d
Merge branch 'french' into dev
jeandavidt Feb 25, 2021
eab3881
auto generation of meta data files, note the _fr template should real…
hswerdfe Mar 1, 2021
84c1287
includes the label in english and french for the columns
hswerdfe Mar 1, 2021
d63e5b4
ERD is auto generated now from table
hswerdfe Mar 2, 2021
b962013
ERD now has arrows poinint to columns, its better but not great.
hswerdfe Mar 2, 2021
93360e0
small changes to erd
hswerdfe Mar 2, 2021
4baff46
remove lucid chart regenerate all md files
hswerdfe Mar 2, 2021
b068b95
i THINK THE Accent issues are worked out now ???
hswerdfe Mar 2, 2021
1403a42
I think the replacement issue is fixed now...
hswerdfe Mar 2, 2021
b47451c
Adds Quebec Template
NielsNicolai Mar 3, 2021
e94329c
Adds new variable categories
NielsNicolai Mar 3, 2021
7c1f608
Adds index to sample
NielsNicolai Mar 3, 2021
21525df
References issue for sample index
NielsNicolai Mar 3, 2021
e1121c6
InstrumentID in Sample table
NielsNicolai Mar 3, 2021
7b72c1d
Corrected typos in french columns
jeandavidt Mar 8, 2021
402a157
addresses #113 and #114
hswerdfe Mar 9, 2021
f43b1f6
closed excel files
hswerdfe Mar 9, 2021
0d74bc2
trying to merge
hswerdfe Mar 9, 2021
5bbe30f
restore Tables.csv
hswerdfe Mar 9, 2021
fe41e88
Rename Extraction Volume
NielsNicolai Mar 10, 2021
6775523
Link site measurement with samples
NielsNicolai Mar 10, 2021
96e5f72
Handles missing values
NielsNicolai Mar 10, 2021
4af2d21
Removes normilization options from the siteMeasure table
NielsNicolai Mar 10, 2021
811894c
Solves quotation error
NielsNicolai Mar 10, 2021
05b4155
Solves quoatation error II
NielsNicolai Mar 10, 2021
6512f46
updates to mapper files
hswerdfe Mar 15, 2021
c98e8cf
Merge branch 'dev' of https://github.com/Big-Life-Lab/covid-19-wastew…
hswerdfe Mar 15, 2021
a62db83
[bug] change "SiteID" to siteID" in README.md
DougManuel Mar 15, 2021
989f856
[feature] add publicHealthDepartment and healthRegion. Addresses #116
DougManuel Mar 15, 2021
aacfaa5
[feature] update readme for new variables #116
DougManuel Mar 15, 2021
b7b768c
[bug] spelling correction `porpVar` to `propVar`. #59
DougManuel Mar 15, 2021
8519733
change 'an' and 'a' to 'per hour' and 'per day'
DougManuel Mar 15, 2021
b5a2ec6
Merge branch 'dev' of https://github.com/Big-Life-Lab/covid-19-wastew…
hswerdfe Mar 15, 2021
2b74356
Added site measurements
jeandavidt Mar 15, 2021
05402c0
Merge branch 'dev' of https://github.com/Big-Life-Lab/covid-19-wastew…
hswerdfe Mar 15, 2021
923cb4f
update issues on README.md
DougManuel Mar 15, 2021
18d5725
Merge branch 'dev' of https://github.com/Big-Life-Lab/covid-19-wastew…
hswerdfe Mar 15, 2021
f74a25a
changed siteMeasument unit as catetory now.
hswerdfe Mar 15, 2021
524e4d3
Merge branch 'main' into dev
hswerdfe Mar 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[feature] add reporterID to siteMeasure table
  • Loading branch information
DougManuel committed Feb 23, 2021
commit 1cc2afd1ef66c1af32d59a3845b62bddbeaa8ee9
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ See [license](LICENSE) for more information.

- [Reporter](metadata.md#reporter) table

- `organization`: Organziation of reproter.
- `organization`: Organziation of reproter. Issue [#97](https://github.com/Big-Life-Lab/covid-19-wastewater/issues/97)

- [Sample](metadata.md#sample) table

- `reporterID`: Reporter ID. Currently, reporterID is `WWmeasure` table but reporter for samples can be different. Issuse [#93](https://github.com/Big-Life-Lab/covid-19-wastewater/issues/93)

- **New variable categories**

Expand Down
3 changes: 2 additions & 1 deletion Variables.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
tableName,variableName,variableLabel_en,variableLabel_fr,key,foreignKeyTable,foreignKeyVariable,variableType,variableDesc
Sample,sampleID,Sample id,Exemple d'identification,Primary Key,,,string,Unique identification for sample. Suggestion:siteID-date-index.
Sample,siteID,Site id,Identifiant du site,Foreign key,Site,siteID,string,Links with the Site table to describe the location of sampling.
Sample,reporterID,Reporter id,Identit� du journaliste,,,,,
Sample,dateTime,Date time,Date et heure,,,,datetime,"for grab samples this is the date, time and timezone the sample was taken."
Sample,dateTimeStart,Date time start,Date et heure de d�but,,,,datetime,"For integrated time averaged samples this is the date, time and timezone the sample was started being taken."
Sample,dateTimeEnd,Date time end,Date et heure de fin,,,,datetime,"For integrated time average samples this is the date, time and timezone the sample was finished being taken."
Expand Down Expand Up @@ -94,7 +95,7 @@ Reporter,labIDDefault,Lab id default,ID de laboratoire par d�faut,Foreign key,
Reporter,contactName,Contact name,Nom du contact,,,,string,"Full Name of the reporter, either an organization or individual."
Reporter,contactEmail,Contact email,Adresse �lectronique de contact,,,,string,Contact e-mail address.
Reporter,contactPhone,Contact phone,T�l�phone de contact,,,,string,Contact phone number.
Reporter,organization,Organizatiion of reporter,organisation de l'enregistreur,,,,,
Reporter,organization,Organizatiion of reporter,organisation de journaliste,,,,,
Reporter,notes,Notes,Notes,,,,string,Any additional notes.
Lab,labID,Lab id,Identifiant du laboratoire,Primary Key,,,string,Unique identifier for the laboratory.
Lab,assayMethodIDDefault,Assay method id default,M�thode d'analyse id par d�faut,Foreign key,AssayMethod,assayMethodID,string,Used as default when a new measurement is created for this lab. See ID in AssayMethod table.
Expand Down