add DB v0.3 (2018-09-07) with "ui-workflow/"

KWB-R · Sep 25, 2018 · faab19b · faab19b
1 parent 3036705
commit faab19b
Show file tree

Hide file tree

Showing 19 changed files with 1,129 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,12 @@
+# v0.3
+
+Status after internal QA with DB expert Hauke:
+- Improved naming of tables and columns
+- Added referential integrety for table connections
+- Updated DB structure 
+- Updated UI flowchart ("/ui-workflow") and added relevant 
+ACCESS table names for each step
+
 # v0.2
 
 Based on v0.1

diff --git a/db-initialGeneration.R b/db-initialGeneration.R
@@ -1,3 +1,9 @@
+### R script for generating initial MS ACCESS DB structure based on Old Ford 
+### public irrigation scenario
+### (used for generating version v0.1/v0.2 of MS ACCESS DB)
+### NOT REQUIRED FOR LATER VERSIONS oF MS ACCESS DB !!!!!!
+
+if (FALSE) {
 devtools::install_github("kwb-r/kwb.qmra")
 devtools::install_github("kwb-r/kwb.db")
 
@@ -136,4 +142,4 @@ for (table_name in table_names) {
   )
 }
 
-
+}
diff --git a/qmra-db.accdb b/qmra-db.accdb
diff --git a/qmra-db_accdb/qry_treatmentRemovals.csv b/qmra-db_accdb/qry_treatmentRemovals.csv
diff --git a/qmra-db_accdb/tbl_exposure.csv b/qmra-db_accdb/tbl_exposure.csv
@@ -0,0 +1,7 @@
+"WaterUseID","WaterUseName","events_perYear","litres_perEvent","ReferenceID"
+1,"irrigation, unrestricted",NA,NA,NA
+2,"domestic use, car washing",NA,NA,NA
+7,"irrigation, public",50,0.001,NA
+3,"irrigation, restricted",NA,NA,NA
+4,"domestic use, toilet flushing",1000,1e-05,NA
+5,"drinking water",365,1,NA
diff --git a/qmra-db_accdb/tbl_guideline.csv b/qmra-db_accdb/tbl_guideline.csv
@@ -0,0 +1,3 @@
+"GuidelineID","GuidelineName","ReferenceID"
+1,"WHO 10-6 DALY",40
+2,"NL 1/10000 infection risk",NA
diff --git a/qmra-db_accdb/tbl_inflow.csv b/qmra-db_accdb/tbl_inflow.csv
@@ -1,8 +1,8 @@
 "PathogenID","ReferenceID","WaterSourceID","min","max"
-3,39,2,100,1e+06
-6,39,2,1000000,1e+10
-23,39,2,100,1e+06
-27,39,2,1,1000
-32,39,2,50,5000
-34,39,2,1,10000
-36,39,2,1,10000
+3,39,8,100,1e+06
+6,39,8,1000000,1e+10
+23,39,8,100,1e+06
+27,39,8,1,1000
+32,39,8,50,5000
+34,39,8,1,10000
+36,39,8,1,10000
diff --git a/...-db_accdb/tbl_treatment_processes_kwb.csv → qmra-db_accdb/tbl_logRemoval.csv b/...-db_accdb/tbl_treatment_processes_kwb.csv → qmra-db_accdb/tbl_logRemoval.csv
@@ -52,3 +52,15 @@
 20,2,6,8,1
 20,0,1.5,8,3
 20,1,3,8,2
+21,6,6,8,1
+21,6,6,6,2
+21,6,6,6,3
+22,2,6,8,1
+22,3,6,8,2
+23,1.5,2.5,8,1
+23,0.5,1.5,8,3
+24,0.5,3,8,1
+24,0.5,2,8,3
+25,2,4,8,1
+25,1,3,8,2
+25,3,3,8,3
diff --git a/qmra-db_accdb/tbl_pathogens.csv → qmra-db_accdb/tbl_pathogen.csv b/qmra-db_accdb/tbl_pathogens.csv → qmra-db_accdb/tbl_pathogen.csv
diff --git a/qmra-db_accdb/tbl_pathogenGroups.csv → qmra-db_accdb/tbl_pathogenGroup.csv b/qmra-db_accdb/tbl_pathogenGroups.csv → qmra-db_accdb/tbl_pathogenGroup.csv
diff --git a/qmra-db_accdb/tbl_references.csv → qmra-db_accdb/tbl_reference.csv b/qmra-db_accdb/tbl_references.csv → qmra-db_accdb/tbl_reference.csv
diff --git a/qmra-db_accdb/tbl_treatment.csv b/qmra-db_accdb/tbl_treatment.csv
@@ -0,0 +1,34 @@
+"TreatmentID","TreatmentName","TreatmentGroup"
+27,"Ultrafiltration","Filtration"
+28,"Nanofiltration","Filtration"
+1,"Conventional clarification","Coagulation, flocculation and sedimentation"
+2,"Dissolved air flotation","Coagulation, flocculation and sedimentation"
+3,"High-rate clarification","Coagulation, flocculation and sedimentation"
+4,"Lime softening","Coagulation, flocculation and sedimentation"
+5,"Granular high-rate filtration","Filtration"
+6,"Membrane filtration (micro, ultra-, nanofiltration, reverse osmosis)","Filtration"
+7,"Precoat filtration","Filtration"
+8,"Slow sand filtration","Filtration"
+9,"Bank filtration","Pretreatment"
+10,"Roughing filters","Pretreatment"
+11,"Storage reservoirs","Pretreatment"
+12,"Chlorine","Primary disinfection"
+13,"Chlorine dioxide","Primary disinfection"
+14,"Ozone","Primary disinfection"
+15,"UV","Primary disinfection"
+16,"Primary treatment","Pretreatment"
+17,"Secondary treatment","Pretreatment"
+18,"Dual media filtration","Filtration"
+19,"Membrane filtration","Filtration"
+20,"Chlorination","Primary disinfection"
+21,"Reverse osmosis
+os-
+mosis","Filtration"
+22,"Ozonation","Primary disinfection"
+23,"Wetlands, surface flow
+(surface 
+Wetlands, surface flow",NA
+24,"Wetlands, subsurface flow",NA
+25,"UV radiation
+UV","Primary disinfection"
+26,"Microfiltration","Filtration"

diff --git a/qmra-db_accdb/tbl_treatment_processes.csv b/qmra-db_accdb/tbl_treatment_processes.csv
diff --git a/qmra-db_accdb/tbl_waterSource.csv b/qmra-db_accdb/tbl_waterSource.csv
@@ -1,3 +1,9 @@
 "WaterSourceID","WaterSourceName"
-1,"drinking water"
-2,"untreated wastewater"
+1,"sewage, treated"
+2,"surface water"
+3,"surface water, contaminated"
+4,"surface water, protected"
+5,"harvesting, rainwater"
+6,"harvesting, stormwater"
+7,"drinking water"
+8,"sewage, raw"
diff --git a/qmra-db_accdb/tbl_wateruse.csv b/qmra-db_accdb/tbl_wateruse.csv
diff --git a/qmra-db_structure.jpg b/qmra-db_structure.jpg
diff --git a/ui-workflow/ui_workflow_detailed_CHANGELOG.txt b/ui-workflow/ui_workflow_detailed_CHANGELOG.txt
@@ -0,0 +1,15 @@
+QMRA_workflow_detailed_v0.3
+
+Integrated adaptations after 2nd telephone call: 
+- Specified selection options for water source, use and guidelines 
+(treatments still need to be defined and haromonised!)
+
+- Added data sources for each step (as defined in "kwb.qmra.v0.3.accdb")
+- Added color "red" for options to be shown in first version of UI
+- Added legend
+
+
+QMRA_workflow_detailed_v0.2
+
+first version on KWR sharepoint (sent as preparatory document 
+for 2nd telefone call)