Skip to content

Commit

Permalink
fix treatment references and welcome markup
Browse files Browse the repository at this point in the history
  • Loading branch information
@adaurat
adaurat committed Dec 19, 2024
1 parent f8a07f6 commit 507529e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 35 deletions.
25 changes: 12 additions & 13 deletions qmra/risk_assessment/templates/risk-assessment-list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,23 @@ <h4 class="media-heading text-truncate kwb_headline">
function toggleText()
{
const less="Welcome to the QMRA Tool for Water Reuse!</br>";
const more = `Welcome to the QMRA Tool for Water Reuse</br>
This tool is designed to support Quantitative Microbial Risk Assessment (QMRA) for human health in the
const more = `<p class="mt-4">
<h5>Welcome to the QMRA Tool for Water Reuse</h5>
<p>This tool is designed to support Quantitative Microbial Risk Assessment (QMRA) for human health in the
context of water reuse. Whether you're evaluating the safety of treated wastewater or other reclaimed
water sources, this tool helps you assess potential health risks associated with microbial contaminants.</br>
</br>
Free and User-Friendly</br>
</br>
Our QMRA tool is completely free to use, offering you a powerful resource to assess microbial risks in
water reuse schemes. You can use the tool without logging in, making it quick and easy to get started.</br>
</br>
Enhanced Features for Registered Users</br>
</br>
Now that you have an account, you can:
water sources, this tool helps you assess potential health risks associated with microbial contaminants.</p>
<h5>Free and User-Friendly</h5>
<p>Our QMRA tool is completely free to use, offering you a powerful resource to assess microbial risks in
water reuse schemes. You can use the tool without logging in, making it quick and easy to get started.</p>
<h5>Enhanced Features for Registered Users</h5>
<p>Now that you have an account, you can:
<ul>
<li>Save Your Assessments: Store your risk assessments for future reference.</li>
<li>Compare Results: Analyze and compare multiple risk assessments side by side.</li>
<li>Export Options: Download and share your results in convenient formats.</li>
</ul>`
</ul>
Let's get started on your risk assessment journey!</p>
</p>`

if (status == "less") {
document.getElementById("textIntroduction").innerHTML = more;
Expand Down
18 changes: 11 additions & 7 deletions qmra/risk_assessment/templates/treatments-form-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@
const bacteria_ref = this.references[treatment.bacteria_reference]
const protozoa_ref = this.references[treatment.protozoa_reference]
uniques.add(treatment.name)
const ref = virus_ref === undefined ?
bacteria_ref === undefined ? protozoa_ref === undefined ? "#" : protozoa_ref : bacteria_ref : virus_ref
const link = ref.ReferenceLink;
const name = ref.ReferenceName;
inner += `<li>
<h5>${treatment.name}</h5>
<div class="text-muted small mb-4">${treatment.description}</div>
Expand All @@ -335,22 +339,22 @@ <h5>${treatment.name}</h5>
</tr>
<tr>
<td>Viruses</td>
<td>${treatment.viruses_min}</td>
<td>${treatment.viruses_max}</td>
<td>${treatment.viruses_min === null ? 'NA' : treatment.viruses_min}</td>
<td>${treatment.viruses_max === null ? 'NA' : treatment.viruses_max}</td>
</tr>
<tr>
<td>Bacteria</td>
<td>${treatment.bacteria_min}</td>
<td>${treatment.bacteria_max}</td>
<td>${treatment.bacteria_min === null ? 'NA' : treatment.bacteria_min}</td>
<td>${treatment.bacteria_max === null ? 'NA' : treatment.bacteria_max}</td>
</tr>
<tr>
<td>Protozoa</td>
<td>${treatment.protozoa_min}</td>
<td>${treatment.protozoa_max}</td>
<td>${treatment.protozoa_min === null ? 'NA' : treatment.protozoa_min}</td>
<td>${treatment.protozoa_max === null ? 'NA' : treatment.protozoa_max}</td>
</tr>
</table>
<div class="small"><sup>[1]</sup>values taken from <a href="${virus_ref.ReferenceLink}">${virus_ref.ReferenceName}</a></p>
<div class="small"><sup>[1]</sup>values taken from <a href="${link}">${name}</a></p>
</li>
`
}
Expand Down
24 changes: 10 additions & 14 deletions qmra/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,22 @@
</div>
<a class="btn btn-primary" href="{% url 'assessment' %}">Try out</a>
<p class="mt-4">
Welcome to the QMRA Tool for Water Reuse</br>
This tool is designed to support Quantitative Microbial Risk Assessment (QMRA) for human health in the
<h5>Welcome to the QMRA Tool for Water Reuse</h5>
<p>This tool is designed to support Quantitative Microbial Risk Assessment (QMRA) for human health in the
context of water reuse. Whether you're evaluating the safety of treated wastewater or other reclaimed
water sources, this tool helps you assess potential health risks associated with microbial contaminants.</br>
</br>
Free and User-Friendly</br>
</br>
Our QMRA tool is completely free to use, offering you a powerful resource to assess microbial risks in
water reuse schemes. You can use the tool without logging in, making it quick and easy to get started.</br>
</br>
Enhanced Features for Registered Users</br>
</br>
If you choose to log in, you'll unlock additional features that enhance your experience:
water sources, this tool helps you assess potential health risks associated with microbial contaminants.</p>
<h5>Free and User-Friendly</h5>
<p>Our QMRA tool is completely free to use, offering you a powerful resource to assess microbial risks in
water reuse schemes. You can use the tool without logging in, making it quick and easy to get started.</p>
<h5>Enhanced Features for Registered Users</h5>
<p>If you choose to log in, you'll unlock additional features that enhance your experience:
<ul>
<li>Save Your Assessments: Store your risk assessments for future reference.</li>
<li>Compare Results: Analyze and compare multiple risk assessments side by side.</li>
<li>Export Options: Download and share your results in convenient formats.</li>
</ul>
With or without an account, this tool provides robust risk estimations. Let's get started on your risk
assessment journey!
With or without an account, this tool provides risk estimations. Let's get started on your risk
assessment journey!</p>
</p>
<div class="row">
<div class="col-4">
Expand Down
2 changes: 1 addition & 1 deletion raw_public_data/tbl_treatment.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id,name,group,description
29,"UV disinfection 40 mJ/cm2, drinking","Primary disinfection","UV-light is mostly effective at 254 nm where it affects DNA or RNA thus preventing reproduction of the organism (inactivation). Log reduction for drinking water UV is based on closed UV-reactors wich have been validated according to appropriate standards (e.g. USEPA or DVGW). Effectiveness of disinfection depends on delivered fluence (dose in mJ/cm2), which varies with lamp intensity, exposure time (flow rate) and UV-absorption by the water (organics). Excessive turbidity and certain dissolved species inhibit this process; hence, turbidity should be kept below 1 NTU to support effective disinfection."
1,"Conventional clarification","Coagulation, flocculation and sedimentation","Consists of coagulant and/or flocculant aid (e.g. polymer) dosing, rapid mixing, slow mixing and sedimentation. Log removal depends on process optimisation. Rapid changes in source water quality such as turbidity increase due to monsoon rainfall or algeal blooms may decrease treatment effect and require adjustment of process settings."
2,"Dissolved air flotation","Coagulation, flocculation and sedimentation","Compressed air is injected in the water such that air bubbles bring suspended solids to the water surface where they are skimmed off. Coagulant may be dosed. Log removal depends on process optimisation. Rapid changes in source water quality such as turbidity increase due to monsoon rainfall or algeal blooms may decrease treatment effect and require adjustment of process settings."
3,"High-rate clarification","Coagulation, flocculation and sedimentation","Consists of coagulant and/or flocculant aid (e.g. polymer) dosing, mixing and enhanced sedimentation by flock blankets, lamellae- or tube settlers. Log removal depends on process optimisation. Rapid changes in source water quality such as turbidity increase due to monsoon rainfall or algeal blooms may decrease treatment effect and require adjustment of process settings."
3,High-rate clarification,"Coagulation, flocculation and sedimentation","Consists of coagulant and/or flocculant aid (e.g. polymer) dosing, mixing and enhanced sedimentation by flock blankets, lamellae- or tube settlers. Log removal depends on process optimisation. Rapid changes in source water quality such as turbidity increase due to monsoon rainfall or algeal blooms may decrease treatment effect and require adjustment of process settings."
4,"Lime softening","Coagulation, flocculation and sedimentation","Lime is dosed to the water to reduce hardness. When flocks are formed, they can entrap pathogens. Note that the technical design of the softening process affects the log reduction. e.g. pellet-softening has no effect on pathogens."
5,"Granular high-rate filtration","Filtration","Water is filtered through a fixed bed of granular media (e.g. sand) generally operatied down flow with rates of 5 to 20 m/h and contact times of 4 to 15 minutes. They are regularly backwashed to remove built up solids in the filter. Log removal depends on filter media and coagulation pretreatment;consistent low filtered water turbidity of ? 0.3 NTU (none to exceed 1 NTU)
are associated higher log removal of pathogens"
Expand Down

0 comments on commit 507529e

Please sign in to comment.