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.

Sign up for GitHub

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

New Hazard Categories #169

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

New Hazard Categories #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion application/queries/locationReportQueries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
def getChemInLoc(loc_data):
##Returns all containers, chem in Storages and rooms and floors in build
loc_cons = {"Building":"Buildings.bId == loc_data['Building']", "Floor":"Floors.fId == loc_data['Floor']", "Room":"Rooms.rId == loc_data['Room']", "Storage":"Storages.sId == loc_data['Storage']"}
haz_cons = {"reactive":"Chemicals.primaryHazard == 'Reactive'", "hh":"Chemicals.primaryHazard == 'Health Hazard'", "base":"Chemicals.primaryHazard == 'Base'", "oxi":"Chemicals.primaryHazard == 'Oxidizer'", "flam":"Chemicals.primaryHazard == 'Flammable'", "inorg_acid":"Chemicals.primaryHazard == 'Inorganic Acid'", "flam_solid":"Chemicals.primaryHazard == 'Flammable Solid'", "org_acid":"Chemicals.primaryHazard == 'Organic Acid'", "gen_haz":"Chemicals.primaryHazard == 'General Hazard'", "pres":"Chemicals.pressureFormer == True", "per":"Chemicals.peroxideFormer == True", "req_stab":"Chemicals.reqStabalizer == True", "tox_form":"Chemicals.toxicFormation == True", "p_list":"Chemicals.pListAcute == True"}
haz_cons = {"reactive":"Chemicals.primaryHazard == 'Reactive'", "org_haz":"Chemicals.primaryHazard == 'Organic Health Hazard'", "inorg_haz":"Chemicals.primaryHazard == 'Inorganic Health Hazard'", "hh":"Chemicals.primaryHazard == 'Health Hazard'", "base":"Chemicals.primaryHazard == 'Base'", "oxi":"Chemicals.primaryHazard == 'Oxidizer'", "flam":"Chemicals.primaryHazard == 'Flammable'", "inorg_acid":"Chemicals.primaryHazard == 'Inorganic Acid'", "flam_solid":"Chemicals.primaryHazard == 'Flammable Solid'", "org_acid":"Chemicals.primaryHazard == 'Organic Acid'", "gen_haz":"Chemicals.primaryHazard == 'General Hazard'", "pres":"Chemicals.pressureFormer == True", "per":"Chemicals.peroxideFormer == True", "req_stab":"Chemicals.reqStabalizer == True", "tox_form":"Chemicals.toxicFormation == True", "p_list":"Chemicals.pListAcute == True"}
##The ifs are to instanciate the where, not sure how else to do it
if loc_data["Building"] != "*":
wheres = eval(loc_cons["Building"])
Expand Down
4 changes: 4 additions & 0 deletions config/chemicalConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ addChemDropdowns:
# color: "Copper"
- "Health Hazard"
# color: "Blue"
- "Organic Health Hazard"
# color: "Blue"
- "Inorganic Health Hazard"
# color: "Blue"
- "Organic Acid"
# color: "Lavender"
- "Inorganic Acid"
Expand Down
8 changes: 8 additions & 0 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ hazards:
hazardColor: "Blue"
textColor: "#FFFFFF"
hexColor: "#0000FF"
"Organic Health Hazard":
hazardColor: "Blue"
textColor: "#FFFFFF"
hexColor: "#0000FF"
"Inorganic Health Hazard":
hazardColor: "Blue"
textColor: "#FFFFFF"
hexColor: "#0000FF"
"Inorganic Acid":
hazardColor: "Rose"
textColor: "#333333"
Expand Down
6 changes: 6 additions & 0 deletions config/reports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ ReportTypes:
health:
name: "Health Hazard"
id: "hh"
org_hazard:
name: "Organic Health Hazard"
id: "org_haz"
inorg_hazard:
name: "Inorganic Health Hazard"
id: "inorg_haz"
org_acid:
name: "Organic Acid"
id: "org_acid"
Expand Down