[prev in list] [next in list] [prev in thread] [next in thread]
List: openmrs-svn
Subject: [31008] openmrs-modules/chica/branches/PersonAddressError: chica person address error - apply latest
From: svn-noreply () openmrs ! org
Date: 2014-11-20 16:59:25
Message-ID: 20141120165925.9B8C84030A () 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>[31008] openmrs-modules/chica/branches/PersonAddressError: chica person \
address error - apply latest trunk changes to this branch</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>31008</dd>
<dt>Author</dt> <dd>msheley</dd>
<dt>Date</dt> <dd>2014-11-20 16:59:24 +0000 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>chica person address error - apply latest trunk changes to this branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmoduleschicabranchesPersonAddressErrorruleLibraryadolescentsexual \
itySexuality_Possible_Pregnancy_PWSmlm">openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/adolescent \
sexuality/Sexuality_Possible_Pregnancy_PWS.mlm</a></li> <li><a \
href="#openmrsmoduleschicabranchesPersonAddressErrorwebmodulepsfMobileDynamicjsp">open \
mrs-modules/chica/branches/PersonAddressError/web/module/psfMobileDynamic.jsp</a></li>
<li><a href="#openmrsmoduleschicabranchesPersonAddressErrorwebmoduleresourcespsfMobil \
eDynamicjs">openmrs-modules/chica/branches/PersonAddressError/web/module/resources/psfMobileDynamic.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#openmrsmoduleschicabranchesPersonAddressErrorruleLibrarydietExercisePWSm \
lm">openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/dietExercisePWS.mlm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmoduleschicabranchesPersonAddressErrorruleLibraryadolescentsexualitySexuality_Possible_Pregnancy_PWSmlm"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/adolescent \
sexuality/Sexuality_Possible_Pregnancy_PWS.mlm (31007 => 31008)</h4> <pre \
class="diff"><span> <span class="info">--- \
openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/adolescent \
sexuality/Sexuality_Possible_Pregnancy_PWS.mlm 2014-11-20 16:52:05 \
UTC (rev 31007)
+++ openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/adolescent \
sexuality/Sexuality_Possible_Pregnancy_PWS.mlm 2014-11-20 16:59:24 UTC (rev 31008) \
</span><span class="lines">@@ -29,7 +29,7 @@ </span><span class="cx"> pregnant := \
read Last {might_be_pregnant from CHICA} Where it Occurred Within Past 14 Days; \
</span><span class="cx"> endif
</span><span class="cx"> ;;
</span><del>-Priority: 20;;
</del><ins>+Priority: 19;;
</ins><span class="cx"> Evoke: ;;
</span><span class="cx"> Logic:
</span><span class="cx"> If (mode = PRODUCE) then
</span></span></pre></div>
<a id="openmrsmoduleschicabranchesPersonAddressErrorruleLibrarydietExercisePWSmlm"></a>
<div class="addfile"><h4>Added: \
openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/dietExercisePWS.mlm (0 \
=> 31008)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/dietExercisePWS.mlm \
(rev 0)
+++ openmrs-modules/chica/branches/PersonAddressError/ruleLibrary/dietExercisePWS.mlm 2014-11-20 \
16:59:24 UTC (rev 31008) </span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+Maintenance:
+ Title: Diet and Exercize PWS;;
+ Filename: dietExercisePWS;;
+ Version: 1.0;;
+ Institution: Indiana University School of Medicine;;
+ Author: Tammy Dugan;;
+ Specialist: Pediatrics;;
+ Date: 2014-10-27 15:20:00;;
+ Validation: ;;
+Library:
+ Purpose: Merge indicator on PWS if Diet and Exercise box checked \
;; + Explanation: \
;; + Keywords: diet, exercise;;
+ Citations: ;;
+ Links: ;;
+Knowledge:
+ Type: data_driven;;
+Data:
+
+mode:=read {mode from Parameters};
+Box1:=read {box1 from Parameters};
+Box2:=read {box2 from Parameters};
+Box3:=read {box3 from Parameters};
+Box4:=read {box4 from Parameters};
+Box5:=read {box5 from Parameters};
+Box6:=read {box6 from Parameters};
+
+If (mode = PRODUCE) then
+handoutReviewed := read {Handout_Reviewed_by_MA from CHICA} Where it Occurred Within \
Past 1 Days; \
+endif
+;;
+Priority: ;;
+ Evoke: ;;
+Logic:
+If (mode = PRODUCE) then
+
+If 'diet and exercise' is in handoutReviewed then || DietAndExeGivenLabel || = \
"Diet and Exercise Handout Given"; +
+conclude True; \
+
+endif
+;;
+Action:
+write ("|| DietAndExeGivenLabel ||") At DietAndExeGivenLabel; \
+
+;;
+Age_Min: 0 years;;
+Age_Max: 21 years;;
+end:
</ins></span></pre></div>
<a id="openmrsmoduleschicabranchesPersonAddressErrorwebmodulepsfMobileDynamicjsp"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/branches/PersonAddressError/web/module/psfMobileDynamic.jsp \
(31007 => 31008)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/branches/PersonAddressError/web/module/psfMobileDynamic.jsp 2014-11-20 \
16:52:05 UTC (rev 31007)
+++ openmrs-modules/chica/branches/PersonAddressError/web/module/psfMobileDynamic.jsp 2014-11-20 \
16:59:24 UTC (rev 31008) </span><span class="lines">@@ -59,7 +59,11 @@
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><del>-<body style="font-size: 20px" \
onLoad="init('${patient.givenName}&nbsp;${patient.familyName}', \
'${patient.birthdate}', '${formInstance}', '${formId}', '${formInstanceId}', \
'${encounterId}')"> </del><ins>+<c:set var="search" \
value="'" /> +<c:set var="replace" value="\\'" \
/> +<c:set var="newFirstName" \
value="${fn:replace(patient.givenName, search, replace)}"/> +<c:set \
var="newLastName" value="${fn:replace(patient.familyName, search, \
replace)}"/> +<body style="font-size: 20px" \
onLoad="init('${newFirstName}&nbsp;${newLastName}', '${patient.birthdate}', \
'${formInstance}', '${formId}', '${formInstanceId}', '${encounterId}')"> \
</ins><span class="cx"> <form id="psfForm" method="POST" \
data-ajax="false"> </span><span class="cx"> <c:if \
test="${errorMessage != null}"> </span><span class="cx"> <div \
id="error_dialog" class="extended-header" \
data-role="dialog" data-close-btn="none" \
data-dismissible="false" data-theme="b" \
data-overlay-theme="c"> </span><span class="lines">@@ -78,7 +82,7 @@
</span><span class="cx"> <div data-role="header" \
class="single-line-header" > </span><span class="cx"> \
<h1>Pre-Screener:</h1> </span><span class="cx"> \
<h1>${patient.givenName}&nbsp;${patient.familyName}</h1> \
</span><del>- <a id="confirmLangButton" \
data-role="button" href="#" data-theme="b" \
class="ui-btn-left" \
onclick="setLanguage('${patient.givenName}&nbsp;${patient.familyName}', \
'${patient.birthdate}')">Espa&#241;ol</a> </del><ins>+ <a \
id="confirmLangButton" data-role="button" href="#" \
data-theme="b" class="ui-btn-left" \
onclick="setLanguage('${newFirstName}&nbsp;${newLastName}', \
'${patient.birthdate}')">Espa&#241;ol</a> </ins><span class="cx"> \
<a id="confirmVitalsButton" data-role="button" \
href="#vitals_page" data-theme="b" class="ui-btn-right" \
data-icon="forward" data-transition="fade">Vitals</a> \
</span><span class="cx"> </div> </span><span class="cx">
</span><span class="lines">@@ -315,7 +319,7 @@
</span><span class="cx"> <div data-role="header" >
</span><span class="cx"> <h1>Pre-Screener:</h1>
</span><span class="cx"> \
<h1>${patient.givenName}&nbsp;${patient.familyName}</h1> \
</span><del>- <a id="langPage1Button" \
data-role="button" href="#" data-theme="b" \
class="ui-btn-left" \
onclick="setLanguageFromForm('${patient.givenName}&nbsp;${patient.familyName}', \
'${patient.birthdate}')">Espa&#241;ol</a> </del><ins>+ <a \
id="langPage1Button" data-role="button" href="#" \
data-theme="b" class="ui-btn-left" \
onclick="setLanguageFromForm('${newFirstName}&nbsp;${newLastName}', \
'${patient.birthdate}')">Espa&#241;ol</a> </ins><span class="cx"> \
<a data-role="button" onclick="openVitalsConfirm()" \
data-theme="b" class="ui-btn-right" data-icon="forward" \
data-transition="pop">Vitals</a> </span><span class="cx"> \
</div> </span><span class="cx"> <div data-role="content">
</span><span class="lines">@@ -365,7 +369,7 @@
</span><span class="cx"> <div data-role="header" >
</span><span class="cx"> <h1>Pre-Screener:</h1>
</span><span class="cx"> \
<h1>${patient.givenName}&nbsp;${patient.familyName}</h1> \
</span><del>- <a id="langPage1SPButton" \
data-role="button" href="#" data-theme="b" \
class="ui-btn-left" \
onclick="setLanguageFromForm('${patient.givenName}&nbsp;${patient.familyName}', \
'${patient.birthdate}')">English</a> </del><ins>+ <a \
id="langPage1SPButton" data-role="button" href="#" \
data-theme="b" class="ui-btn-left" \
onclick="setLanguageFromForm('${newFirstName}&nbsp;${NewLastName}', \
'${patient.birthdate}')">English</a> </ins><span class="cx"> \
<a data-role="button" onclick="openVitalsConfirmSpanish()" \
data-theme="b" class="ui-btn-right" data-icon="forward" \
data-transition="pop">Vitales</a> </span><span class="cx"> \
</div> </span><span class="cx"> <div data-role="content">
</span><span class="lines">@@ -690,9 +694,9 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="ui-block-a" \
style="text-align: center;height: 25px;margin-bottom: 0px;width: \
14%"></div> </span><del>- <div class="ui-block-b" \
style="text-align: center;height: 25px;margin-bottom: 0px;width: \
86%"></div>
- <div class="ui-block-a" style="text-align: center;height: \
60px;margin-bottom: 0px;width: 14%"></div>
- <div class="ui-block-b" style="text-align: center;height: \
60px;margin-bottom: 0px;width: 86%;"> </del><ins>+ <div \
class="ui-block-b" style="text-align: center;height: \
25px;margin-bottom: 0px;width: 86%"></div> + <div \
class="ui-block-a" style="text-align: center;height: \
60px;margin-bottom: 0px;width: 14%"></div> + <div \
class="ui-block-b" style="text-align: center;height: \
60px;margin-bottom: 0px;width: 86%;"> </ins><span class="cx"> \
<span><input type="checkbox" id="Handout_Reviewed_by_MA" \
name="Handout_Reviewed_by_MA" value="diet and exercise" \
style="vertical-align: top; margin: 0px;"/><label \
for="Handout_Reviewed_by_MA">Diet and Exercise Handout \
Given<label></span> </span><span class="cx"> \
</div> </span><span class="cx"> </div>
</span></span></pre></div>
<a id="openmrsmoduleschicabranchesPersonAddressErrorwebmoduleresourcespsfMobileDynamicjs"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/branches/PersonAddressError/web/module/resources/psfMobileDynamic.js \
(31007 => 31008)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/branches/PersonAddressError/web/module/resources/psfMobileDynamic.js 2014-11-20 \
16:52:05 UTC (rev 31007)
+++ openmrs-modules/chica/branches/PersonAddressError/web/module/resources/psfMobileDynamic.js 2014-11-20 \
16:59:24 UTC (rev 31008) </span><span class="lines">@@ -427,13 +427,14 @@
</span><span class="cx"> var value = \
$(this).find("Value").text(); </span><span class="cx"> var \
questionNumber = getQuestionNumber(fieldName); </span><span class="cx"> \
var spanishIndex = fieldName.indexOf("_SP"); </span><ins>+ var \
isSpanish = false; </ins><span class="cx">
</span><span class="cx"> if (spanishIndex < 0) {
</span><span class="cx"> if (count !== 0) {
</span><span class="cx"> content = content + "<br/>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var questions = createQuestionData(value, questionNumber, \
"", "Yes"); </del><ins>+ var questions = \
createQuestionData(value, questionNumber, "", "Yes", isSpanish); \
</ins><span class="cx"> content = content + questions; </span><span \
class="cx"> count++; </span><span class="cx"> } else {
</span><span class="lines">@@ -441,7 +442,8 @@
</span><span class="cx"> spanishContent = spanishContent + \
"<br/>"; </span><span class="cx"> }
</span><span class="cx">
</span><del>- var questionsSp = createQuestionData(value, \
questionNumber, "_2", "Si"); </del><ins>+ isSpanish \
= true; + var questionsSp = createQuestionData(value, questionNumber, \
"_2", "Si", isSpanish); </ins><span class="cx"> \
spanishContent = spanishContent + questionsSp; </span><span class="cx"> \
spanishCount++; </span><span class="cx"> }
</span><span class="lines">@@ -532,9 +534,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function createQuestionData(value, questionNumber, spanishText, \
yesButtonName) { </del><ins>+function createQuestionData(value, questionNumber, \
spanishText, yesButtonName, isSpanish) { </ins><span class="cx"> var content = \
""; </span><del>- content = content + '<strong>' + value + \
'</strong><a data-role="button" data-inline="true" \
class="custom-button" onclick=\'readText("' + value + \
'")\'></a>'; </del><ins>+ if (isSpanish) {
+ content = content + '<strong>' + value + '</strong><a \
data-role="button" data-inline="true" \
class="custom-button" onclick=\'readTextSpanish("' + value + \
'")\'></a>'; + } else {
+ content = content + '<strong>' + value + '</strong><a \
data-role="button" data-inline="true" \
class="custom-button" onclick=\'readText("' + value + \
'")\'></a>'; + }
+
</ins><span class="cx"> content = content + '<div \
data-role="fieldcontain" style="margin-top:0px;">'; \
</span><span class="cx"> content = content + '<fieldset \
data-role="controlgroup" data-type="horizontal">'; \
</span><span class="cx"> content = content + '<input type="radio" \
name="QuestionEntry_' + questionNumber + spanishText + '" \
id="QuestionEntry_' + questionNumber + spanishText + '_Yes" \
value="Y" data-theme="c" />'; </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