Skip to content

Commit

Permalink
Incorporating jkondrat's styling - RA-344
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkayiwa
dkayiwa committed Sep 3, 2014
1 parent 08daaf0 commit 16148eb
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 116 deletions.
31 changes: 12 additions & 19 deletions omod/src/main/java/org/openmrs/module/allergyui/page/controller/AllergyPageController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import org.openmrs.Concept;
import org.openmrs.Patient;
import org.openmrs.activelist.AllergySeverity;
import org.openmrs.api.ConceptService;
import org.openmrs.module.allergyapi.Allergen;
import org.openmrs.module.allergyapi.AllergenType;
Expand All @@ -32,17 +31,14 @@ public class AllergyPageController {

public static final String ALLERGY_REACTIONS_UUID = "162555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

public static final String MODERATE_UUID = "1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

public static final String MILD_UUID = "1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

public static final String SEVERE_UUID = "1500AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
public static final String ALLERGY_SEVERITIES_UUID = "159411AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

public void controller(PageModel model, @RequestParam("patientId") Patient patient, UiUtils ui,
@SpringBean("allergyService") PatientService patientService,
@SpringBean("conceptService") ConceptService conceptService) {

model.addAttribute("patient", patient);
model.addAttribute("allergenTypes", AllergenType.values());

//drug allergens
List<Concept> concepts = new ArrayList<Concept>();
Expand Down Expand Up @@ -75,10 +71,18 @@ public void controller(PageModel model, @RequestParam("patientId") Patient patie
concepts = concept.getSetMembers();
}
model.addAttribute("allergyReactions", concepts);

//severities
concepts = new ArrayList<Concept>();
concept = conceptService.getConceptByUuid(ALLERGY_SEVERITIES_UUID);
if (concept != null) {
concepts = concept.getSetMembers();
}
model.addAttribute("severities", concepts);
}

public String post(@RequestParam("patientId") Patient patient, @RequestParam("allergen") Concept allergen,
@RequestParam("severity") AllergySeverity severity,
@RequestParam("severity") Concept severity,
@RequestParam(value = "comment", required = false) String comment,
@RequestParam("allergyType") AllergenType allergenType,
@RequestParam("reaction") List<Concept> reactionConcepts,
Expand All @@ -87,8 +91,7 @@ public String post(@RequestParam("patientId") Patient patient, @RequestParam("al
PageModel model, HttpSession session, UiUtils ui) {

Allergen algn = new Allergen(allergenType, allergen, null);
Concept severityConcept = getSeverityConcept(severity, conceptService);
Allergy allergy = new Allergy(patient, algn, severityConcept, comment, null);
Allergy allergy = new Allergy(patient, algn, severity, comment, null);
List<AllergyReaction> reactions = getAllergyReactions(reactionConcepts, allergy);
allergy.setReactions(reactions);

Expand All @@ -101,16 +104,6 @@ public String post(@RequestParam("patientId") Patient patient, @RequestParam("al
return "redirect:allergyui/allergies.page?patientId=" + patient.getPatientId();
}

private Concept getSeverityConcept(AllergySeverity severity, ConceptService conceptService) {
if (severity == AllergySeverity.MILD) {
return conceptService.getConceptByUuid(MILD_UUID);
} else if (severity == AllergySeverity.MODERATE) {
return conceptService.getConceptByUuid(MODERATE_UUID);
} else {
return conceptService.getConceptByUuid(SEVERE_UUID);
}
}

private List<AllergyReaction> getAllergyReactions(List<Concept> reactionConcepts, Allergy allergy) {
List<AllergyReaction> reactions = new ArrayList<AllergyReaction>();
for (Concept concept : reactionConcepts) {
Expand Down
199 changes: 102 additions & 97 deletions omod/src/main/webapp/pages/allergy.gsp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<%
ui.decorateWith("appui", "standardEmrPage")
ui.includeJavascript("uicommons", "angular.js")
ui.includeJavascript("allergyui", "allergy.js")
ui.includeJavascript("allergyui", "allergy.js")
%>
<script type="text/javascript">
var breadcrumbs = [
Expand All @@ -11,8 +10,6 @@
{ label: "${ ui.message("allergyui.allergies") }", link: '${ui.pageLink("allergyui", "allergies", [patientId: patient.id])}'},
{ label: "${ ui.message("allergyui.newAllergy") }" }
];
var patient = { id: ${ patient.id } };
</script>

${ ui.includeFragment("coreapps", "patientHeader", [ patient: patient ]) }
Expand All @@ -21,98 +18,106 @@ ${ ui.includeFragment("coreapps", "patientHeader", [ patient: patient ]) }
${ ui.message("allergyui.addNewAllergy") }
</h2>

<style>
table tr td {
border: none;
display: inline-block;
}
table:not(.unstyled) tr:nth-child(even) {
background: white;
}
</style>

<div ng-app="allergyApp" ng-controller="allergyController">
<form method="post" action="${ ui.pageLink("allergyui", "allergy", [patientId: patient.id]) }">
<table id="allergy">
<tr>
<td>
${ ui.message("allergyui.categories") }
</td>
<td>
<input type="radio" name="allergyType" ng-model="allergyType" value="DRUG" checked="checked"> ${ ui.message("allergyui.drug") }
</td>
<td>
<input type="radio" name="allergyType" ng-model="allergyType" value="FOOD"> ${ ui.message("allergyui.food") }
</td>
<td>
<input type="radio" name="allergyType" ng-model="allergyType" value="ENVIRONMENT"> ${ ui.message("allergyui.environment") }
</td>
</tr>
<tr>
<td colspan="2">
<fieldset>
<legend>${ui.message("allergyui.allergen")}:</legend>
<p ng-show="allergyType == 'DRUG'">
<% drugAllergens.each { allergen -> %>
<input type="radio" name="allergen" value="${allergen.id}">${allergen.name}<br/>
<% } %>
</p>
<p ng-show="allergyType == 'FOOD'">
<% foodAllergens.each { allergen -> %>
<input type="radio" name="allergen" value="${allergen.id}">${allergen.name}<br/>
<% } %>
</p>
<p ng-show="allergyType == 'ENVIRONMENT'">
<% environmentalAllergens.each { allergen -> %>
<input type="radio" name="allergen" value="${allergen.id}">${allergen.name}<br/>
<% } %>
</p>
</fieldset>
</td>
<td colspan="2">
<fieldset>
<legend>${ui.message("allergyui.reactionSelection")}</legend>
<% allergyReactions.each { reaction -> %>
<input type="checkbox" name="reaction" value="${reaction.id}">${reaction.name}<br/>
<form method="post" id="allergy" action="${ ui.pageLink("allergyui", "allergy", [patientId: patient.id]) }">
<div id="types" class="horizontal inputs">
<label>${ ui.message("allergyui.categories") }:</label>
<% allergenTypes.eachWithIndex { category, idx -> %>
<div><input type="radio" name="allergyType" ng-model="allergyType" value="${ category }" ${ if(idx == 0) "checked=checked" }>${ category }</div>
<% } %>
</div>
<div class="horizontal tabs">
<div id="allergens" class="tab">
<label>${ ui.message("allergyui.allergen") }:</label>
<div ng-show="allergyType == 'DRUG'">
<% drugAllergens.each { allergen -> %>
<div><input type="radio" name="allergen" value="${allergen.id}">${allergen.name}</div>
<% } %>
</div>
<div ng-show="allergyType == 'FOOD'">
<% foodAllergens.each { allergen -> %>
<div><input type="radio" name="allergen" value="${allergen.id}">${allergen.name}</div>
<% } %>
</div>
<div ng-show="allergyType == 'ENVIRONMENTAL'">
<% environmentalAllergens.each { allergen -> %>
<div><input type="radio" name="allergen" value="${allergen.id}">${allergen.name}</div>
<% } %>
</fieldset>
</td>
</tr>
<tr>
<td>
${ ui.message("allergyui.severity") }
</td>
<td>
<input type="radio" name="severity" value="MILD"> ${ ui.message("allergyui.mild") }
</td>
<td>
<input type="radio" name="severity" value="MODERATE"> ${ ui.message("allergyui.moderate") }
</td>
<td>
<input type="radio" name="severity" value="SEVERE"> ${ ui.message("allergyui.severe") }
</td>
</tr>
<tr>
<td>
${ ui.message("allergyui.comment") }
</td>
<td colspan="3" style="width:80%">
<input type="text" name="comment">
</td>
</tr>
<tr>
<td colspan="3">
<button class="cancel" onclick="location.href='${ ui.pageLink("allergyui", "allergies", [patientId: patient.id]) }'; return false;">
${ ui.message("coreapps.cancel") }
</button>
</td>
<td align="right" style="float:right">
<button class="confirm" type="submit">
${ ui.message("coreapps.save") }
</button>
</td>
</tr>
</table>
</form>
</div>
</div>
</div>
<div id="reactions" class="tabs tab">
<label>${ ui.message("allergyui.reactionSelection") }:</label>
<% allergyReactions.each { reaction -> %>
<div><input type="checkbox" name="reaction" value="${reaction.id}">${reaction.name}</div>
<% } %>
</div>
</div>
<div id="severities" class="horizontal inputs">
<label>${ ui.message("allergyui.severity") }:</label>
<% severities.each { severity -> %>
<div><input type="radio" name="severity" value="${severity.id}">${severity.name}</div>
<% } %>
</div>
<div id="comment" class="horizontal inputs">
<label>${ ui.message("allergyui.comment") }:</label>
<input type="text" name="comment"/>
</div>
<div id="actions">
<input type="submit" id="addAllergyBtn" class="confirm right" value="${ ui.message("coreapps.save") }" />
<input type="button" class="cancel" value="${ ui.message("coreapps.cancel") }"
onclick="location.href='${ ui.pageLink("allergyui", "allergies", [patientId: patient.id]) }'" />
</div>
</form>
</div>

<style>
#allergy label {
font-weight: bold;
}
.horizontal {
display: table;
}
.horizontal > * {
display: table-cell;
}
.tabs {
width: 100%;
}
.tabs > div {
width: 50%;
}
#reactions > div {
float: left;
}
#reactions > div:nth-child(even) {
clear: both;
}
form, #allergens, #reactions {
border: 1px solid #DDD;
border-collapse: collapse;
padding: 20px;
}
.tab {
padding-top: 0px !important;
}
.tab > label {
padding-bottom: 15px;
}
form > div {
margin-bottom: 15px;
}
.inputs > div, .inputs > label {
padding-right: 20px;
}
</style>

0 comments on commit 16148eb

Please sign in to comment.