[prev in list] [next in list] [prev in thread] [next in thread]
List: openmrs-svn
Subject: [30579] openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/ lancearmstrong: minor updates
From: svn-noreply () openmrs ! org
Date: 2014-03-26 3:31:10
Message-ID: 20140326033110.76FFA40280 () openmrs ! osuosl ! org
[Download RAW message or body]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30579] openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong: \
minor updates</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>30579</dd>
<dt>Author</dt> <dd>jeremy</dd>
<dt>Date</dt> <dd>2014-03-26 03:31:10 +0000 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>minor updates</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongLafSer \
viceImpljava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/LafServiceImpl.java</a></li>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongexten \
sionhtmlFollowCareAlertjava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/FollowCareAlert.java</a></li>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongexten \
sionhtmlPatientCommunitiesjava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientCommunities.java</a></li>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongexten \
sionhtmlPatientFollowCarejava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientFollowCare.java</a></li>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongexten \
sionhtmlPatientToxicitiesjava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientToxicities.java</a></li>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongexten \
sionhtmlPatientTreatmentSummaryjava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientTreatmentSummary.java</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextens \
ionhtmlLAPatientDashboardTabExtjava">openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/LAPatientDashboardTabExt.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongLafServiceImpljava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/LafServiceImpl.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/LafServiceImpl.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/LafServiceImpl.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> */
</span><span class="cx"> //find genetic_abnormality flag and answer
</span><span class="cx"> //block any follow-up tests from appearing:
</span><del>- // 1) IF the patient answers \x91YES\x92 to genetic \
abnormality, and </del><ins>+ // 1) IF the patient answers YES to genetic \
abnormality, and </ins><span class="cx"> // 2) THEN answers FAP/HNPCC/or \
INFLAMMATORY BOWEL DISORDER </span><span class="cx"> //find genetic abnormality \
flag </span><span class="cx"> Concept cancerAbnormalityToldConcept = \
Context.getConceptService().getConcept(CANCER_ABNORMALITY_TOLD); \
</span></span></pre></div> <a \
id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlFollowCareAlertjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/FollowCareAlert.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/FollowCareAlert.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/FollowCareAlert.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -13,18 +13,14 @@
</span><span class="cx"> */
</span><span class="cx"> package org.openmrs.module.lancearmstrong.extension.html;
</span><span class="cx">
</span><del>-import java.util.HashMap;
-import java.util.Map;
-
</del><span class="cx"> import org.openmrs.module.Extension;
</span><del>-import org.openmrs.module.web.extension.PatientDashboardTabExt;;
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * This class defines the links that will appear on the \
administration page under the </span><span class="cx"> * \
"basicmodule.title" heading. This extension is enabled by defining \
(uncommenting) it in the </span><span class="cx"> * /metadata/config.xml file.
</span><span class="cx"> */
</span><del>-public class FollowCareAlert extends PatientDashboardTabExt {
</del><ins>+public class FollowCareAlert extends LAPatientDashboardTabExt {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @see \
org.openmrs.module.web.extension.AdministrationSectionExt#getMediaType() \
</span></span></pre></div> <a \
id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlLAPatientDashboardTabExtjava"></a>
<div class="addfile"><h4>Added: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/LAPatientDashboardTabExt.java \
(0 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/LAPatientDashboardTabExt.java \
(rev 0)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/LAPatientDashboardTabExt.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/**
+ * The contents of this file are subject to the OpenMRS Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://license.openmrs.org
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * Copyright (C) OpenMRS, LLC. All Rights Reserved.
+ */
+
+package org.openmrs.module.lancearmstrong.extension.html;
+
+import org.openmrs.module.web.extension.PatientDashboardTabExt;
+
+public abstract class LAPatientDashboardTabExt extends PatientDashboardTabExt {
+
+ private Integer order;
+
+ @Override
+ public Integer getOrder() {
+ return order;
+ }
+
+ public void setOrder(Integer order) {
+ this.order = order;
+ }
+}
</ins></span></pre></div>
<a id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlPatientCommunitiesjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientCommunities.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientCommunities.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientCommunities.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -13,20 +13,16 @@
</span><span class="cx"> */
</span><span class="cx"> package org.openmrs.module.lancearmstrong.extension.html;
</span><span class="cx">
</span><del>-import java.util.HashMap;
-import java.util.Map;
-
</del><span class="cx"> import org.openmrs.api.context.Context;
</span><span class="cx"> import org.openmrs.module.Extension;
</span><del>-import org.openmrs.module.web.extension.PatientDashboardTabExt;;
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * This class defines the links that will appear on the \
administration page under the </span><span class="cx"> * \
"basicmodule.title" heading. This extension is enabled by defining \
(uncommenting) it in the </span><span class="cx"> * /metadata/config.xml file.
</span><span class="cx"> */
</span><del>-public class PatientCommunities extends PatientDashboardTabExt {
-
</del><ins>+public class PatientCommunities extends LAPatientDashboardTabExt {
+
</ins><span class="cx"> /**
</span><span class="cx"> * default constructor: set display order attribute
</span><span class="cx"> */
</span></span></pre></div>
<a id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlPatientFollowCarejava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientFollowCare.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientFollowCare.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientFollowCare.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -13,19 +13,15 @@
</span><span class="cx"> */
</span><span class="cx"> package org.openmrs.module.lancearmstrong.extension.html;
</span><span class="cx">
</span><del>-import java.util.HashMap;
-import java.util.Map;
-
</del><span class="cx"> import org.openmrs.api.context.Context;
</span><span class="cx"> import org.openmrs.module.Extension;
</span><del>-import org.openmrs.module.web.extension.PatientDashboardTabExt;;
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * This class defines the links that will appear on the \
administration page under the </span><span class="cx"> * \
"basicmodule.title" heading. This extension is enabled by defining \
(uncommenting) it in the </span><span class="cx"> * /metadata/config.xml file.
</span><span class="cx"> */
</span><del>-public class PatientFollowCare extends PatientDashboardTabExt {
</del><ins>+public class PatientFollowCare extends LAPatientDashboardTabExt {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * default constructor: set display order attribute
</span></span></pre></div>
<a id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlPatientToxicitiesjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientToxicities.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientToxicities.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientToxicities.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -13,27 +13,34 @@
</span><span class="cx"> */
</span><span class="cx"> package org.openmrs.module.lancearmstrong.extension.html;
</span><span class="cx">
</span><del>-import java.util.HashMap;
-import java.util.Map;
-
</del><ins>+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
</ins><span class="cx"> import org.openmrs.api.context.Context;
</span><span class="cx"> import org.openmrs.module.Extension;
</span><del>-import org.openmrs.module.web.extension.PatientDashboardTabExt;;
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * This class defines the links that will appear on the \
administration page under the </span><span class="cx"> * \
"basicmodule.title" heading. This extension is enabled by defining \
(uncommenting) it in the </span><span class="cx"> * /metadata/config.xml file.
</span><span class="cx"> */
</span><del>-public class PatientToxicities extends PatientDashboardTabExt {
-
</del><ins>+public class PatientToxicities extends LAPatientDashboardTabExt {
+
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ private Integer DEFAULT_ORDER = 3;
+
</ins><span class="cx"> /**
</span><span class="cx"> * default constructor: set display order attribute
</span><span class="cx"> */
</span><span class="cx"> public PatientToxicities() {
</span><span class="cx"> super();
</span><span class="cx"> String order = \
Context.getAdministrationService().getGlobalProperty("lancearmstrong.PatientToxicities.displayorder");
</span><del>- this.setOrder(Integer.valueOf(order==null? "3": order));
</del><ins>+ try {
+ this.setOrder(order == null ? DEFAULT_ORDER : Integer.valueOf(order));
+ } catch (NumberFormatException e) {
+ log.warn("could not set order to " + order + ", using default of \
3.", e); + this.setOrder(DEFAULT_ORDER);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="openmrsmoduleslancearmstrongtrunksrcorgopenmrsmodulelancearmstrongextensionhtmlPatientTreatmentSummaryjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientTreatmentSummary.java \
(30578 => 30579)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientTreatmentSummary.java 2014-03-25 \
18:54:22 UTC (rev 30578)
+++ openmrs-modules/lancearmstrong/trunk/src/org/openmrs/module/lancearmstrong/extension/html/PatientTreatmentSummary.java 2014-03-26 \
03:31:10 UTC (rev 30579) </span><span class="lines">@@ -13,19 +13,15 @@
</span><span class="cx"> */
</span><span class="cx"> package org.openmrs.module.lancearmstrong.extension.html;
</span><span class="cx">
</span><del>-import java.util.HashMap;
-import java.util.Map;
-
</del><span class="cx"> import org.openmrs.api.context.Context;
</span><span class="cx"> import org.openmrs.module.Extension;
</span><del>-import org.openmrs.module.web.extension.PatientDashboardTabExt;;
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * This class defines the links that will appear on the \
administration page under the </span><span class="cx"> * \
"basicmodule.title" heading. This extension is enabled by defining \
(uncommenting) it in the </span><span class="cx"> * /metadata/config.xml file.
</span><span class="cx"> */
</span><del>-public class PatientTreatmentSummary extends PatientDashboardTabExt {
</del><ins>+public class PatientTreatmentSummary extends LAPatientDashboardTabExt {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * default constructor: set display order attribute
</span></span></pre>
</div>
</div>
</body>
</html>
<p></p>
-- <br />
-- OpenMRS Subversion Commits: <a \
href="http://go.openmrs.org/svn">http://go.openmrs.org/svn</a><br /> Posting is not \
allowed - please join dev@openmrs.org for discussion.<br />
Unsubscribe: svn+unsubscribe@openmrs.org<br />
<p></p>
To unsubscribe from this group and stop receiving emails from it, send an email to <a \
href="mailto:svn+unsubscribe@openmrs.org">svn+unsubscribe@openmrs.org</a>.<br />
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic