'[29956] openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/ module/rwandareports/defi'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openmrs-svn
Subject:    [29956] openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/ module/rwandareports/defi
From:       svn-noreply () openmrs ! org
Date:       2013-03-22 8:30:04
Message-ID: 20130322083004.D0AAC402A3 () 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>[29956] openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/module/rwandareports/definition/evaluator/DrugRegimenInformationEvaluator.java: \
add in drug detail info</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>29956</dd>
<dt>Author</dt> <dd>lara.kellett</dd>
<dt>Date</dt> <dd>2013-03-22 08:30:04 +0000 (Fri, 22 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>add in drug detail info</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmodulesrwandareportstrunkapisrcmainjavaorgopenmrsmodulerwandarepo \
rtsdefinitionevaluatorDrugRegimenInformationEvaluatorjava">openmrs-modules/rwandarepor \
ts/trunk/api/src/main/java/org/openmrs/module/rwandareports/definition/evaluator/DrugRegimenInformationEvaluator.java</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmodulesrwandareportstrunkapisrcmainjavaorgopenmrsmodulerwandareportsdefinitionevaluatorDrugRegimenInformationEvaluatorjava"></a>
 <div class="modfile"><h4>Modified: \
openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/module/rwandareports/definition/evaluator/DrugRegimenInformationEvaluator.java \
(29955 => 29956)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/module/rwandareports/definition/evaluator/DrugRegimenInformationEvaluator.java	2013-03-22 \
                08:04:27 UTC (rev 29955)
+++ openmrs-modules/rwandareports/trunk/api/src/main/java/org/openmrs/module/rwandareports/definition/evaluator/DrugRegimenInformationEvaluator.java	2013-03-22 \
08:30:04 UTC (rev 29956) </span><span class="lines">@@ -107,17 +107,14 @@
</span><span class="cx"> 				
</span><span class="cx"> 				if(pd.isShowDrugDetails() &amp;&amp; (pd.getIndication() \
== null || pd.getIndication().equals(order.getIndication()))) </span><span \
class="cx"> 				{ </span><del>-					if(drugs.length() &gt; 0)
</del><ins>+					if((OpenmrsUtil.compare(order.getStartDate(), pd.getAsOfDate()) \
&gt;= 0) &amp;&amp; (pd.getUntilDate() == null || \
OpenmrsUtil.compare(order.getStartDate(), pd.getUntilDate()) &lt;= 0)) </ins><span \
class="cx"> 					{ </span><del>-						drugs.append(&quot;, &quot;);
</del><ins>+						drugs.append(&quot;\n&quot;);
+						drugs.append(order.getDrug().getName());
+						drugs.append(&quot; &quot;);
+						drugs.append(order.getDose());
+						drugs.append(order.getUnits());
</ins><span class="cx"> 					}
</span><del>-					else{
-						drugs.append(&quot; /n\n&quot;);
-					}
-					drugs.append(order.getDrug().getName());
-					drugs.append(&quot; &quot;);
-					drugs.append(order.getDose());
-					drugs.append(order.getUnits());
</del><span class="cx"> 				}
</span><span class="cx"> 				
</span><span class="cx"> 				if (order.getRoute() != null &amp;&amp; \
iv.contains(order.getRoute())) { </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 />
&nbsp;<br />
&nbsp;<br />


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic