Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2007-02-16 04:18:33
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32522/web/five Modified Files: patient.xhtml selfMon.xhtml obs.xhtml allergies.xhtml personal.xhtml medications.xhtml Added Files: obsMenu.xhtml appointments2.xhtml obsLink.xhtml bar3.xhtml Log Message: New data types added to menus Index: medications.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/medications.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** medications.xhtml 4 Oct 2006 17:12:05 -0000 1.1 --- medications.xhtml 16 Feb 2007 04:18:30 -0000 1.2 *************** *** 10,15 **** <body> <ui:composition> ! <p>A list of medications goes here for element #{param.element}, path #{menu.targetMenuPath.path}. ! </p> </ui:composition> </body> --- 10,59 ---- <body> <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, ! 'menuData.ajax', ! {prefetchBuffer: true, ! tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, ! requestParameters: [{name: 'element', value: visiblePage}], ! loadingClass: 'dataGridLoading', ! sortAscendImg: '../images/sort_asc.gif', ! sortDescendImg:'../images/sort_desc.gif'}); ! ! // ]]> ! </script> ! <div id="#{menu.element}LGDG" style="width:990px;padding:5px"> ! <table id="#{menu.element}LG_header" > ! <thead> ! <tr> ! <th align="left" width="125px">Date</th> ! <th align="left" width="210px">Medication</th> ! <th align="left" width="150px">Status</th> ! </tr> ! </thead> ! </table> ! <table id="#{menu.element}LG" > ! <tbody> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! </tbody> ! </table> ! </div> </ui:composition> </body> --- NEW FILE: appointments2.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Apppointments</title> </head> <body> <ui:composition> <script language="JavaScript" type="text/javascript"> // <![CDATA[ #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, tableClass: 'dataGrid', largeBufferSize: 4.0, nearLimitFactor: 0.7, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', sortAscendImg: '../images/sort_asc.gif', sortDescendImg:'../images/sort_desc.gif'}); // ]]> </script> <div style="width:900px"> <table id="#{menu.element}LG_header" > <thead> <tr> <th align="left" width="200px">Who</th> <th align="left" width="150px">Date</th> <th align="left" width="400px">Purpose</th> <th align="left" width="200px">With</th> </tr> </thead> </table> <table id="#{menu.element}LG" > <tbody> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> <tr><td width="200px">-</td><td width="150px">-</td><td width="400px">-</td><td width="200px">-</td></tr> </tbody> </table> </div> </ui:composition> </body> </html> Index: allergies.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/allergies.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** allergies.xhtml 4 Oct 2006 17:12:05 -0000 1.1 --- allergies.xhtml 16 Feb 2007 04:18:30 -0000 1.2 *************** *** 10,16 **** <body> <ui:composition> ! <p> ! A list of allergies for element #{param.element}, path #{menu.targetMenuPath.path}. ! </p> </ui:composition> </body> --- 10,59 ---- <body> <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, ! 'menuData.ajax', ! {prefetchBuffer: true, ! tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, ! requestParameters: [{name: 'element', value: visiblePage}], ! loadingClass: 'dataGridLoading', ! sortAscendImg: '../images/sort_asc.gif', ! sortDescendImg:'../images/sort_desc.gif'}); ! ! // ]]> ! </script> ! <div id="#{menu.element}LGDG" style="width:990px;padding:5px"> ! <table id="#{menu.element}LG_header" > ! <thead> ! <tr> ! <th align="left" width="125px">Started</th> ! <th align="left" width="210px">Allergy</th> ! <th align="left" width="150px">Status</th> ! </tr> ! </thead> ! </table> ! <table id="#{menu.element}LG" > ! <tbody> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! <tr><td align="left" width="125px">-</td><td width="210px">-</td><td width="150px">-</td></tr> ! </tbody> ! </table> ! </div> </ui:composition> </body> Index: obs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/obs.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** obs.xhtml 29 Nov 2006 01:35:33 -0000 1.1 --- obs.xhtml 16 Feb 2007 04:18:30 -0000 1.2 *************** *** 6,13 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Past Appointments</title> </head> <body> ! <ui:composition><p>Observations go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> \ No newline at end of file --- 6,81 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Observation List</title> </head> <body> ! <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, ! 'menuData.ajax', ! {prefetchBuffer: false, ! tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, ! requestParameters: [{name: 'element', value: visiblePage}], ! loadingClass: 'dataGridLoading', ! sortAscendImg: '../images/sort_asc.gif', ! sortDescendImg:'../images/sort_desc.gif'}); ! #{menu.elementLabel}DG.setSupressColumnRange( 0, 1); ! #{menu.elementLabel}DG.addSortSupressColumn( 'date', 0, 1); ! #{menu.elementLabel}DG.addSortSupressColumn( 'test', 1, 2); ! #{menu.elementLabel}DG.requestContentRefresh(0); ! ! #{menu.elementLabel}DGFilter = ''; ! #{menu.elementLabel}DGFilterChange = function (element, vax) { ! if (#{menu.elementLabel}DGFilter==vax) return; ! #{menu.elementLabel}DGFilter = vax; ! #{menu.elementLabel}DG.setRequestParams( {name: 'element', value: visiblePage}, ! {name: 'TestFilter', value: #{menu.elementLabel}DGFilter} ); ! #{menu.elementLabel}DG.resetContents(); ! #{menu.elementLabel}DG.requestContentRefresh(0); ! }; ! new Form.Element.Observer( $("#{menu.element}DGFilter"), 1, #{menu.elementLabel}DGFilterChange ); ! // ]]> ! </script> ! <div style="padding:5px"> ! <form action="#" onsubmit="return false;"> ! Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" /> ! </form> ! <div id="#{menu.element}LGDG" style="width:990px;"> ! <table id="#{menu.element}LG_header" > ! <thead> ! <tr> ! <th align="right" width="125px">Date</th> ! <th align="left" width="210px">Test</th> ! <th align="right" width="100px">Value</th> ! <th align="left" width="75px">Units</th> ! <th align="left" width="150px">Source</th> ! </tr> ! </thead> ! </table> ! <table id="#{menu.element}LG" > ! <tbody> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="150px">-</td></tr> ! </tbody> ! </table> ! </div> ! </div> ! </ui:composition> </body> </html> \ No newline at end of file Index: personal.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/personal.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** personal.xhtml 3 Feb 2007 19:05:59 -0000 1.4 --- personal.xhtml 16 Feb 2007 04:18:30 -0000 1.5 *************** *** 43,47 **** </h:panelGrid> <h:outputText value="#{menu.ccr.patientActor.actorObjectID}"/> ! <h:form id="persDetail" onsubmit="return ajaxSubmit2(this);"> <h:panelGrid columns="2"> <h:outputText value="First name:"/> --- 43,47 ---- </h:panelGrid> <h:outputText value="#{menu.ccr.patientActor.actorObjectID}"/> ! <h:form id="persDetail" onsubmit="return ajaxSubmit2(this);" rendered="false"> <h:panelGrid columns="2"> <h:outputText value="First name:"/> --- NEW FILE: bar3.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Menu Level 3</title> </head> <body> <ui:composition> <div class="bar3"> <ul> <c:forEach var="item" items="#{menu.thisMenu.sortedChildren}"> <c:if test="#{(item.role=='tab' or item.role=='list') and item.visible=='true'}"> <li id="#{param.element}:#{item.node}:sel"> <a href="javascript:showPane('#{param.element}:#{item.node}');"> #{item.text}</a> </li> </c:if> <c:if test="#{item.role=='placeholder'}"> <li id="#{param.element}:#{item.node}:sel" style="display:none"></li> </c:if> </c:forEach> </ul> </div> </ui:composition> </body> </html> Index: patient.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patient.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** patient.xhtml 17 Jan 2007 18:43:01 -0000 1.7 --- patient.xhtml 16 Feb 2007 04:18:30 -0000 1.8 *************** *** 13,18 **** <div class="allergies"> <table> ! <tr><td><p>Allergies: None <a href="javascript:showPane('#{param.element}:doc:allergies');" title="Display the problems page">see detail</a> ! </p></td><td> <div class="wip"> <ul> --- 13,23 ---- <div class="allergies"> <table> ! <tr> ! <c:if test="#{menu.menuDataItem.long01>0}"> ! <td> ! <p><a href="javascript:showPane('#{param.element}:doc:allergies');" title="Display the allergies page">Allergies: Click Here for Details</a></p> ! </td> ! </c:if> ! <td> <div class="wip"> <ul> Index: selfMon.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/selfMon.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selfMon.xhtml 29 Nov 2006 01:35:33 -0000 1.1 --- selfMon.xhtml 16 Feb 2007 04:18:30 -0000 1.2 *************** *** 6,13 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Past Appointments</title> </head> <body> ! <ui:composition><p>Self-monitoring Results go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> \ No newline at end of file --- 6,78 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Self Monitoring values</title> </head> <body> ! <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, ! 'menuData.ajax', ! {prefetchBuffer: false, ! tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, ! requestParameters: [{name: 'element', value: visiblePage}], ! loadingClass: 'dataGridLoading', ! sortAscendImg: '../images/sort_asc.gif', ! sortDescendImg:'../images/sort_desc.gif'}); ! #{menu.elementLabel}DG.setSupressColumnRange( 0, 1); ! #{menu.elementLabel}DG.addSortSupressColumn( 'date', 0, 1); ! #{menu.elementLabel}DG.addSortSupressColumn( 'test', 1, 2); ! #{menu.elementLabel}DG.requestContentRefresh(0); ! ! #{menu.elementLabel}DGFilter = ''; ! #{menu.elementLabel}DGFilterChange = function (element, vax) { ! if (#{menu.elementLabel}DGFilter==vax) return; ! #{menu.elementLabel}DGFilter = vax; ! #{menu.elementLabel}DG.setRequestParams( {name: 'element', value: visiblePage}, ! {name: 'TestFilter', value: #{menu.elementLabel}DGFilter} ); ! #{menu.elementLabel}DG.resetContents(); ! #{menu.elementLabel}DG.requestContentRefresh(0); ! }; ! new Form.Element.Observer( $("#{menu.element}DGFilter"), 1, #{menu.elementLabel}DGFilterChange ); ! // ]]> ! </script> ! <form action="#" onsubmit="return false;"> ! Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" /> ! </form> ! <div id="#{menu.element}LGDG" style="width:990px;"> ! <table id="#{menu.element}LG_header" > ! <thead> ! <tr> ! <th align="right" width="125px">Date</th> ! <th align="left" width="210px">Test</th> ! <th align="right" width="100px">Value</th> ! <th align="left" width="75px">Units</th> ! </tr> ! </thead> ! </table> ! <table id="#{menu.element}LG" > ! <tbody> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td></tr> ! </tbody> ! </table> ! </div> ! </ui:composition> </body> </html> \ No newline at end of file --- NEW FILE: obsLink.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Content of links referencing Observations</title> </head> <body> <ui:composition> <h:outputText value="#{menu.menuDataItem.string01}"/> <h:outputText value=" (#{menu.menuDataItem.string02})"/> </ui:composition> </body> </html> --- NEW FILE: obsMenu.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Observation Menu</title> </head> <body> <ui:composition> <script language="JavaScript" type="text/javascript"> // <![CDATA[ #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, tableClass: 'dataGrid', largeBufferSize: 4.0, nearLimitFactor: 0.7, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', sortAscendImg: '../images/sort_asc.gif', sortDescendImg:'../images/sort_desc.gif'}); // ]]> </script> <div id="#{menu.element}LGDG" style="width:990px;padding:5px"> <table id="#{menu.element}LG_header" > <thead> <tr> <th align="left" width="210px">Observation</th> </tr> </thead> </table> <table id="#{menu.element}LG" > <tbody> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> <tr><td width="210px">-</td></tr> </tbody> </table> </div> </ui:composition> </body> </html> |
|
From: John C. <jc...@us...> - 2007-02-16 04:18:00
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32111/src/org/tolven/ajax Modified Files: AjaxServlet.java Added Files: InstantiateServlet.java Log Message: Added support for data input "instantiate" --- NEW FILE: InstantiateServlet.java --- package org.tolven.ajax; import java.io.IOException; import java.io.Writer; import java.util.Date; import java.util.HashMap; import java.util.Map; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; import javax.transaction.SystemException; import javax.transaction.UserTransaction; import javax.xml.bind.JAXBException; import org.jboss.logging.Logger; import org.tolven.app.CreatorLocal; import org.tolven.app.MenuLocal; import org.tolven.app.bean.MenuPath; import org.tolven.app.entity.MenuData; import org.tolven.doc.DocumentLocal; import org.tolven.gen.PersonGenerator; import org.tolven.trim.util.TRIMException; import org.tolven.voc.umls.ConceptDAO; import org.tolven.web.TopAction; public class InstantiateServlet extends HttpServlet { private CreatorLocal creatorBean; private MenuLocal menuLocal; private ServletContext context = null; private Logger logger; public void init(ServletConfig config) throws ServletException { logger = Logger.getLogger("org.tolven.ajax"); context = config.getServletContext(); try { InitialContext ctx = new InitialContext(); creatorBean = (CreatorLocal) ctx.lookup("tolven/CreatorBean/local"); menuLocal = (MenuLocal) ctx.lookup("tolven/MenuBean/local"); } catch (NamingException e) { throw new RuntimeException(e); } } @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { InitialContext ctx; // UserTransaction ut = null; // ctx = new InitialContext(); // ut = (UserTransaction) ctx.lookup("UserTransaction"); // ut.begin(); String uri = req.getRequestURI(); TopAction top = null; Object topObj = req.getSession(false).getAttribute("top"); if (topObj==null) { throw new IllegalStateException( "[docServlet] Top Obj is null - how can that be"); } if (topObj instanceof TopAction) { top = (org.tolven.web.TopAction)topObj; } resp.setContentType("text/xml"); resp.setHeader("Cache-Control", "no-cache"); Writer writer=resp.getWriter(); Date now = (Date) req.getAttribute("tolvenNow"); // writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ); // Instantiation request from browser if (uri.endsWith("instantiate.ajaxi")) { // writer.write( "<element>" ); // The MenuStructureItem to use String templateId = req.getParameter( "templateId"); // Where called from String context = req.getParameter( "context"); MenuData md; md = creatorBean.createTRIMInstance(top.getAccountId(), templateId, context, now ); writer.write(md.getPath()); // writer.write( "</element>" ); writer.close(); // ut.commit(); } } catch (JAXBException e) { throw new ServletException( "JAXB Exception thrown in IntantiateServlet", e); } catch (TRIMException e) { throw new ServletException( "TRIM Exception thrown in IntantiateServlet", e); } catch (Exception e) { throw new ServletException( "Exception thrown in IntantiateServlet", e); } } } Index: AjaxServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AjaxServlet.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AjaxServlet.java 16 Jan 2007 06:25:40 -0000 1.18 --- AjaxServlet.java 16 Feb 2007 04:17:59 -0000 1.19 *************** *** 22,27 **** --- 22,29 ---- import java.util.Date; import java.util.Enumeration; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; + import java.util.Map; import java.util.TimeZone; *************** *** 36,41 **** --- 38,45 ---- import javax.servlet.http.HttpSession; import javax.transaction.UserTransaction; + import javax.xml.bind.JAXBException; import org.jboss.logging.Logger; + import org.tolven.app.CreatorLocal; import org.tolven.app.MenuLocal; import org.tolven.app.bean.MenuPath; *************** *** 50,53 **** --- 54,58 ---- import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.entity.VirtualPerson; + import org.tolven.trim.util.TRIMException; import org.tolven.voc.umls.ConceptDAO; import org.tolven.voc.umls.LoadAbbreviation; *************** *** 74,77 **** --- 79,83 ---- private DocumentLocal documentLocal; + private PersonGenerator personDAO; *************** *** 216,220 **** // SimpleDateFormat sdf = new SimpleDateFormat( "d MMM yyyy"); // Prepare the list of columns we're going to populate ! List<MSColumn> sorted = new ArrayList<MSColumn>( ctrl.getMenuStructure().getColumns()); Collections.sort( sorted, new ColSeqSort()); --- 222,226 ---- // SimpleDateFormat sdf = new SimpleDateFormat( "d MMM yyyy"); // Prepare the list of columns we're going to populate ! List<MSColumn> sorted = new ArrayList<MSColumn>( ctrl.getActualMenuStructure().getColumns()); Collections.sort( sorted, new ColSeqSort()); *************** *** 273,276 **** --- 279,302 ---- } writer.write( "<a href=\"#\" onclick=\"showPane('" + ppath + "')\">" + desc + "</a>"); + } else if (col.getInternal().equals("instantiate")) { + String ppath = md.getString02(); // Contains name of Trim object + String desc = ""; + // Fancy mode using Java format specifier + if (col.getDisplayFunctionArguments() != null) { + String dfas[] = col.getDisplayFunctionArguments().split("\\,"); + Object dfavals[] = new Object[dfas.length]; + for ( int x = 0; x < dfavals.length; x++) { + dfavals[x] = md.getField( dfas[x]); + } + desc = String.format(col.getDisplayFunction(), dfavals); + } + else if (col.getDisplayFunction()!=null) + { + String field = col.getDisplayFunction(); + if ("id".equals(field)) desc = Long.toString(md.getReference().getId()); + else desc = md.getStringField(field); + if (desc==null) desc = field; + } + writer.write( "<a href=\"#\" onclick=\"instantiate('" + ppath + "','"+ element+ "')\">" + desc + "</a>"); } else if (col.getInternal().startsWith("parent")) { String ppath = md.getParentPath( col.getInternal()); *************** *** 462,466 **** perf.addFirst(new RequestPerformanceItem( new Date(), elapsed/1000000, req.getRequestURI(), req.getQueryString())); } ! // This module is all about read-only so rollback in all cases try { ut.rollback(); --- 488,492 ---- perf.addFirst(new RequestPerformanceItem( new Date(), elapsed/1000000, req.getRequestURI(), req.getQueryString())); } ! // This module is all about read-only so rollback try { ut.rollback(); |
|
From: John C. <jc...@us...> - 2007-02-16 04:17:42
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32085/web/scripts Modified Files: tolven6.js Log Message: Added support for data input "instantiate" Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tolven6.js 12 Feb 2007 07:11:35 -0000 1.12 --- tolven6.js 16 Feb 2007 04:17:41 -0000 1.13 *************** *** 210,214 **** --- 210,230 ---- return content; } + // Ask the server to instantiate a new item and wait for the new element name + function instantiate( templateId, context ) { + var instAjax = new Ajax.Request( + 'instantiate.ajaxi', + { + method: 'get', + parameters: 'templateId='+templateId+'&context='+context, + onComplete: showNewInstance + }); + } + // Once instantiated, we can show the new item + function showNewInstance(req) { + // alert( req.responseText ); + showPane(req.responseText); + } + function showPane( paneId ) { var pane = $(paneId); |
|
From: John C. <jc...@us...> - 2007-02-16 04:04:13
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26675/web/five Modified Files: summary.xhtml Log Message: Summary now driven from metadata Index: summary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/summary.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** summary.xhtml 29 Nov 2006 01:35:33 -0000 1.4 --- summary.xhtml 16 Feb 2007 04:04:12 -0000 1.5 *************** *** 10,35 **** <body> <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! getRemoteContent( "#{param.element}:probsum", "#{param.element}:probsum" ); ! getRemoteContent( "#{param.element}:medsum", "#{param.element}:medsum" ); ! getRemoteContent( "#{param.element}:dxsum", "#{param.element}:dxsum" ); ! getRemoteContent( "#{param.element}:allergysum", "#{param.element}:allergysum" ); ! getRemoteContent( "#{param.element}:apptsum", "#{param.element}:apptsum" ); ! getRemoteContent( "#{param.element}:obssum", "#{param.element}:obssum" ); ! getRemoteContent( "#{param.element}:remindersum", "#{param.element}:remindersum" ); ! getRemoteContent( "#{param.element}:procsum", "#{param.element}:procsum" ); ! getRemoteContent( "#{param.element}:resultsum", "#{param.element}:resultsum" ); ! // ]]> ! </script> ! <div style="padding:5px"> ! <table cellspacing="0" cellpadding="2" border="0" width="100%"> ! <tbody> ! <tr valign="top"><td width="30%"><div id="#{param.element}:probsum" /></td><td width="30%"><div id="#{param.element}:resultsum" /></td><td width="30%"><div id="#{param.element}:remindersum" /></td></tr> ! <tr valign="top"><td width="30%"><div id="#{param.element}:medsum" /></td><td width="30%"><div id="#{param.element}:allergysum" /></td><td width="30%"><div id="#{param.element}:dxsum" /></td></tr> ! <tr valign="top"><td width="30%"><div id="#{param.element}:apptsum" /></td><td width="30%"><div id="#{param.element}:obssum" /></td><td width="30%"><div id="#{param.element}:procsum" /></td></tr> ! </tbody> ! </table> ! </div> </ui:composition> </body> --- 10,30 ---- <body> <ui:composition> ! <c:forEach items="#{menu.childPaths}" var="child"> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! getRemoteContent( "#{child}", "#{child}" ); ! // ]]> ! </script> ! </c:forEach> ! ! <div class="summary" style="padding:5px;"> ! <h:panelGrid columns="3" width="900px" cellspacing="2px" > ! <c:forEach items="#{menu.childPaths}" var="child"> ! <h:panelGroup> ! <div id="#{child}" style="width:290px;"/> ! </h:panelGroup> ! </c:forEach> ! </h:panelGrid> ! </div> </ui:composition> </body> |
|
From: John C. <jc...@us...> - 2007-02-16 04:03:35
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/index In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26310/src/org/tolven/index Modified Files: Browse.java Log Message: due to new TRIM schema Index: Browse.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/index/Browse.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Browse.java 7 Feb 2007 01:40:33 -0000 1.7 --- Browse.java 16 Feb 2007 04:03:30 -0000 1.8 *************** *** 71,78 **** } if( uri.endsWith("testGCS.browse")) { ! Map<String, String> context = new HashMap<String, String>( 2); ! context.put("echr:patient", "echr:patient-658609"); ! DocXML doc = creatorLocal.instantiate(11800, "echr:gcs", context); ! creatorLocal.submit( doc, doc.getContent() ); return; } --- 71,78 ---- } if( uri.endsWith("testGCS.browse")) { ! // Map<String, String> context = new HashMap<String, String>( 2); ! // context.put("echr:patient", "echr:patient-658609"); ! // DocXML doc = creatorLocal.instantiate(11800, "echr:gcs", context); ! // creatorLocal.submit( doc, doc.getContent() ); return; } |
|
From: John C. <jc...@us...> - 2007-02-16 04:03:01
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/doc/bean Modified Files: Evaluator.java EvaluateCCRPersonal.java EvaluateCCRClinical.java Log Message: New data generator capabilities (allergies, medications) Index: Evaluator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Evaluator.java 12 Feb 2007 07:06:05 -0000 1.7 --- Evaluator.java 16 Feb 2007 04:02:30 -0000 1.8 *************** *** 96,101 **** // System.out.println( docCCR.getPatientActor().getPerson().getName().getCurrentName().getFamilyString()); } catch (Exception e) { ! System.out.println( "Msg Failed: " + msgId + " Error: " + e.getMessage()); ! // e.printStackTrace(); } } --- 96,101 ---- // System.out.println( docCCR.getPatientActor().getPerson().getName().getCurrentName().getFamilyString()); } catch (Exception e) { ! System.out.println( "Message " + msgId + " failed with error: " + e.getMessage()); ! e.printStackTrace(); } } Index: EvaluateCCRClinical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRClinical.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EvaluateCCRClinical.java 12 Feb 2007 07:06:05 -0000 1.1 --- EvaluateCCRClinical.java 16 Feb 2007 04:02:30 -0000 1.2 *************** *** 32,36 **** @Override public void process(TolvenMessage tm) throws CCRException, Exception { ! System.out.println( "Processing CCR document for account: " + tm.getAccountId()); DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() ); docCCR.setContent(tm.getPayload()); --- 32,36 ---- @Override public void process(TolvenMessage tm) throws CCRException, Exception { ! System.out.println( "Processing CCR document for clinical account: " + tm.getAccountId()); DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() ); docCCR.setContent(tm.getPayload()); *************** *** 245,250 **** if (ccr.getBody().getEncounters()==null) return; MenuStructure msAppointment = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "appointment"); ! MenuStructure msAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:appts"); ! MenuStructure msPastAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:past"); Date current = new Date(); for (EncounterType encounter : ccr.getBody().getEncounters().getEncounter()) { --- 245,250 ---- if (ccr.getBody().getEncounters()==null) return; MenuStructure msAppointment = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "appointment"); ! MenuStructure msAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:appts:future"); ! MenuStructure msPastAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:appts:past"); Date current = new Date(); for (EncounterType encounter : ccr.getBody().getEncounters().getEncounter()) { Index: EvaluateCCRPersonal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRPersonal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EvaluateCCRPersonal.java 12 Feb 2007 07:06:05 -0000 1.1 --- EvaluateCCRPersonal.java 16 Feb 2007 04:02:30 -0000 1.2 *************** *** 1,7 **** --- 1,29 ---- package org.tolven.doc.bean; + import java.io.IOException; + import java.text.ParseException; + import java.util.Date; + + import javax.xml.bind.JAXBException; + import org.tolven.app.MenuLocal; + import org.tolven.app.entity.MenuData; + import org.tolven.app.entity.MenuStructure; + import org.tolven.ccr.ActorType; + import org.tolven.ccr.AlertType; + import org.tolven.ccr.ContinuityOfCareRecord; + import org.tolven.ccr.DateTimeType; + import org.tolven.ccr.EncounterType; + import org.tolven.ccr.MedicationType; + import org.tolven.ccr.PersonNameType; + import org.tolven.ccr.ProblemType; + import org.tolven.ccr.ResultType; + import org.tolven.ccr.StructuredProductType; + import org.tolven.ccr.TestType; + import org.tolven.core.entity.Account; import org.tolven.doc.DocumentLocal; import org.tolven.doc.XMLLocal; + import org.tolven.doc.entity.CCRException; + import org.tolven.doc.entity.DocCCR; public class EvaluateCCRPersonal extends EvaluateCCR { *************** *** 12,18 **** @Override ! public void process(TolvenMessage tm) { } ! } --- 34,365 ---- @Override ! public void process(TolvenMessage tm) throws Exception { ! System.out.println( "Processing CCR document for personal account: " + tm.getAccountId()); ! DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() ); ! docCCR.setContent(tm.getPayload()); ! documentLocal.finalizeDocument(docCCR); ! // Get type of account ! // String accountType = docCCR.getAccount().getAccountType().getKnownType(); ! ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) xmlBean.unmarshal(tm.getXmlNS(), tm.getPayloadInputStream()); ! processPatient( docCCR.getAccount(), docCCR.getId(), ccr); ! } ! ! /** ! * Process a single CCR message. Verify the account and user ! * @param tm A TolvenMessage ! * @throws JAXBException ! * @throws CCRException ! * @throws ParseException ! * @throws CCRException ! * @throws IOException ! * @throws IOException ! */ ! public void processPatient( Account account, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { ! ! MenuStructure msPatient = menuLocal.findMenuStructure(account.getId(), "ephr:patient"); ! MenuData mdPatient = new MenuData(); ! mdPatient.setMenuStructure( msPatient ); ! mdPatient.setDocumentId(documentId); ! mdPatient.setAccount(account); ! // OK, get started... ! ActorType pat = ccr.getPatientActor(); ! DateTimeType dob = pat.getPerson().getDateOfBirth(); ! if (dob.getExactDateTime()!=null) { ! mdPatient.setDate01( dob.getDateValue()); ! } ! PersonNameType name = pat.getPerson().getName().getCurrentName(); ! if ( name!=null ) { ! mdPatient.setString01(name.getFamilyString()); ! mdPatient.setString02(name.getGivenString()); ! mdPatient.setString03(name.getMiddleString()); ! } ! mdPatient.setString04(pat.getPerson().getGender().getText()); ! menuLocal.persistMenuData(mdPatient); ! ! // Put the patient on the family "members" list ! MenuStructure msAllPatients = menuLocal.findMenuStructure(mdPatient.getAccount().getId(), "ephr:family:myfam:members"); ! MenuData mdAllPatients = new MenuData(); ! mdAllPatients.setMenuStructure( msAllPatients ); ! mdAllPatients.setDocumentId(mdPatient.getDocumentId()); ! mdAllPatients.setAccount( mdPatient.getAccount()); ! mdAllPatients.setDate01( mdPatient.getDate01( )); ! mdAllPatients.setString01( mdPatient.getString01( )); ! mdAllPatients.setString02( mdPatient.getString02( )); ! mdAllPatients.setString03( mdPatient.getString03( )); ! mdAllPatients.setString04( mdPatient.getString04( )); ! mdAllPatients.setReference( mdPatient ); ! menuLocal.persistMenuData(mdAllPatients); + processAllergies( mdPatient, documentId, ccr); + processProblems( mdPatient, documentId, ccr); + processMedications( mdPatient, documentId, ccr); + processResults( mdPatient, documentId, ccr); + processAppointments( mdPatient, documentId, ccr); + + } + + public void processProblems( MenuData mdPatient, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { + if (ccr.getBody()==null) return; + if (ccr.getBody().getProblems()==null) return; + MenuStructure msProblem = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "problem"); + MenuStructure msProblemList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "hx:problems"); + MenuStructure msProblemSumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:probsum"); + for (ProblemType problem : ccr.getBody().getProblems().getProblem()) { + // Create the problem + MenuData mdProblem = new MenuData(); + mdProblem.setMenuStructure( msProblem ); + mdProblem.setDocumentId(mdPatient.getAccount().getId()); + mdProblem.setAccount(mdPatient.getAccount()); + mdProblem.setParent01(mdPatient); + mdProblem.setString01(problem.getDescriptionText()); + mdProblem.setDate01(problem.getDateTimeType(ProblemType.DATE_OF_ONSET).getDateValue()); + mdProblem.setString02(problem.getStatusText()); + menuLocal.persistMenuData(mdProblem); + // Add to patient's problem list + MenuData mdProblemList = new MenuData(); + mdProblemList.setMenuStructure( msProblemList ); + mdProblemList.setDocumentId(documentId); + mdProblemList.setAccount(mdPatient.getAccount()); + mdProblemList.setParent01(mdPatient); + mdProblemList.setString01(problem.getDescriptionText()); + mdProblemList.setDate01(problem.getDateTimeType(ProblemType.DATE_OF_ONSET).getDateValue()); + mdProblemList.setString02(problem.getStatusText()); + mdProblemList.setReference(mdProblem); + menuLocal.persistMenuData(mdProblemList); + // Add to patient's problem summary + MenuData mdProblemSumm = new MenuData(); + mdProblemSumm.setMenuStructure( msProblemSumm ); + mdProblemSumm.setDocumentId(documentId); + mdProblemSumm.setAccount(mdPatient.getAccount()); + mdProblemSumm.setParent01(mdPatient); + mdProblemSumm.setString01(problem.getDescriptionText()); + mdProblemSumm.setDate01(problem.getDateTimeType(ProblemType.DATE_OF_ONSET).getDateValue()); + mdProblemSumm.setString02(problem.getStatusText()); + mdProblemSumm.setReference(mdProblem); + menuLocal.persistMenuData(mdProblemSumm); + } + } + /** + * In CCR, allergies are in the alerts lists. + * @param mdPatient + * @param documentId + * @param ccr + * @throws JAXBException + * @throws ParseException + * @throws CCRException + * @throws IOException + */ + public void processAllergies( MenuData mdPatient, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { + if (ccr.getBody()==null) return; + if (ccr.getBody().getAlerts()==null) return; + MenuStructure msAllergy = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "allergy"); + MenuStructure msAllergyList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "doc:allergies"); + MenuStructure msAllergySumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:allergysum"); + for (AlertType alert : ccr.getBody().getAlerts().getAlert()) { + if ("Allergy".equals(alert.getTypeText())) { + // NOTE: Bump the number of allergies in the patient for each active allergy we find. + mdPatient.setLong01(mdPatient.getLong01()+1); + // Create the allergy + MenuData mdAllergy = new MenuData(); + mdAllergy.setMenuStructure( msAllergy ); + mdAllergy.setDocumentId(mdPatient.getAccount().getId()); + mdAllergy.setAccount(mdPatient.getAccount()); + mdAllergy.setParent01(mdPatient); + mdAllergy.setString01(alert.getDescriptionText()); + mdAllergy.setDate01(alert.getDateTimeType("Start Date").getDateValue()); + mdAllergy.setString02(alert.getStatusText()); + menuLocal.persistMenuData(mdAllergy); + // Add to patient's problem list + MenuData mdAllergyList = new MenuData(); + mdAllergyList.setMenuStructure( msAllergyList ); + mdAllergyList.setDocumentId(documentId); + mdAllergyList.setAccount(mdPatient.getAccount()); + mdAllergyList.setParent01(mdPatient); + mdAllergyList.setString01(alert.getDescriptionText()); + mdAllergyList.setDate01(alert.getDateTimeType("Start Date").getDateValue()); + mdAllergyList.setString02(alert.getStatusText()); + mdAllergyList.setReference(mdAllergy); + menuLocal.persistMenuData(mdAllergyList); + // Add to patient's problem summary + MenuData mdAllergySumm = new MenuData(); + mdAllergySumm.setMenuStructure( msAllergySumm ); + mdAllergySumm.setDocumentId(documentId); + mdAllergySumm.setAccount(mdPatient.getAccount()); + mdAllergySumm.setParent01(mdPatient); + mdAllergySumm.setString01(alert.getDescriptionText()); + mdAllergySumm.setDate01(alert.getDateTimeType("Start Date").getDateValue()); + mdAllergySumm.setString02(alert.getStatusText()); + mdAllergySumm.setReference(mdAllergy); + menuLocal.persistMenuData(mdAllergySumm); + } + } + } + public void processMedications( MenuData mdPatient, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { + if (ccr.getBody()==null) return; + if (ccr.getBody().getMedications()==null) return; + MenuStructure msMedication = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "medication"); + MenuStructure msMedicationList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "med:meds"); + MenuStructure msMedicationSumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:medsum"); + for (StructuredProductType med : ccr.getBody().getMedications().getMedication()) { + // Create the medication + MenuData mdMedication = new MenuData(); + mdMedication.setMenuStructure( msMedication ); + mdMedication.setDocumentId(mdPatient.getAccount().getId()); + mdMedication.setAccount(mdPatient.getAccount()); + mdMedication.setParent01(mdPatient); + mdMedication.setString01(med.getDescriptionText()); + mdMedication.setDate01(med.getDateTimeType("Start Date").getDateValue()); + mdMedication.setString02(med.getStatusText()); + menuLocal.persistMenuData(mdMedication); + // Add to patient's medication list + MenuData mdMedicationList = new MenuData(); + mdMedicationList.setMenuStructure( msMedicationList ); + mdMedicationList.setDocumentId(documentId); + mdMedicationList.setAccount(mdPatient.getAccount()); + mdMedicationList.setParent01(mdPatient); + mdMedicationList.setString01(med.getDescriptionText()); + mdMedicationList.setDate01(med.getDateTimeType("Start Date").getDateValue()); + mdMedicationList.setString02(med.getStatusText()); + mdMedicationList.setReference(mdMedication); + menuLocal.persistMenuData(mdMedicationList); + // Add to patient's medication summary + MenuData mdMedicationSumm = new MenuData(); + mdMedicationSumm.setMenuStructure( msMedicationSumm ); + mdMedicationSumm.setDocumentId(documentId); + mdMedicationSumm.setAccount(mdPatient.getAccount()); + mdMedicationSumm.setParent01(mdPatient); + mdMedicationSumm.setString01(med.getDescriptionText()); + mdMedicationSumm.setDate01(med.getDateTimeType("Start Date").getDateValue()); + mdMedicationSumm.setString02(med.getStatusText()); + mdMedicationSumm.setReference(mdMedication); + menuLocal.persistMenuData(mdMedicationSumm); + } } ! public void processResults( MenuData mdPatient, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { ! // Extract Results (in CCR, a ResultType can also be an observation) ! // We do results ! if (ccr.getBody()==null) return; ! if (ccr.getBody().getResults()==null) return; ! ! MenuStructure msResult = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "result"); ! MenuStructure msTest = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "test"); ! MenuStructure msResultsLab = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "results:lab"); ! for (ResultType result : ccr.getBody().getResults().getResult()) { ! // Create the result ! MenuData mdResult = new MenuData(); ! mdResult.setMenuStructure( msResult ); ! mdResult.setDocumentId(documentId); ! mdResult.setAccount(mdPatient.getAccount()); ! mdResult.setParent01(mdPatient); ! mdResult.setString01(result.getDescriptionText()); ! mdResult.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue()); ! mdResult.setString02(result.getStatusText()); ! menuLocal.persistMenuData(mdResult); ! // We also need to represent individual test results (independent of result) ! for (TestType test : result.getTest()) { ! MenuData mdTest = new MenuData(); ! mdTest.setMenuStructure( msTest ); ! mdTest.setDocumentId(documentId); ! mdTest.setAccount(mdPatient.getAccount()); ! mdTest.setParent01(mdPatient); ! mdTest.setParent02(mdTest); ! mdTest.setString01(test.getDescriptionText()); ! // Note date is copied from the result (parent), not the test (child) ! mdTest.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue()); ! // Value+units ! if (test.getTestResult()!=null && test.getTestResult().getValue()!=null) { ! // System.out.println( "Test " + test.getDescriptionText() + ": "+ test.getTestResult().getValue() + " " + test.getTestResult().getUnits().getUnit()); ! mdTest.setPqValue01(Double.parseDouble(test.getTestResult().getValue())); ! mdTest.setPqStringVal01(test.getTestResult().getValue()); ! mdTest.setPqUnits01(test.getTestResult().getUnits().getUnit()); ! // ------------------------------------------------------------------------- ! // Add results to lab results list ! MenuData mdResultsLab = new MenuData(); ! mdResultsLab.setMenuStructure( msResultsLab ); ! mdResultsLab.setDocumentId(documentId); ! mdResultsLab.setAccount(mdPatient.getAccount()); ! mdResultsLab.setParent01(mdPatient); ! mdResultsLab.setString01(result.getDescriptionText()); ! mdResultsLab.setString02(test.getDescriptionText()); ! // Note date is copied from the result (parent), not the test (child) ! mdResultsLab.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue()); ! mdResultsLab.setString04(result.getStatusText()); ! mdResultsLab.setPqValue01(Double.parseDouble(test.getTestResult().getValue())); ! mdResultsLab.setPqStringVal01(test.getTestResult().getValue()); ! mdResultsLab.setPqUnits01(test.getTestResult().getUnits().getUnit()); ! //Reference the whole result, not just the test ! mdResultsLab.setReference(mdResult); ! menuLocal.persistMenuData(mdResultsLab); ! // If result is fairly new, add to new results list ! } ! // Report - Descriptions (appended into String02 with \n in between) ! // NO NO NO - Require drilldown to read the report ! // if (test.getTestResult()!=null && test.getTestResult().getDescription().size() > 0) { ! // StringBuffer sb = new StringBuffer(1000); ! // for (CodedDescriptionType desc: test.getTestResult().getDescription()) { ! // if (sb.length() > 0 ) sb.append( "\n"); ! // sb.append( desc.getText()); ! // } ! // mdTest.setString02(sb.toString()); ! // } ! // TODO: Need <flag> here as well (interpretation/panic) ! // Status copied from result ! mdTest.setString02(result.getStatusText()); ! menuLocal.persistMenuData(mdTest); ! } ! } ! } ! ! public void processAppointments( MenuData mdPatient, long documentId, ContinuityOfCareRecord ccr ) throws JAXBException, ParseException, CCRException, IOException { ! if (ccr.getBody()==null) return ; ! if (ccr.getBody().getEncounters()==null) return; ! MenuStructure msAppointment = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "appointment"); ! MenuStructure msAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:appts:future"); ! MenuStructure msPastAppointmentList = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "pers:appts:past"); ! MenuStructure msFamilyAppointmentList = menuLocal.findMenuStructure(mdPatient.getAccount().getId(), "ephr:family:appts:allAppt"); ! Date current = new Date(); ! for (EncounterType encounter : ccr.getBody().getEncounters().getEncounter()) { ! Date apptDate = encounter.getDateTimeType("Encounter DateTime").getDateValue(); ! // Create the problem ! MenuData mdAppointment = new MenuData(); ! mdAppointment.setMenuStructure( msAppointment ); ! mdAppointment.setDocumentId(documentId); ! mdAppointment.setAccount(mdPatient.getAccount()); ! mdAppointment.setParent01(mdPatient); ! mdAppointment.setString01(encounter.getDescriptionText()); ! mdAppointment.setDate01(apptDate); ! // mdAppointment.setString02(encounter.getStatusText()); ! menuLocal.persistMenuData(mdAppointment); ! // Add to patient's appointment list ! MenuData mdAppointmentList = new MenuData(); ! if (apptDate.after(current)) { ! mdAppointmentList.setMenuStructure( msAppointmentList ); ! } else { ! mdAppointmentList.setMenuStructure( msPastAppointmentList ); ! } ! mdAppointmentList.setDocumentId(documentId); ! mdAppointmentList.setAccount(mdPatient.getAccount()); ! mdAppointmentList.setParent01(mdPatient); ! mdAppointmentList.setString01(encounter.getDescriptionText()); ! mdAppointmentList.setDate01(apptDate); ! // mdAppointmentList.setString02(encounter.getStatusText()); ! mdAppointmentList.setReference(mdAppointment); ! menuLocal.persistMenuData(mdAppointmentList); ! ! // Add to family's appointment list ! MenuData mdFamilyAppointmentList = new MenuData(); ! if (apptDate.after(current)) { ! mdFamilyAppointmentList.setMenuStructure( msFamilyAppointmentList ); ! mdFamilyAppointmentList.setDocumentId(documentId); ! mdFamilyAppointmentList.setAccount(mdPatient.getAccount()); ! mdFamilyAppointmentList.setReference(mdPatient); ! mdFamilyAppointmentList.setString01(mdPatient.getString01()); ! mdFamilyAppointmentList.setString02(mdPatient.getString02()); ! mdFamilyAppointmentList.setString03(encounter.getDescriptionText()); ! mdFamilyAppointmentList.setDate01(apptDate); ! // mdAppointmentList.setString0x(encounter.getStatusText()); ! menuLocal.persistMenuData(mdFamilyAppointmentList); ! } ! } ! }} |
|
From: John C. <jc...@us...> - 2007-02-16 04:02:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/app/bean Modified Files: MenuQueryControl.java MenuBean.java CreatorBean.java Log Message: New data generator capabilities (allergies, medications) Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** MenuBean.java 12 Feb 2007 07:06:35 -0000 1.47 --- MenuBean.java 16 Feb 2007 04:02:33 -0000 1.48 *************** *** 14,20 **** --- 14,22 ---- package org.tolven.app.bean; + import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.List; + import javax.annotation.EJB; import javax.ejb.Local; import javax.ejb.Remote; *************** *** 23,26 **** --- 25,29 ---- import javax.persistence.PersistenceContext; import javax.persistence.Query; + import javax.xml.bind.JAXBException; import org.tolven.app.MenuLocal; *************** *** 30,33 **** --- 33,40 ---- import org.tolven.app.entity.MenuStructure; import org.tolven.core.entity.Account; + import org.tolven.doc.XMLLocal; + import org.tolven.trim.Act; + import org.tolven.trim.ActSlot; + import org.tolven.trim.Trim; /** *************** *** 54,57 **** --- 61,66 ---- @PersistenceContext private EntityManager em; + @EJB XMLLocal xmlBean; + private static final String TRIMns = "urn:astm-org:trim:4.0"; /** * @see MenuLocal *************** *** 69,73 **** return item; } catch (RuntimeException e) { ! throw new IllegalArgumentException( "Error finding path " + path + " in account " + accountId, e); } } --- 78,82 ---- return item; } catch (RuntimeException e) { ! throw new IllegalArgumentException( "Error finding menustructure path " + path + " in account " + accountId, e); } } *************** *** 77,90 **** */ public MenuStructure findDescendentMenuStructure( long accountId, MenuStructure parent, String path) { ! Account account = em.getReference( Account.class, accountId); ! Query query = em.createQuery("SELECT m FROM MenuStructure m WHERE m.account = :account and m.path = :path"); ! query.setParameter("account", account ); ! query.setParameter("path", parent.getPath()+ ":" + path); ! // System.out.println( "[MenuBean:findDescendentMenuStructure] Looking for path: " + parent.getPath()+ ":" + path ); ! MenuStructure item = (MenuStructure)query.getSingleResult(); ! // for (MenuStructure child : item.getChildren()) { // Make sure children are instantiated in the structure we return ! // long id = child.getId(); ! // } ! return item; } --- 86,110 ---- */ public MenuStructure findDescendentMenuStructure( long accountId, MenuStructure parent, String path) { ! try { ! Account account = em.getReference( Account.class, accountId); ! Query query = em.createQuery("SELECT m FROM MenuStructure m WHERE m.account = :account and m.path = :path"); ! query.setParameter("account", account ); ! query.setParameter("path", parent.getPath()+ ":" + path); ! // System.out.println( "[MenuBean:findDescendentMenuStructure] Looking for path: " + parent.getPath()+ ":" + path ); ! MenuStructure item = (MenuStructure)query.getSingleResult(); ! // for (MenuStructure child : item.getChildren()) { // Make sure children are instantiated in the structure we return ! // long id = child.getId(); ! // } ! return item; ! } catch (RuntimeException e) { ! throw new IllegalArgumentException( "Error finding descendent menustructure path " + parent.getPath()+ ":" + path + " in account " + accountId, e); ! } ! } ! ! /** ! * @see MenuLocal ! */ ! public MenuData findMenuDataItem( long id ) { ! return em.find(MenuData.class, id); } *************** *** 93,112 **** */ public MenuData findMenuDataItem( MenuQueryControl ctrl ) { ! Query query = em.createQuery( "SELECT md FROM MenuData md WHERE md.account.id = :accountId and md.id = :id" ); ! // long id = ctrl.getRequestedPath().getSignificantNodeKeys()[0]; ! long id = ctrl.getRequestedPath().getLeafNodeKey(); ! query.setParameter( "id", id ); ! query.setParameter( "accountId", ctrl.getMenuStructure().getAccount().getId() ); ! System.out.println( "[MenuBean] Looking for menuDataItem with key: " + id + " for account: " + ctrl.getMenuStructure().getAccount().getId() ); ! query.setMaxResults(2); ! List<MenuData> items = query.getResultList(); ! if ( items.size()!=1) return null; ! MenuData rslt = items.get(0); ! // DocBase doc = rslt.getDocument(); // Eager fetch in this case ! // if (doc != null ) { ! // doc.getAccount(); ! // System.out.println( "findMenuDataItem: " + doc.getId() + " class=" + doc.getClass().getName()); ! // } ! return rslt; } --- 113,136 ---- */ public MenuData findMenuDataItem( MenuQueryControl ctrl ) { ! try { ! Query query = em.createQuery( "SELECT md FROM MenuData md WHERE md.account.id = :accountId and md.id = :id" ); ! // long id = ctrl.getRequestedPath().getSignificantNodeKeys()[0]; ! long id = ctrl.getRequestedPath().getLeafNodeKey(); ! query.setParameter( "id", id ); ! query.setParameter( "accountId", ctrl.getActualMenuStructure().getAccount().getId() ); ! System.out.println( "[MenuBean.findMenuDataItem] Looking for menuData with key: " + id + " for account: " + ctrl.getActualMenuStructure().getAccount().getId() ); ! query.setMaxResults(2); ! List<MenuData> items = query.getResultList(); ! if ( items.size()!=1) return null; ! MenuData rslt = items.get(0); ! // DocBase doc = rslt.getDocument(); // Eager fetch in this case ! // if (doc != null ) { ! // doc.getAccount(); ! // System.out.println( "findMenuDataItem: " + doc.getId() + " class=" + doc.getClass().getName()); ! // } ! return rslt; ! } catch (RuntimeException e) { ! throw new RuntimeException( "Error in findMenuDataItem for path " + ctrl.getRequestedPath(), e); ! } } *************** *** 116,119 **** --- 140,146 ---- */ public Query prepareCriteria( MenuQueryControl ctrl, String init ) { + // Allow one level of "referenced" indirection. The effect is to return data from a different MenuStructure + // than the one requested. + ctrl.setActualMenuStructure( ctrl.getMenuStructure().getReferenced()); StringBuffer qs = new StringBuffer( 350 ); List<String> filterValues = new ArrayList<String>( 3 ); *************** *** 131,135 **** } // See if any of the columns are mentioned in the filter list. ! for (MSColumn col : ctrl.getMenuStructure().getColumns()) { Object value = ctrl.getFilters().get(col.getHeading()); String colName; --- 158,162 ---- } // See if any of the columns are mentioned in the filter list. ! for (MSColumn col : ctrl.getActualMenuStructure().getColumns()) { Object value = ctrl.getFilters().get(col.getHeading()); String colName; *************** *** 156,184 **** // than letting the request list drive our behavior. if (ctrl.getSortOrder()!=null) { ! for (MSColumn col : ctrl.getMenuStructure().getColumns()) { if ( ctrl.getSortOrder().equalsIgnoreCase(col.getHeading())) { qs.append( " ORDER BY "); String colName = col.getInternal(); ! if (col.getDisplayFunctionArguments()!=null) { ! String dfas[] = col.getDisplayFunctionArguments().split("\\,"); ! colName = dfas[0]; ! // System.out.println( "Alternate column name=" + colName); } ! if (colName.startsWith("string")) { ! qs.append("lower(");qs.append(colName);qs.append(")"); } else { ! qs.append(colName); } - qs.append(" "); - qs.append(ctrl.getSortDirection()); } } } ! // System.out.println( "MenuData Query: " + qs.toString()); Query query = em.createQuery( qs.toString() ); ! query.setParameter( "m", ctrl.getMenuStructure() ); for ( int x = 0; x < 4; x++ ) { if (getParentOrNull(ctrl, x)!=null) { query.setParameter( "p0" + (x+1), getParentOrNull(ctrl, x) ); } } --- 183,227 ---- // than letting the request list drive our behavior. if (ctrl.getSortOrder()!=null) { ! for (MSColumn col : ctrl.getActualMenuStructure().getColumns()) { if ( ctrl.getSortOrder().equalsIgnoreCase(col.getHeading())) { qs.append( " ORDER BY "); String colName = col.getInternal(); ! if ("instantiate".equals(colName)) { ! colName = col.getDisplayFunction(); } ! String sortCols[]; ! if (col.getDisplayFunctionArguments()==null) { ! sortCols = new String[1]; ! sortCols[0] = colName; } else { ! sortCols = col.getDisplayFunctionArguments().split("\\,"); ! // System.out.println( "Alternate column name=" + colName); ! } ! boolean firstTime = true; ! for ( String sortCol : sortCols) { ! if (firstTime) { ! firstTime=false; ! } else { ! qs.append(", "); ! } ! if (sortCol.startsWith("string")) { ! qs.append("lower(");qs.append(sortCol);qs.append(")"); ! } else { ! qs.append(sortCol); ! } ! qs.append(" "); ! qs.append(ctrl.getSortDirection()); } } } } ! System.out.println( "MenuData Query: " + qs.toString()); ! System.out.println( "m=" + ctrl.getActualMenuStructure().getPath()); Query query = em.createQuery( qs.toString() ); ! query.setParameter( "m", ctrl.getActualMenuStructure() ); for ( int x = 0; x < 4; x++ ) { if (getParentOrNull(ctrl, x)!=null) { query.setParameter( "p0" + (x+1), getParentOrNull(ctrl, x) ); + System.out.println( "p0" + (x+1) + "=" + getParentOrNull(ctrl, x)); } } *************** *** 186,189 **** --- 229,233 ---- for (int f = 0; f < filterValues.size(); f++) { query.setParameter("fltr" + f, filterValues.get(f)); + System.out.println( "fltr" + f + "=" + filterValues.get(f)); } return query; *************** *** 194,203 **** */ public List<MenuData> findMenuData( MenuQueryControl ctrl ) { ! Query query = prepareCriteria( ctrl, "SELECT md FROM MenuData md WHERE "); // System.out.println( "[MenuLocal.findMenuData] begin: " + ctrl ); ! query.setMaxResults(ctrl.getLimit()); ! query.setFirstResult(ctrl.getOffset()); ! List<MenuData> items = query.getResultList(); ! return items; } --- 238,251 ---- */ public List<MenuData> findMenuData( MenuQueryControl ctrl ) { ! try { ! Query query = prepareCriteria( ctrl, "SELECT md FROM MenuData md WHERE "); // System.out.println( "[MenuLocal.findMenuData] begin: " + ctrl ); ! query.setMaxResults(ctrl.getLimit()); ! query.setFirstResult(ctrl.getOffset()); ! List<MenuData> items = query.getResultList(); ! return items; ! } catch (RuntimeException e) { ! throw new RuntimeException( "Error in findMenuData for path " + ctrl.getRequestedPath(), e); ! } } *************** *** 206,213 **** */ public long countMenuData(MenuQueryControl ctrl ) { ! Query query = prepareCriteria( ctrl, "SELECT COUNT(md) FROM MenuData md WHERE "); ! Long rslt = (Long) query.getSingleResult(); ! return rslt.longValue(); } /** * Remove any menuData item that references the specified document. This is usually done when a new document is submitted to --- 254,267 ---- */ public long countMenuData(MenuQueryControl ctrl ) { ! try { ! Query query = prepareCriteria( ctrl, "SELECT COUNT(md) FROM MenuData md WHERE "); ! Long rslt = (Long) query.getSingleResult(); ! System.out.println( "[MenuLocal.countMenuData]: " + ctrl + " count=" + rslt.longValue() ); ! return rslt.longValue(); ! } catch (RuntimeException e) { ! throw new RuntimeException( "Error in countMenuData for path " + ctrl.getRequestedPath(), e); ! } } + /** * Remove any menuData item that references the specified document. This is usually done when a new document is submitted to *************** *** 234,242 **** public MenuData getParentOrNull( MenuQueryControl ctrl, int level) { ! MenuPath path = ctrl.getRequestedPath(); ! if (path==null) return null; ! long[] snk = path.getSignificantNodeKeys( ); ! if (level < snk.length ) { ! return em.getReference( MenuData.class, snk[level]); } else { return null; --- 288,294 ---- public MenuData getParentOrNull( MenuQueryControl ctrl, int level) { ! long parentId = ctrl.getParentId(level); ! if (parentId > 0) { ! return em.getReference( MenuData.class, parentId); } else { return null; *************** *** 362,377 **** em.persist( appointments ); MenuStructure today = new MenuStructure( ! root.getAccount(), appointments, "appointments.xhtml", null, 1, "today", "Today", "true", null, "tab" ); em.persist( today ); MenuStructure tomorrow = new MenuStructure( ! root.getAccount(), appointments, "appointments.xhtml", null, 2, "tomorrow", "Tomorrow", "true", null, "tab" ); em.persist( tomorrow ); MenuStructure nextWeek = new MenuStructure( ! root.getAccount(), appointments, "appointments.xhtml", null, 3, "nextWeek", "Next Week", "true", null, "tab" ); em.persist( nextWeek ); MenuStructure allAppt = new MenuStructure( ! root.getAccount(), appointments, "appointments.xhtml", null, 4, "allAppt", "All Appointments", "true", null, "tab" ); em.persist( allAppt ); ! } --- 414,444 ---- em.persist( appointments ); MenuStructure today = new MenuStructure( ! root.getAccount(), appointments, "appointments2.xhtml", null, 1, "today", "Today", "true", null, "tab" ); em.persist( today ); + em.persist( new MSColumn( today, 1, "Who", "reference", "%s, %s", "String01,string02") ); + em.persist( new MSColumn( today, 2, "Date", "date01", "d MMM yyyy hh:mm") ); + em.persist( new MSColumn( today, 3, "Purpose", "string03", null) ); + em.persist( new MSColumn( today, 4, "With", "string04", "age") ); MenuStructure tomorrow = new MenuStructure( ! root.getAccount(), appointments, "appointments2.xhtml", null, 2, "tomorrow", "Tomorrow", "true", null, "tab" ); em.persist( tomorrow ); + em.persist( new MSColumn( tomorrow, 1, "Who", "reference", "%s, %s", "String01,string02") ); + em.persist( new MSColumn( tomorrow, 2, "Date", "date01", "d MMM yyyy hh:mm") ); + em.persist( new MSColumn( tomorrow, 3, "Purpose", "string03", null) ); + em.persist( new MSColumn( tomorrow, 4, "With", "string04", "age") ); MenuStructure nextWeek = new MenuStructure( ! root.getAccount(), appointments, "appointments2.xhtml", null, 3, "nextWeek", "Next Week", "true", null, "tab" ); em.persist( nextWeek ); + em.persist( new MSColumn( nextWeek, 1, "Who", "reference", "%s, %s", "String01,string02") ); + em.persist( new MSColumn( nextWeek, 2, "Date", "date01", "d MMM yyyy hh:mm") ); + em.persist( new MSColumn( nextWeek, 3, "Purpose", "string03", null) ); + em.persist( new MSColumn( nextWeek, 4, "With", "string04", "age") ); MenuStructure allAppt = new MenuStructure( ! root.getAccount(), appointments, "appointments2.xhtml", null, 4, "allAppt", "All Appointments", "true", null, "tab" ); em.persist( allAppt ); ! em.persist( new MSColumn( allAppt, 1, "Who", "reference", "%s, %s", "String01,string02") ); ! em.persist( new MSColumn( allAppt, 2, "Date", "date01", "d MMM yyyy hh:mm") ); ! em.persist( new MSColumn( allAppt, 3, "Purpose", "string03", null) ); ! em.persist( new MSColumn( allAppt, 4, "With", "string04", "age") ); } *************** *** 508,538 **** public void addPatientTab ( MenuStructure root ) { Account account = root.getAccount(); ! // Individual patients ! MenuStructure patient = new MenuStructure( ! account, root, "patient.xhtml", "chartLink.xhtml", 3, "patient", "Patient", "false", "patient", "placeholder" ); ! em.persist( patient ); ! ! MenuStructure assessment = new MenuStructure( ! account, patient, "assessment.xhtml", "assLink.xhtml", -1, "assessment", "Assessment", "false", "assessment", "placeholder" ); ! em.persist( assessment ); - MenuStructure problem = new MenuStructure( - account, patient, "problem.xhtml", "probLink.xhtml", -1, "problem", "Problem", "false", "problem", "placeholder" ); - em.persist( problem ); - - MenuStructure result = new MenuStructure( - account, patient, "result.xhtml", "resultLink.xhtml", -1, "result", "Result", "false", "result", "placeholder" ); - em.persist( result ); - MenuStructure test = new MenuStructure( - account, patient, "test.xhtml", "testLink.xhtml", -1, "test", "Test", "false", "test", "placeholder" ); - em.persist( test ); - MenuStructure order = new MenuStructure( - account, patient, "order.xhtml", "orderLink.xhtml", -1, "order", "Order", "false", "order", "placeholder" ); - em.persist( order ); - - MenuStructure appointment = new MenuStructure( - account, patient, "appointment.xhtml", "appointmentLink.xhtml", -1, "appointment", "Appointment", "false", "appointment", "placeholder" ); - em.persist( appointment ); - MenuStructure summary = new MenuStructure( account, patient, "summary.xhtml", null, 1, "summary", "Overview", "true", null, "tab" ); --- 575,580 ---- public void addPatientTab ( MenuStructure root ) { Account account = root.getAccount(); ! MenuStructure patient = this.findDescendentMenuStructure(account.getId(), root, "patient"); MenuStructure summary = new MenuStructure( account, patient, "summary.xhtml", null, 1, "summary", "Overview", "true", null, "tab" ); *************** *** 563,567 **** MenuStructure dxSummary = new MenuStructure( ! account, summary, "dxSummary.xhtml", null, 6, "dxsum", "Working Diagnoses", "true", root.getPath() + ":patient:doc:dx", "portlet" ); em.persist( dxSummary ); --- 605,609 ---- MenuStructure dxSummary = new MenuStructure( ! account, summary, "dxSummary.xhtml", null, 6, "dxsum", "Diagnoses", "true", root.getPath() + ":patient:doc:dx", "portlet" ); em.persist( dxSummary ); *************** *** 584,588 **** MenuStructure newResults = new MenuStructure( ! account, patResults, "newResults.xhtml", null, 20, "new", "New results", "true", root.getPath() +":patient:result", "list" ); em.persist( newResults ); em.persist( new MSColumn( newResults, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); --- 626,630 ---- MenuStructure newResults = new MenuStructure( ! account, patResults, "newResults.xhtml", null, 20, "new", "New Results", "true", root.getPath() +":patient:result", "list" ); em.persist( newResults ); em.persist( new MSColumn( newResults, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); *************** *** 613,621 **** account, patResults, "pathology.xhtml", null, 50, "pathology", "Pathology", "true", root.getPath() +":patient:test", "list" ); em.persist( pathology ); - - MenuStructure selfMon = new MenuStructure( - account, patResults, "selfMon.xhtml", null, 60, "self", "Self Monitoring", "true", root.getPath() +":patient:test", "list" ); - em.persist( selfMon ); - MenuStructure rad = new MenuStructure( account, patResults, "rad.xhtml", null, 70, "rad", "Radiology", "true", root.getPath() +":patient:test", "list" ); --- 655,658 ---- *************** *** 643,646 **** --- 680,684 ---- em.persist( ques ); + if ("echr".equals(root.getPath())) { MenuStructure assAll = new MenuStructure( account, doc, "assAll.xhtml", null, 3, "ass", "Clinical Assessments", "true", root.getPath() +":patient:assessment", "list" ); *************** *** 662,673 **** // account, newAss, "../wizard/bccIntake.xhtml", null, 1, "bcc", "BCC Intake", "true", null, "tab" ); // em.persist( newBCC ); ! MenuStructure obs = new MenuStructure( ! account, doc, "obs.xhtml", null, 4, "obs", "Observations", "true", root.getPath() +":patient:assessment", "list" ); em.persist( obs ); ! MenuStructure allergies = new MenuStructure( ! account, doc, "allergies.xhtml", null, 5, "allergies", "Allergies", "true", root.getPath() +":patient:assessment", "list" ); em.persist( allergies ); MenuStructure protocols = new MenuStructure( --- 700,733 ---- // account, newAss, "../wizard/bccIntake.xhtml", null, 1, "bcc", "BCC Intake", "true", null, "tab" ); // em.persist( newBCC ); ! } MenuStructure obs = new MenuStructure( ! account, doc, "bar3.xhtml", null, 4, "obs", "Observations", "true", null, "tab" ); em.persist( obs ); ! ! MenuStructure obsValues = new MenuStructure( ! account, obs, "obs.xhtml", null, 1, "values", "List", "true", root.getPath() +":patient:assessment", "list" ); ! em.persist( obsValues ); ! em.persist( new MSColumn( obsValues, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); ! em.persist( new MSColumn( obsValues, 2, "Test", "string01", null) ); ! em.persist( new MSColumn( obsValues, 3, "Value", "pqValue01", null) ); ! em.persist( new MSColumn( obsValues, 4, "Units", "pqUnits01", null) ); ! em.persist( new MSColumn( obsValues, 5, "Source", "string02", null) ); ! // This root-level list, which is never displayed, is referenced by the in-place list below it. ! MenuStructure obsMenu = new MenuStructure( ! account, root, null, null, 0, "obsMenu", null, "false", null, "list" ); ! em.persist( obsMenu ); ! em.persist( new MSColumn( obsMenu, 1, "Observation", "instantiate", "string01") ); ! ! MenuStructure obsMenuList = new MenuStructure( ! account, obs, "obsMenu.xhtml", null, 1, "menu", "New", "true", null, "list" ); ! obsMenuList.setReferenced(obsMenu); ! em.persist( obsMenuList ); ! MenuStructure allergies = new MenuStructure( ! account, doc, "allergies.xhtml", null, 5, "allergies", "Allergies", "true", root.getPath() +":patient:allergy", "list" ); em.persist( allergies ); + em.persist( new MSColumn( allergies, 2, "Started", "date01", "MMM-dd-yyyy") ); + em.persist( new MSColumn( allergies, 1, "Allergy", "string01", null) ); + em.persist( new MSColumn( allergies, 3, "Status", "string02", null) ); MenuStructure protocols = new MenuStructure( *************** *** 680,684 **** MenuStructure dx = new MenuStructure( ! account, doc, "dx.xhtml", null, 8, "dx", "Working Diagnoses", "true", null, "list" ); em.persist( dx ); --- 740,744 ---- MenuStructure dx = new MenuStructure( ! account, doc, "dx.xhtml", null, 8, "dx", "Diagnoses", "true", null, "list" ); em.persist( dx ); *************** *** 719,724 **** MenuStructure medications = new MenuStructure( ! account, med, "medications.xhtml", null, 2, "meds", "Medications", "true", null, "list" ); em.persist( medications ); MenuStructure rx = new MenuStructure( --- 779,787 ---- MenuStructure medications = new MenuStructure( ! account, med, "medications.xhtml", null, 2, "meds", "Medications", "true", root.getPath() +":patient:medication", "list" ); em.persist( medications ); + em.persist( new MSColumn( medications, 1, "Start", "date01", "MMM-dd-yyyy") ); + em.persist( new MSColumn( medications, 2, "Medication", "string01", null) ); + em.persist( new MSColumn( medications, 3, "Status", "string02", null) ); MenuStructure rx = new MenuStructure( *************** *** 764,775 **** MenuStructure appointments = new MenuStructure( ! account, pers, "appointments.xhtml", null, 9, "appts", "Appointments", "true", root.getPath() + ":patient:appointment", "list" ); em.persist( appointments ); ! em.persist( new MSColumn( appointments, 1, "Date", "date01", "d MMM yyyy hh:mm") ); ! em.persist( new MSColumn( appointments, 2, "Purpose", "string01", null) ); ! em.persist( new MSColumn( appointments, 3, "With", "string02", "age") ); MenuStructure pastAppointments = new MenuStructure( ! account, pers, "appointments.xhtml", null, 10, "past", "Past", "true", root.getPath() + ":patient:appointment", "list" ); em.persist( pastAppointments ); em.persist( new MSColumn( pastAppointments, 1, "Date", "date01", "d MMM yyyy hh:mm") ); --- 827,842 ---- MenuStructure appointments = new MenuStructure( ! account, pers, "bar3.xhtml", null, 8, "appts", "Appointments", "true", null, "tab" ); em.persist( appointments ); ! ! MenuStructure currAppointments = new MenuStructure( ! account, appointments, "appointments.xhtml", null, 1, "future", "Upcoming Appointments", "true", root.getPath() + ":patient:appointment", "list" ); ! em.persist( currAppointments ); ! em.persist( new MSColumn( currAppointments, 1, "Date", "date01", "d MMM yyyy hh:mm") ); ! em.persist( new MSColumn( currAppointments, 2, "Purpose", "string01", null) ); ! em.persist( new MSColumn( currAppointments, 3, "With", "string02", "age") ); MenuStructure pastAppointments = new MenuStructure( ! account, appointments, "appointments.xhtml", null, 2, "past", "Past Appointments", "true", root.getPath() + ":patient:appointment", "list" ); em.persist( pastAppointments ); em.persist( new MSColumn( pastAppointments, 1, "Date", "date01", "d MMM yyyy hh:mm") ); *************** *** 785,791 **** em.persist( hmaint ); ! MenuStructure xml = new MenuStructure( ! account, patient, "xml.xhtml", null, 9, "xml", "XML (demo)", "true", root.getPath() + ":patient", "tab" ); ! em.persist( xml ); } --- 852,922 ---- em.persist( hmaint ); ! MenuStructure graph = new MenuStructure( ! account, patient, "bar2.xhtml", null, 9, "graph", "Graph", "true", null, "tab" ); ! em.persist( graph ); ! ! MenuStructure graphMenu = new MenuStructure( ! account, graph, "graphMenu.xhtml", null, 1, "menu", "Menu", "true", null, "list" ); ! em.persist( graphMenu ); ! ! MenuStructure graphAdHoc = new MenuStructure( ! account, graph, "graphAdHoc.xhtml", null, 2, "adhoc", "Ad Hoc", "true", null, "list" ); ! em.persist( graphAdHoc ); ! ! MenuStructure xml = new MenuStructure( ! account, patient, "xml.xhtml", null, 10, "xml", "XML (demo)", "true", root.getPath() + ":patient", "tab" ); ! ! em.persist( xml ); ! } ! ! public void addPlaceholders( MenuStructure root ) { ! Account account = root.getAccount(); ! // Individual patients ! MenuStructure patient = new MenuStructure( ! account, root, "patient.xhtml", "chartLink.xhtml", 3, "patient", "Patient", "false", "patient", "placeholder" ); ! em.persist( patient ); ! ! MenuStructure assessment = new MenuStructure( ! account, patient, "assessment.xhtml", "assLink.xhtml", -1, "assessment", "Assessment", "false", "assessment", "placeholder" ); ! em.persist( assessment ); ! ! MenuStructure observation = new MenuStructure( ! account, patient, "../wizard/observation.xhtml", "obsLink.xhtml", -1, "observation", "Observation", "false", "observation", "placeholder" ); ! em.persist( observation ); ! ! MenuStructure problem = new MenuStructure( ! account, patient, "problem.xhtml", "probLink.xhtml", -1, "problem", "Problem", "false", "problem", "placeholder" ); ! em.persist( problem ); ! ! MenuStructure allergy = new MenuStructure( ! account, patient, "allergy.xhtml", "allergyLink.xhtml", -1, "allergy", "Allergy", "false", "allergy", "placeholder" ); ! em.persist( allergy ); ! ! MenuStructure medication = new MenuStructure( ! account, patient, "medication.xhtml", "medLink.xhtml", -1, "medication", "Medication", "false", "medication", "placeholder" ); ! em.persist( medication ); ! ! MenuStructure result = new MenuStructure( ! account, patient, "result.xhtml", "resultLink.xhtml", -1, "result", "Result", "false", "result", "placeholder" ); ! em.persist( result ); ! MenuStructure test = new MenuStructure( ! account, patient, "test.xhtml", "testLink.xhtml", -1, "test", "Test", "false", "test", "placeholder" ); ! em.persist( test ); ! MenuStructure order = new MenuStructure( ! account, patient, "order.xhtml", "orderLink.xhtml", -1, "order", "Order", "false", "order", "placeholder" ); ! em.persist( order ); ! ! MenuStructure appointment = new MenuStructure( ! account, patient, "appointment.xhtml", "appointmentLink.xhtml", -1, "appointment", "Appointment", "false", "appointment", "placeholder" ); ! em.persist( appointment ); ! ! // Agent ! MenuStructure agent = new MenuStructure( ! account, root, "agent.xhtml", "agentLink.xhtml", 3, "agent", "Agent", "false", "agent", "placeholder" ); ! em.persist( agent ); ! // Provider ! MenuStructure provider = new MenuStructure( ! account, root, "provider.xhtml", "providerLink.xhtml", 3, "provider", "Provider", "false", "provider", "placeholder" ); ! em.persist( provider ); } *************** *** 845,861 **** * @param accountId * @param name Name of the node, which must include the full path, for example, echr:patient: */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ) { MenuStructure root = getRootMenuStructure( em.getReference(Account.class, accountId)); ! MenuStructure trim; try { ! trim = this.findDescendentMenuStructure(accountId, root, name); } catch( Exception e) { ! trim = new MenuStructure( ! root.getAccount(), root, "trimView.xhtml", null, 0, name, null, "true", null, "trim" ); } ! trim.setTrim(trimXML); ! em.merge( trim ); ! System.out.println("Trim " + trim.getPath() + " loaded to account " + accountId); } --- 976,1013 ---- * @param accountId * @param name Name of the node, which must include the full path, for example, echr:patient: + * @throws JAXBException */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ) throws JAXBException { ! Trim trim = (Trim) xmlBean.unmarshal(TRIMns, new ByteArrayInputStream( trimXML)); MenuStructure root = getRootMenuStructure( em.getReference(Account.class, accountId)); ! MenuStructure msTrim; try { ! msTrim = this.findDescendentMenuStructure(accountId, root, name); } catch( Exception e) { ! msTrim = new MenuStructure( ! root.getAccount(), root, trim.getPage(), null, 0, name, null, "true", null, "trim" ); } ! msTrim.setTrim(trimXML); ! em.merge( msTrim ); ! // Now see where this TRIM item should appear in menus, if anywhere. ! // Notice that this list is not qualified by patient so the page is a bit different than others. ! for ( String menuPath : trim.getMenus()) { ! MenuStructure msMenu = null; ! try { ! msMenu = this.findMenuStructure(accountId, menuPath); ! // System.out.println("Found " + msMenu.getPath()); ! MenuData mdMenu = new MenuData( ); ! mdMenu.setAccount(root.getAccount()); ! mdMenu.setMenuStructure(msMenu); ! Act act = (Act) trim.getAct(); ! // System.out.println("Act " + act.getTitle().getST().getValue()); ! mdMenu.setString01(act.getTitle().getST().getValue()); ! mdMenu.setString02(root.getNode() + ":" + name); ! persistMenuData(mdMenu); ! } catch( Exception e) { ! throw new RuntimeException("menuPath not found. Account: " + accountId + " Path: " + menuPath, e); ! } ! } ! System.out.println("Trim " + name + " loaded to account " + accountId); } *************** *** 888,892 **** } else if (null==parent.getParent04()) { menuData.setParent04(parent); ! } else throw new IllegalStateException( "Cannot instantiate a 5th level descendent menu data item"); } em.persist(menuData); --- 1040,1044 ---- } else if (null==parent.getParent04()) { menuData.setParent04(parent); ! } else throw new IllegalStateException( "Not possible to instantiate a 5th level descendent menu data item: " + ms.getPath()); } em.persist(menuData); *************** *** 907,910 **** --- 1059,1063 ---- account, null, "tabs.xhtml", null, 1, "echr", null, "true", null, "tab" ); em.persist( root ); + addPlaceholders( root ); addActivityTab( root ); addPatientsTab( root ); *************** *** 918,921 **** --- 1071,1075 ---- account, null, "tabs.xhtml", null, 1, "ephr", null, "true", null, "tab" ); em.persist( root ); + addPlaceholders( root ); addFamilyTab( root ); addActivityTab( root ); Index: CreatorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreatorBean.java 7 Feb 2007 01:37:50 -0000 1.2 --- CreatorBean.java 16 Feb 2007 04:02:33 -0000 1.3 *************** *** 3,9 **** import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; ! import java.security.GeneralSecurityException; import java.util.Map; - import java.util.Set; import javax.annotation.EJB; --- 3,11 ---- import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; ! import java.util.ArrayList; ! import java.util.Date; ! import java.util.HashMap; ! import java.util.List; import java.util.Map; import javax.annotation.EJB; *************** *** 15,21 **** import javax.jms.ConnectionFactory; import javax.jms.Queue; - import javax.security.auth.Subject; - import javax.security.jacc.PolicyContext; - import javax.security.jacc.PolicyContextException; import javax.xml.bind.JAXBException; --- 17,20 ---- *************** *** 27,31 **** import org.tolven.app.entity.MenuStructure; import org.tolven.core.ActivationLocal; - import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.TolvenUser; import org.tolven.core.util.Queuer; --- 26,29 ---- *************** *** 36,42 **** import org.tolven.doc.entity.CCRException; import org.tolven.doc.entity.DocXML; - import org.tolven.security.key.PrivateKeyRing; - import org.tolven.security.key.UserPrivateKey; - import org.tolven.security.key.UserPublicKey; import org.tolven.trim.Act; import org.tolven.trim.ActBind; --- 34,37 ---- *************** *** 82,97 **** factory = new TrimFactory( ); } /** * Run throught the TRIM structure and replace bind requests with an internal ID where possible. */ ! public void scanTrim( Trim trim, Map<String, String> context ) { ! for (ActSlot actSlot : trim.getActs()) { ! if (actSlot instanceof Act ) { ! scanAct( (Act) actSlot, context ); ! } } } ! public void scanAct( Act act, Map<String, String> context ) { for (ActParticipation part : act.getParticipations()) { if (part.getRole() instanceof Role) { --- 77,92 ---- factory = new TrimFactory( ); } + /** * Run throught the TRIM structure and replace bind requests with an internal ID where possible. */ ! public void scanTrim( Trim trim, List<MenuPath> context ) { ! ActSlot actSlot = trim.getAct(); ! if (actSlot instanceof Act ) { ! scanAct( (Act) actSlot, context ); } } ! public void scanAct( Act act, List<MenuPath> context ) { for (ActParticipation part : act.getParticipations()) { if (part.getRole() instanceof Role) { *************** *** 117,121 **** } ! public void scanRole( Role role, Map<String, String> context ) { for ( RoleParticipation part : role.getParticipations()) { if (part.getAct() instanceof Act) { --- 112,116 ---- } ! public void scanRole( Role role, List<MenuPath> context ) { for ( RoleParticipation part : role.getParticipations()) { if (part.getAct() instanceof Act) { *************** *** 127,130 **** --- 122,135 ---- } + public static String matchContext( String templateId, List<MenuPath> context) { + for (MenuPath item : context ) { + if (item.getPath().startsWith(templateId)) { + MenuPath newPath = new MenuPath( templateId, item); + return newPath.getPathString(); + } + } + return null; + } + /** * We're only interested in bind requests for an act. Try to find a match in the context. *************** *** 133,139 **** * @return */ ! public ActSlot bindAct( ActBind actBind, Map<String, String> context ) { if (null==context) return actBind; ! String mdPath = context.get(actBind.getTemplateId()); if (null==mdPath) return actBind; ActInternal actInternal = factory.createActInternal(actBind.getClassCode(), actBind.getMoodCode(), mdPath); --- 138,144 ---- * @return */ ! public ActSlot bindAct( ActBind actBind, List<MenuPath> context ) { if (null==context) return actBind; ! String mdPath = matchContext( actBind.getTemplateId(), context); if (null==mdPath) return actBind; ActInternal actInternal = factory.createActInternal(actBind.getClassCode(), actBind.getMoodCode(), mdPath); *************** *** 147,153 **** * @return */ ! public RoleSlot bindRole( RoleBind roleBind, Map<String, String> context ) { if (null==context) return roleBind; ! String mdPath = context.get(roleBind.getTemplateId()); if (null==mdPath) return roleBind; RoleInternal roleInternal = factory.createRoleInternal(roleBind.getClassCode(), mdPath); --- 152,158 ---- * @return */ ! public RoleSlot bindRole( RoleBind roleBind, List<MenuPath> context ) { if (null==context) return roleBind; ! String mdPath = matchContext( roleBind.getTemplateId(), context); if (null==mdPath) return roleBind; RoleInternal roleInternal = factory.createRoleInternal(roleBind.getClassCode(), mdPath); *************** *** 168,172 **** * @throws TRIMException */ ! public DocXML instantiate( MenuStructure ms, Map<String, String> context ) throws JAXBException, TRIMException { if (!"trim".equals(ms.getRole())) throw new IllegalArgumentException( "Only TRIM metadata can be instantiated"); TolvenUser user = activationBean.findUser(ejbContext.getCallerPrincipal().getName()); --- 173,177 ---- * @throws TRIMException */ ! public DocXML instantiate( MenuStructure ms, List<MenuPath> context ) throws JAXBException, TRIMException { if (!"trim".equals(ms.getRole())) throw new IllegalArgumentException( "Only TRIM metadata can be instantiated"); TolvenUser user = activationBean.findUser(ejbContext.getCallerPrincipal().getName()); *************** *** 195,199 **** * @throws TRIMException */ ! public DocXML instantiate( long accountId, String path, Map<String, String> context ) throws JAXBException, TRIMException { MenuStructure ms = menuBean.findMenuStructure(accountId, path); return instantiate( ms, context); --- 200,204 ---- * @throws TRIMException */ ! public DocXML instantiate( long accountId, String path, List<MenuPath> context ) throws JAXBException, TRIMException { MenuStructure ms = menuBean.findMenuStructure(accountId, path); return instantiate( ms, context); *************** *** 203,207 **** * Instantiate a new document and new Menudata item pointing to it. * @param accountId ! * @param ms * @param parent * @return MenuData --- 208,212 ---- * Instantiate a new document and new Menudata item pointing to it. * @param accountId ! * @param trimPath The key to the MenuStructure item containing the template XML. * @param parent * @return MenuData *************** *** 209,223 **** * @throws TRIMException */ ! // Not done yet (we'll prototype in MenuAction ! public MenuData createTRIMInstance( long accountId, String path, Map<String, String> context ) throws JAXBException, TRIMException { ! MenuStructure ms = menuBean.findMenuStructure(accountId, path); ! DocXML doc = instantiate( ms, context); MenuData md = new MenuData(); ! md.setMenuStructure(ms); ! md.setAccount(doc.getAccount()); ! // md.setParent01(patient); ! // md.setDate01(getNow()); ! // md.setString01("GCS"); md.setString02( "new"); menuBean.persistMenuData(md); return md; --- 214,269 ---- * @throws TRIMException */ ! public MenuData createTRIMInstance( long accountId, String trimPath, String context, Date now ) throws JAXBException, TRIMException { ! // Get the TRIM template as XML ! MenuStructure msTrim = menuBean.findMenuStructure(accountId, trimPath); ! if (!"trim".equals(msTrim.getRole())) throw new IllegalArgumentException( "Only TRIM metadata can be instantiated"); ! // Unmarshal the template to an object graph ! ByteArrayInputStream bs = new ByteArrayInputStream(msTrim.getTrim() ); ! Trim trim = (Trim) xmlBean.unmarshal(TRIM_NS, bs); ! // Trim tells us where to instantiate this template. eg: ephr:patient:observation ! MenuStructure msInstance = menuBean.findMenuStructure(accountId, trim.getInstance()); ! TolvenUser user = activationBean.findUser(ejbContext.getCallerPrincipal().getName()); ! DocXML docXML = documentBean.createXMLDocument( TRIM_NS, user.getId(), msInstance.getAccount().getId() ); ! System.out.println( "Document created, id: " + docXML.getId()); ! // Scan for binding requirements in TRIM ! List<MenuPath> contextList = new ArrayList<MenuPath>(); ! contextList.add(new MenuPath(context)); ! scanTrim( trim, contextList); ! // OK, now put the finished TRIM back into XML and store in the document. ! ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; ! xmlBean.marshalTRIM(trim, trimXML); ! docXML.setContent(trimXML.toByteArray()); ! // Document remains in new status, but is saved (persist/merge) ! documentBean.saveDocument(docXML); ! System.out.println( "Document saved, id: " + docXML.getId()); ! // Create a menuData item to contain the new instance, at least until we submit. MenuData md = new MenuData(); ! md.setMenuStructure(msInstance); ! md.setAccount(docXML.getAccount()); ! long[] snk = new MenuPath(context).getSignificantNodeKeys( ); ! if (snk.length > 0) { ! MenuData parent01 = menuBean.findMenuDataItem(snk[0]); ! md.setParent01(parent01); ! } ! if (snk.length > 1) { ! MenuData parent02 = menuBean.findMenuDataItem(snk[1]); ! md.setParent02(parent02); ! } ! if (snk.length > 2) { ! MenuData parent03 = menuBean.findMenuDataItem(snk[2]); ! md.setParent03(parent03); ! } ! if (snk.length > 3) { ! MenuData parent04 = menuBean.findMenuDataItem(snk[3]); ! md.setParent04(parent04); ! } ! ! md.setDate01(now); ! ActSlot actSlot = trim.getAct(); ! if (actSlot instanceof Act) { ! md.setString01(((Act)actSlot).getTitle().getST().getValue()); ! } md.setString02( "new"); + md.setDocumentId(docXML.getId()); menuBean.persistMenuData(md); return md; *************** *** 266,299 **** } - // /** - // * Return the PrivateKeyRing for the user - // * @return - // * @throws PolicyContextException - // * @throws GeneralSecurityException - // */ - // private PrivateKeyRing getPrivateKeyRing() throws PolicyContextException, GeneralSecurityException { - // Subject subject = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container"); - // if (subject == null) - // throw new GeneralSecurityException("No Subject found in PolicyContext for " + ejbContext.getCallerPrincipal()); - // Set privateCredentials = subject.getPrivateCredentials(PrivateKeyRing.class); - // if (privateCredentials.isEmpty()) - // throw new GeneralSecurityException(": No PrivateKeyRing found for " + ejbContext.getCallerPrincipal()); - // return (PrivateKeyRing) privateCredentials.iterator().next(); - // } - // - // - // /** - // * Update the PrivateKeyRing with the AccountPrivateKey of the Account that the user is currently logged into - // * @throws PolicyContextException - // * @throws GeneralSecurityException - // */ - // private void updatePrivateKeyRing(long accountUserId) throws PolicyContextException, GeneralSecurityException { - // PrivateKeyRing privateKeyRing = getPrivateKeyRing(); - // AccountUser accountUser = activationBean.findAccountUser(accountUserId); - // if (accountUser == null) - // throw new GeneralSecurityException(": No AccountUser found for " + ejbContext.getCallerPrincipal()); - // privateKeyRing.setAccountPrivateKey(accountUser.getAccountPrivateKey()); - // } - - } --- 312,314 ---- Index: MenuQueryControl.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuQueryControl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MenuQueryControl.java 8 Feb 2007 04:47:29 -0000 1.6 --- MenuQueryControl.java 16 Feb 2007 04:02:33 -0000 1.7 *************** *** 14,17 **** --- 14,20 ---- package org.tolven.app.bean; + import java.util.List; + + import org.tolven.app.entity.MenuData; import org.tolven.app.entity.MenuStructure; *************** *** 23,27 **** public class MenuQueryControl extends QueryControl { private MenuStructure menuStructure; ! public MenuQueryControl() { super(); --- 26,33 ---- public class MenuQueryControl extends QueryControl { private MenuStructure menuStructure; ! private MenuStructure actualMenuStructure; ! private List<String> queryNames; ! private List<Long> queryValues; ! private MenuPath resolvedPath; public MenuQueryControl() { super(); *************** *** 83,91 **** public String toString() { StringBuffer sb = new StringBuffer( 500 ); sb.append(super.toString()); - sb.append( " Requested Path: ["); sb.append(getRequestedPath());sb.append( "]"); - sb.append( " Original Path: ["); sb.append(getOriginalTargetPath());sb.append( "]"); return sb.toString(); } } --- 89,130 ---- public String toString() { StringBuffer sb = new StringBuffer( 500 ); + sb.append( " Requested Path: ["); sb.append(getRequestedPath().getPathString());sb.append( "]"); + sb.append( " Original Path: ["); sb.append(getOriginalTargetPath().getPathString());sb.append( "]"); + sb.append( " Resolved Path: ["); sb.append(getResolvedPath().getPathString());sb.append( "]"); sb.append(super.toString()); return sb.toString(); } + + /** + * When a query is setup, this contains the requested Menustructure. If the requested MenuStructure + * references another MenuStruction, then the actual menustructure will be set accordingly. + * @return + */ + public MenuStructure getActualMenuStructure() { + if (actualMenuStructure==null) return getMenuStructure(); + return actualMenuStructure; + } + + public void setActualMenuStructure(MenuStructure actualMenuStructure) { + this.actualMenuStructure = actualMenuStructure; + } + + public MenuPath getResolvedPath( ) { + if (resolvedPath==null) { + // We need to start with a new path based on the referenced list, not the original list + resolvedPath = new MenuPath( getActualMenuStructure().getPath(), getRequestedPath() ); + } + return resolvedPath; + } + + public long getParentId( int level) { + long[] snk = getResolvedPath().getSignificantNodeKeys( ); + if (level < snk.length ) { + return snk[level]; + } else { + return 0; + } + } + } |
|
From: John C. <jc...@us...> - 2007-02-16 04:02:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/app Modified Files: MenuRemote.java CreatorRemote.java MenuLocal.java CreatorLocal.java Log Message: New data generator capabilities (allergies, medications) Index: CreatorLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/CreatorLocal.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreatorLocal.java 7 Feb 2007 01:37:50 -0000 1.2 --- CreatorLocal.java 16 Feb 2007 04:02:33 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- package org.tolven.app; + import java.util.Date; import java.util.Map; *************** *** 11,26 **** public interface CreatorLocal { /** ! * Instantiate a new document based on the supplied MenuStructure item which must be role=trim. ! * the optional "parent" MenuData provides context. For example, a ! * typical parent would be a specific patient. ! * This should also be where we do blending. ! * @param ms The menustructure item, which must have a role of "trim" ! * @param parent Parent menu data item, if applicable, otherwise, null ! * @return A new document containing this instantiated template. The document may actually contain a number of ! * nested templates. But we don't care at this point. */ ! public DocXML instantiate( MenuStructure ms, Map<String, String> context ) throws JAXBException, TRIMException; ! public DocXML instantiate( long accountId, String path, Map<String, String> context ) throws JAXBException, TRIMException; /** --- 12,26 ---- public interface CreatorLocal { + /** ! * Instantiate a new document and new Menudata item pointing to it. ! * @param accountId ! * @param ms ! * @param parent ! * @return MenuData ! * @throws JAXBException ! * @throws TRIMException */ ! public MenuData createTRIMInstance( long accountId, String trimPath, String context, Date now ) throws JAXBException, TRIMException; /** Index: CreatorRemote.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/CreatorRemote.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreatorRemote.java 7 Feb 2007 01:37:50 -0000 1.2 --- CreatorRemote.java 16 Feb 2007 04:02:33 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- package org.tolven.app; + import java.util.Date; import java.util.Map; *************** *** 11,24 **** public interface CreatorRemote { /** ! * Instantiate a new document based on the supplied MenuStructure item which must be role=trim. ! * the optional "parent" MenuData provides context. For example, a ! * typical parent would be a specific patient. ! * This should also be where we do blending. ! * @param ms The menustructure item, which must have a role of "trim" ! * @param parent Parent menu data item, if applicable, otherwise, null ! * @return A new document containing this instantiated template. The document may actually contain a number of ! * nested templates. But we don't care at this point. */ ! public DocXML instantiate( long accountId, String path, Map<String, String> context ) throws JAXBException, TRIMException; /** --- 12,25 ---- public interface CreatorRemote { /** ! /** ! * Instantiate a new document and new Menudata item pointing to it. ! * @param accountId ! * @param ms ! * @param parent ! * @return MenuData ! * @throws JAXBException ! * @throws TRIMException */ ! public MenuData createTRIMInstance( long accountId, String trimPath, String context, Date now ) throws JAXBException, TRIMException; /** Index: MenuRemote.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/MenuRemote.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MenuRemote.java 8 Feb 2007 04:47:29 -0000 1.2 --- MenuRemote.java 16 Feb 2007 04:02:33 -0000 1.3 *************** *** 3,6 **** --- 3,8 ---- import java.util.List; + import javax.xml.bind.JAXBException; + import org.tolven.app.bean.MenuQueryControl; import org.tolven.app.entity.MenuData; *************** *** 143,147 **** * @param root */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ); /** --- 145,149 ---- * @param root */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ) throws JAXBException; /** Index: MenuLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/MenuLocal.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** MenuLocal.java 8 Feb 2007 04:47:29 -0000 1.17 --- MenuLocal.java 16 Feb 2007 04:02:33 -0000 1.18 *************** *** 21,24 **** --- 21,26 ---- import java.util.List; + import javax.xml.bind.JAXBException; + import org.tolven.app.bean.MenuQueryControl; import org.tolven.app.entity.MenuData; *************** *** 85,88 **** --- 87,94 ---- /** + * Direct access to a menuData item by id. An exception is thrown if not found. + */ + public MenuData findMenuDataItem( long id ); + /** * <p>Find a menu data item - this is an exact-match although we just return null if not found (EJB spec says to thrown an error for a singleResult query). * For security purposes, we include *************** *** 178,182 **** * @param root */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ); /** --- 184,188 ---- * @param root */ ! public void loadTRIM( long accountId, String name, byte[] trimXML ) throws JAXBException; /** |
|
From: John C. <jc...@us...> - 2007-02-16 04:02:35
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/gen/model Modified Files: GenMedical.java CholesterolGen.java GenMedicalCCR.java AsthmaGen.java HypertensionGen.java DiabetesGen.java Added Files: WellBabyGen.java Log Message: New data generator capabilities (allergies, medications) Index: DiabetesGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/DiabetesGen.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DiabetesGen.java 26 Jan 2007 06:45:34 -0000 1.2 --- DiabetesGen.java 16 Feb 2007 04:02:30 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- package org.tolven.gen.model; + import java.util.Date; import java.util.GregorianCalendar; *************** *** 24,39 **** */ public class DiabetesGen extends ChronicDiseaseGen { ! public DiabetesGen( RandomData rng ) { this.rng = rng; setDiseaseName( "Diabetes Mellitus" ); ! addMatcher( new DemogMatcher( 0, 20, "M", 0.04)); ! addMatcher( new DemogMatcher( 0, 20, "F", 0.06)); ! addMatcher( new DemogMatcher( 20, 40, "M", 0.012)); ! addMatcher( new DemogMatcher( 20, 40, "F", 0.018)); ! addMatcher( new DemogMatcher( 40, 60, "M", 0.052)); ! addMatcher( new DemogMatcher( 40, 60, "F", 0.078)); ! addMatcher( new DemogMatcher( 60, 200, "M", 0.08)); ! addMatcher( new DemogMatcher( 60, 200, "F", 0.12)); // Some scenario components we'll use below Scenario podiatry = new RadiologyScenario( "Foot Exam", "No abnormality noted on either foot.", "Normal"); --- 25,40 ---- */ public class DiabetesGen extends ChronicDiseaseGen { ! double demoSkew = 5.0; // Increase the odds for demo purposes. Can be returned to 1.0 for realistic public DiabetesGen( RandomData rng ) { this.rng = rng; setDiseaseName( "Diabetes Mellitus" ); ! addMatcher( new DemogMatcher( 0, 20, "M", 0.04*demoSkew)); ! addMatcher( new DemogMatcher( 0, 20, "F", 0.06*demoSkew)); ! addMatcher( new DemogMatcher( 20, 40, "M", 0.012*demoSkew)); ! addMatcher( new DemogMatcher( 20, 40, "F", 0.018*demoSkew)); ! addMatcher( new DemogMatcher( 40, 60, "M", 0.052*demoSkew)); ! addMatcher( new DemogMatcher( 40, 60, "F", 0.078*demoSkew)); ! addMatcher( new DemogMatcher( 60, 200, "M", 0.08*demoSkew)); ! addMatcher( new DemogMatcher( 60, 200, "F", 0.12*demoSkew)); // Some scenario components we'll use below Scenario podiatry = new RadiologyScenario( "Foot Exam", "No abnormality noted on either foot.", "Normal"); *************** *** 73,75 **** --- 74,91 ---- })); } + + @Override + protected void apply(GenMedical patient, Date eventTime) { + patient.generateMedication(eventTime, + "glucophage 500 mg tablets", + "120 tablets", + "take two tablets twice a day for diabetes", + "2"); + patient.generateMedication(eventTime, + "tolbutamide 500 mg tablets", + "120 tablets", + "take two tablets twice a day for diabetes", + "2"); + super.apply(patient, eventTime); + } } Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenMedical.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GenMedical.java 26 Jan 2007 06:45:34 -0000 1.2 --- GenMedical.java 16 Feb 2007 04:02:30 -0000 1.3 *************** *** 78,81 **** --- 78,84 ---- criteria.add(new ProstateCancerGen(rng)); criteria.add(new PregnantGen(rng)); + criteria.add(new WellBabyGen(rng)); + // criteria.add(new WellChildGen(rng)); + // criteria.add(new WellAdultGen(rng)); } return criteria; *************** *** 125,128 **** --- 128,136 ---- /** + * Generate one allergy. + */ + public abstract void generateAllergy( Date onset, String allergy, String status ); + + /** * Generate a lab result. We ignore requests before the start date presuming that if the practice wasn't in * business, then the results wouldn't be in this record. *************** *** 142,145 **** --- 150,159 ---- public abstract void generateAppointment( Date effective, String purpose, String location, String practitioner, String instructions ); + /** + * Generate a medication + * @return + */ + public abstract void generateMedication( Date effective, String name, String dispense, String instuctions, String refills ); + public boolean isMale() { return male; Index: HypertensionGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/HypertensionGen.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HypertensionGen.java 16 Jan 2007 06:12:45 -0000 1.1 --- HypertensionGen.java 16 Feb 2007 04:02:30 -0000 1.2 *************** *** 14,17 **** --- 14,19 ---- package org.tolven.gen.model; + import java.util.Date; + import org.apache.commons.math.random.RandomData; *************** *** 30,33 **** --- 32,49 ---- addMatcher( new DemogMatcher( 60, 200, "F", 0.284)); } + @Override + protected void apply(GenMedical patient, Date eventTime) { + patient.generateMedication(eventTime, + "chlorothiazide 500 mg tablets", + "30 tablets", + "take 1 tablet every day for high blood pressure", + "2"); + patient.generateMedication(eventTime, + "captopril 25 mg tablets", + "60 tablets", + "take 1 tablet every day for high blood pressure", + "2"); + super.apply(patient, eventTime); + } } Index: CholesterolGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/CholesterolGen.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CholesterolGen.java 16 Jan 2007 06:12:46 -0000 1.1 --- CholesterolGen.java 16 Feb 2007 04:02:30 -0000 1.2 *************** *** 22,26 **** public CholesterolGen(RandomData rng ) { this.rng = rng; ! setDiseaseName( "HighCholesterol" ); addMatcher( new DemogMatcher( 0, 20, "M", 0.1105)); addMatcher( new DemogMatcher( 0, 20, "F", 0.0595)); --- 22,26 ---- public CholesterolGen(RandomData rng ) { this.rng = rng; ! setDiseaseName( "High Cholesterol" ); addMatcher( new DemogMatcher( 0, 20, "M", 0.1105)); addMatcher( new DemogMatcher( 0, 20, "F", 0.0595)); --- NEW FILE: WellBabyGen.java --- package org.tolven.gen.model; import java.util.Date; import java.util.GregorianCalendar; import org.apache.commons.math.random.RandomData; public class WellBabyGen extends GenSource { public WellBabyGen( RandomData rng ) { this.rng = rng; addMatcher( new DemogMatcher( 0, 6, "M", 0.99)); addMatcher( new DemogMatcher( 0, 6, "F", 0.99)); Scenario annualAppt = new AppointmentScenario( "Routine well-baby checkup", null, null, null); this.setScenario(new RepeatScenario(GregorianCalendar.MONTH, 12,1.5, false, 0, 0, annualAppt)); } @Override protected void apply(GenMedical patient, Date eventTime) { patient.generateAllergy(eventTime, "Hay Fever", "Active"); super.apply(patient, eventTime); } } Index: GenMedicalCCR.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenMedicalCCR.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GenMedicalCCR.java 26 Jan 2007 06:45:34 -0000 1.2 --- GenMedicalCCR.java 16 Feb 2007 04:02:30 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- package org.tolven.gen.model; + import java.math.BigInteger; import java.util.Date; import java.util.GregorianCalendar; *************** *** 9,21 **** --- 10,28 ---- import org.apache.commons.math.random.RandomData; import org.tolven.ccr.ActorType; + import org.tolven.ccr.AlertType; import org.tolven.ccr.CodedDescriptionType; import org.tolven.ccr.ContinuityOfCareRecord; import org.tolven.ccr.DateTimeType; + import org.tolven.ccr.Direction; + import org.tolven.ccr.Directions; import org.tolven.ccr.EncounterType; import org.tolven.ccr.IDType; + import org.tolven.ccr.InstructionType; import org.tolven.ccr.Location; + import org.tolven.ccr.ObjectFactory; import org.tolven.ccr.PersonNameType; import org.tolven.ccr.ProblemType; import org.tolven.ccr.ResultType; + import org.tolven.ccr.StructuredProductType; import org.tolven.ccr.TestType; import org.tolven.ccr.ActorType.Address; *************** *** 132,135 **** --- 139,143 ---- } } + /** * Generate one problem. CCR supports episodes, we could but don't take that into account. Herpes *************** *** 149,152 **** --- 157,175 ---- /** + * Generate one allergy. + */ + public void generateAllergy( Date onset, String allergy, String status ) { + AlertType alert = ccrFactory.createAlertType(); + // Set the type + alert.setTypeText("Allergy"); + alert.setDateTimeType("Start Date", onset); + alert.setStatusText(status); + alert.setDescriptionText(allergy); + if (ccr.getBody()==null) ccr.setBody( ccrFactory.createContinuityOfCareRecordBody()); + if (ccr.getBody().getAlerts()==null) ccr.getBody().setAlerts(ccrFactory.createContinuityOfCareRecordBodyAlerts()); + ccr.getBody().getAlerts().getAlert().add(alert); + } + + /** * Generate a lab result. We ignore requests before the start date presuming that if the practice wasn't in * business, then the results wouldn't be in this record. *************** *** 250,252 **** --- 273,305 ---- } + /** + * Generate a medication + * @return + */ + public void generateMedication( Date effective, String name, String dispense, String instuctions, String refills ) { + if (ccr.getBody()==null) ccr.setBody( ccrFactory.createContinuityOfCareRecordBody()); + if (ccr.getBody().getMedications()==null) ccr.getBody().setMedications(ccrFactory.createContinuityOfCareRecordBodyMedications()); + // Add medication to the CCR Body + StructuredProductType med = ccrFactory.createStructuredProductType(); + med.setDateTimeType("Start Date", effective); + med.setTypeText("Medication"); + med.setDescriptionText(name); + med.setStatusText("Active"); + // Instructions + CodedDescriptionType descriptionField = ObjectFactory.getInstance().createCodedDescriptionType(); + descriptionField.setText(instuctions); + InstructionType instruction = ObjectFactory.getInstance().createInstructionType(); + instruction.setText(instuctions); + StructuredProductType.PatientInstructions instructions = ObjectFactory.getInstance().createStructuredProductTypePatientInstructions(); + instructions.getInstruction().add(instruction); + med.setPatientInstructions(instructions); + // Refills + StructuredProductType.Refills.Refill refill = ObjectFactory.getInstance().createStructuredProductTypeRefillsRefill(); + refill.getNumber().add(new BigInteger( refills)); + StructuredProductType.Refills refillsField = ObjectFactory.getInstance().createStructuredProductTypeRefills(); + refillsField.getRefill().add(refill); + med.setRefills(refillsField); + ccr.getBody().getMedications().getMedication().add(med); + } + } Index: AsthmaGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/AsthmaGen.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AsthmaGen.java 16 Jan 2007 06:12:46 -0000 1.1 --- AsthmaGen.java 16 Feb 2007 04:02:30 -0000 1.2 *************** *** 31,34 **** --- 31,44 ---- addMatcher( new DemogMatcher( 60, 200, "M", 0.03)); addMatcher( new DemogMatcher( 60, 200, "F", 0.03)); + + } + @Override + protected void apply(GenMedical patient, Date eventTime) { + patient.generateMedication(eventTime, + "salmeterol xinafoate inhalation powder", + "1 diskus", + "one inhalation twice daily for asthma", + "2"); + super.apply(patient, eventTime); } |
|
From: John C. <jc...@us...> - 2007-02-16 04:02:34
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/app/entity Modified Files: MenuData.java MenuStructure.java Log Message: New data generator capabilities (allergies, medications) Index: MenuStructure.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity/MenuStructure.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MenuStructure.java 4 Feb 2007 16:39:57 -0000 1.11 --- MenuStructure.java 16 Feb 2007 04:02:33 -0000 1.12 *************** *** 113,117 **** private MenuStructure parent; ! @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY) protected Collection<MenuStructure> children = new HashSet<MenuStructure>(); --- 113,120 ---- private MenuStructure parent; ! @ManyToOne(fetch = FetchType.LAZY) ! private MenuStructure referenced; ! ! @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY) protected Collection<MenuStructure> children = new HashSet<MenuStructure>(); *************** *** 352,356 **** } /** ! * Depending on the template, this role helps determine where in the page this menu item accurs. * For example, menuItem is a common role used for the main menu structure. Portlet could also be a role, * context, etc. --- 355,359 ---- } /** ! * Depending on the template, this role helps determine where in the page this menu item occurs. * For example, menuItem is a common role used for the main menu structure. Portlet could also be a role, * context, etc. *************** *** 396,399 **** --- 399,417 ---- this.trim = trim; } + /** + * <p>When non-null, a "list" item refers to another MenuStructure item that actually contains the data. + * This allows a list to be moved around in the menu structure while the rule that populates the list always + * does do in a consistent place.</p> + * <p>This also allows a list, such as a generic menu to be accessed from within, say, the patient context without + * requiring patient to be specified in the path</p> + * @return + */ + public MenuStructure getReferenced() { + return referenced; + } + + public void setReferenced(MenuStructure referenced) { + this.referenced = referenced; + } } Index: MenuData.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity/MenuData.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MenuData.java 4 Feb 2007 16:39:57 -0000 1.14 --- MenuData.java 16 Feb 2007 04:02:33 -0000 1.15 *************** *** 373,380 **** // System.out.println( "[calculatePath] placeholder: " + plevel + " progress=" + sb.toString() + " for " + ms.getPath() ); switch ( plevel ) { ! case 1: {sb.append( getParent01().getId());break;} ! case 2: {sb.append( getParent02().getId());break;} ! case 3: {sb.append( getParent03().getId());break;} ! case 4: {sb.append( getParent04().getId());break;} } } --- 373,396 ---- // System.out.println( "[calculatePath] placeholder: " + plevel + " progress=" + sb.toString() + " for " + ms.getPath() ); switch ( plevel ) { ! case 1: { ! if (null==getParent01()) throw new NullPointerException( "Parent01 missing in MenuData for " + getMenuStructure().getPath()); ! sb.append( getParent01().getId()); ! break; ! } ! case 2: { ! if (null==getParent02()) throw new NullPointerException( "Parent02 missing in MenuData for " + getMenuStructure().getPath()); ! sb.append( getParent02().getId()); ! break; ! } ! case 3: { ! if (null==getParent03()) throw new NullPointerException( "Parent03 missing in MenuData for " + getMenuStructure().getPath()); ! sb.append( getParent03().getId()); ! break; ! } ! case 4: { ! if (null==getParent04()) throw new NullPointerException( "Parent04 missing in MenuData for " + getMenuStructure().getPath()); ! sb.append( getParent04().getId()); ! break; ! } } } |
|
From: John C. <jc...@us...> - 2007-02-16 04:02:34
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25852/src/org/tolven/gen/util Modified Files: FamilyGenerator.java Log Message: New data generator capabilities (allergies, medications) Index: FamilyGenerator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/util/FamilyGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FamilyGenerator.java 12 Feb 2007 07:07:45 -0000 1.2 --- FamilyGenerator.java 16 Feb 2007 04:02:33 -0000 1.3 *************** *** 65,68 **** --- 65,69 ---- family.setFamilyName(person.getLast()); } + person.setLast(family.getFamilyName()); primaryGender = person.getGender(); FamilyMemberRole role; |
|
From: John C. <jc...@us...> - 2007-02-16 04:01:18
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25364/src/org/tolven/core/entity Modified Files: AccountType.java Log Message: Add unique constraint on known type (echr, ephr, etc) Index: AccountType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/AccountType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccountType.java 16 Jan 2007 06:22:24 -0000 1.4 --- AccountType.java 16 Feb 2007 04:01:14 -0000 1.5 *************** *** 20,24 **** --- 20,26 ---- import javax.persistence.GenerationType; import javax.persistence.Id; + import javax.persistence.OneToOne; import javax.persistence.Table; + import javax.persistence.UniqueConstraint; import org.hibernate.annotations.Cache; *************** *** 36,40 **** @Entity @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) ! @Table(name = "ACCOUNT_TYPE", schema="core") public class AccountType implements Serializable { --- 38,44 ---- @Entity @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) ! @Table(name = "ACCOUNT_TYPE", schema="core", ! uniqueConstraints=@UniqueConstraint( columnNames={"KNOWN_TYPE"}) ! ) public class AccountType implements Serializable { *************** *** 58,61 **** --- 62,68 ---- private String status; + @OneToOne() + private Account accountTemplate; + /** Creates a new instance of AccountType */ public AccountType() { *************** *** 113,117 **** this.status = status; } ! ! } --- 120,136 ---- this.status = status; } ! ! /** ! * The account used as the template for a new account for this AccountType. ! * the menustructure from this account is copied to the new account. ! * The selected account should not have users (AccountUser). ! * @return ! */ ! public Account getAccountTemplate() { ! return accountTemplate; ! } ! ! public void setAccountTemplate(Account accountTemplate) { ! this.accountTemplate = accountTemplate; ! } } |
|
From: John C. <jc...@us...> - 2007-02-16 04:00:20
|
Update of /cvsroot/tolven/tolvenEJB/src/test/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24890/src/test/rules Modified Files: RuleBaseTests.java Log Message: due to new TRIM schema Index: RuleBaseTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/rules/RuleBaseTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RuleBaseTests.java 4 Feb 2007 16:39:57 -0000 1.1 --- RuleBaseTests.java 16 Feb 2007 04:00:18 -0000 1.2 *************** *** 60,64 **** public Trim createTrim1( ) { Trim trim = factory.createTrim(); ! trim.getActs().add(createAct1()); return trim; } --- 60,64 ---- public Trim createTrim1( ) { Trim trim = factory.createTrim(); ! trim.setAct(createAct1()); return trim; } |
|
From: John C. <jc...@us...> - 2007-02-16 04:00:20
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24890/src/test/org/tolven/trim/xml Modified Files: ActXMLTests.java Log Message: due to new TRIM schema Index: ActXMLTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml/ActXMLTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActXMLTests.java 4 Feb 2007 16:39:58 -0000 1.1 --- ActXMLTests.java 16 Feb 2007 04:00:18 -0000 1.2 *************** *** 36,40 **** // Create an object graph Trim trim = factory.createTrim(); ! trim.getActs().add(createAct1()); // Marshal to XML. String xml = marshal(trim ); --- 36,40 ---- // Create an object graph Trim trim = factory.createTrim(); ! trim.setAct(createAct1()); // Marshal to XML. String xml = marshal(trim ); *************** *** 42,55 **** // Now unmarshal back to objects Trim trim2 = unmarshal(xml); ! for (ActSlot act : trim2.getActs()) { ! if (act instanceof Act ) { ! System.out.println( "TRIM Act: " + ((Act)act).getClassCode() + "-" + ((Act)act).getMoodCode()); ! } ! if (act instanceof ActInternal ) { ! System.out.println( "TRIM Act Internal: " + ((ActInternal)act).getInternalId()); ! } ! if (act instanceof ActNull ) { ! System.out.println( "TRIM Act null, flavor: " + ((ActNull)act).getFlavor()); ! } } } --- 42,54 ---- // Now unmarshal back to objects Trim trim2 = unmarshal(xml); ! ActSlot act = trim2.getAct(); ! if (act instanceof Act ) { ! System.out.println( "TRIM Act: " + ((Act)act).getClassCode() + "-" + ((Act)act).getMoodCode()); ! } ! if (act instanceof ActInternal ) { ! System.out.println( "TRIM Act Internal: " + ((ActInternal)act).getInternalId()); ! } ! if (act instanceof ActNull ) { ! System.out.println( "TRIM Act null, flavor: " + ((ActNull)act).getFlavor()); } } |
|
From: John C. <jc...@us...> - 2007-02-16 04:00:20
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24890/src/org/tolven/doc/bean Modified Files: RulesBaseFactory.java Log Message: due to new TRIM schema Index: RulesBaseFactory.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/RulesBaseFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RulesBaseFactory.java 7 Feb 2007 01:37:50 -0000 1.2 --- RulesBaseFactory.java 16 Feb 2007 04:00:18 -0000 1.3 *************** *** 66,70 **** return ruleBase; } catch (Exception e) { ! System.out.println( "Error opening RuleBase: " + ruleFile + e.getMessage()); throw e; } --- 66,70 ---- return ruleBase; } catch (Exception e) { ! System.out.println( "Error opening RuleBase: " + ruleFile + " " + e.getMessage()); throw e; } |
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/trim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23992/src/org/tolven/trim Modified Files: TelecommunicationAddressUse.java SETCESlot.java ActRelationshipSplit.java ActClass.java ContextControl.java ActMood.java RoleLinkType.java RoleSlot.java ParticipationSignature.java EntityStatus.java EntityDeterminer.java IVLTS.java CD.java PQ.java ObjectFactory.java ActStatusSlot.java Observation.java ActBind.java ActParticipation.java NullFlavor.java Trim.java EntityNamePartType.java CV.java package-info.java RoleClass.java ActRelationshipType.java IVLINT.java TSSlot.java BL.java ActRelationshipCheckpoint.java AddressUse.java ActNull.java EntityClass.java IntegrityCheckType.java ActRelationshipSubset.java RealmCode.java CDSlot.java RoleInternal.java OutboundActRelationship.java RoleReference.java PostalAddressUse.java ED.java Participation.java BLSlot.java DataType.java STSlot.java CESlot.java RoleNull.java EntityNameUse.java ActSlot.java Slot.java II.java TsBoundary.java IntegrityCheckAlgorithm.java EntityNamePartQualifier.java RoleBind.java GTSSlot.java ActRelationshipJoin.java TELFieldType.java ParticipationType.java UpdateCode.java BinaryDataEncoding.java ParticipationSubset.java IntegrityCheck.java RelationshipConjunction.java AddressPartType.java GTS.java ActReference.java ActRelationship.java CompressionAlgorithm.java SETIISlot.java ActInternal.java URL.java ST.java ObservationValueSlot.java IVLINTSlot.java CR.java ActStatus.java SetOperator.java RoleParticipation.java TimingEvent.java InboundActRelationship.java RoleStatus.java Role.java Act.java EDSlot.java CE.java Log Message: Updated TRIM schema Index: EntityStatus.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityStatus.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EntityStatus.java 4 Feb 2007 16:39:55 -0000 1.1 --- EntityStatus.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: BLSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BLSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BLSlot.java 4 Feb 2007 16:39:55 -0000 1.1 --- BLSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActMood.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActMood.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActMood.java 4 Feb 2007 16:39:51 -0000 1.1 --- ActMood.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: SetOperator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SetOperator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SetOperator.java 4 Feb 2007 16:39:56 -0000 1.1 --- SetOperator.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: EDSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EDSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EDSlot.java 4 Feb 2007 16:39:56 -0000 1.1 --- EDSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: InboundActRelationship.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/InboundActRelationship.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InboundActRelationship.java 4 Feb 2007 16:39:54 -0000 1.1 --- InboundActRelationship.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: RelationshipConjunction.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RelationshipConjunction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RelationshipConjunction.java 4 Feb 2007 16:39:56 -0000 1.1 --- RelationshipConjunction.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: OutboundActRelationship.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/OutboundActRelationship.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OutboundActRelationship.java 4 Feb 2007 16:39:53 -0000 1.1 --- OutboundActRelationship.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActBind.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActBind.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActBind.java 4 Feb 2007 16:39:52 -0000 1.1 --- ActBind.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: EntityDeterminer.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityDeterminer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EntityDeterminer.java 4 Feb 2007 16:39:52 -0000 1.1 --- EntityDeterminer.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: IVLINT.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLINT.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IVLINT.java 4 Feb 2007 16:39:52 -0000 1.1 --- IVLINT.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: RoleParticipation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleParticipation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoleParticipation.java 4 Feb 2007 16:39:54 -0000 1.1 --- RoleParticipation.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: DataType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/DataType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DataType.java 4 Feb 2007 16:39:56 -0000 1.1 --- DataType.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: EntityNamePartQualifier.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityNamePartQualifier.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EntityNamePartQualifier.java 4 Feb 2007 16:39:56 -0000 1.1 --- EntityNamePartQualifier.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: GTSSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/GTSSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GTSSlot.java 4 Feb 2007 16:39:53 -0000 1.1 --- GTSSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: BinaryDataEncoding.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BinaryDataEncoding.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BinaryDataEncoding.java 4 Feb 2007 16:39:56 -0000 1.1 --- BinaryDataEncoding.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: AddressPartType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressPartType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddressPartType.java 4 Feb 2007 16:39:54 -0000 1.1 --- AddressPartType.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActClass.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActClass.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActClass.java 4 Feb 2007 16:39:51 -0000 1.1 --- ActClass.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationshipJoin.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipJoin.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationshipJoin.java 4 Feb 2007 16:39:53 -0000 1.1 --- ActRelationshipJoin.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: STSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/STSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** STSlot.java 4 Feb 2007 16:39:56 -0000 1.1 --- STSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationshipSubset.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSubset.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationshipSubset.java 4 Feb 2007 16:39:55 -0000 1.1 --- ActRelationshipSubset.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActSlot.java 4 Feb 2007 16:39:56 -0000 1.1 --- ActSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActStatus.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatus.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActStatus.java 4 Feb 2007 16:39:54 -0000 1.1 --- ActStatus.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActNull.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActNull.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActNull.java 4 Feb 2007 16:39:55 -0000 1.1 --- ActNull.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationshipType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationshipType.java 4 Feb 2007 16:39:55 -0000 1.1 --- ActRelationshipType.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: NullFlavor.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NullFlavor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NullFlavor.java 4 Feb 2007 16:39:55 -0000 1.1 --- NullFlavor.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: TelecommunicationAddressUse.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TelecommunicationAddressUse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TelecommunicationAddressUse.java 4 Feb 2007 16:39:51 -0000 1.1 --- TelecommunicationAddressUse.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: RoleSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoleSlot.java 4 Feb 2007 16:39:54 -0000 1.1 --- RoleSlot.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ParticipationType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ParticipationType.java 4 Feb 2007 16:39:53 -0000 1.1 --- ParticipationType.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: EntityClass.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityClass.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EntityClass.java 4 Feb 2007 16:39:52 -0000 1.1 --- EntityClass.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: Observation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/Observation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Observation.java 4 Feb 2007 16:39:52 -0000 1.1 --- Observation.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: IntegrityCheckType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IntegrityCheckType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IntegrityCheckType.java 4 Feb 2007 16:39:55 -0000 1.1 --- IntegrityCheckType.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ParticipationSubset.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationSubset.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ParticipationSubset.java 4 Feb 2007 16:39:54 -0000 1.1 --- ParticipationSubset.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: CD.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CD.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CD.java 4 Feb 2007 16:39:55 -0000 1.1 --- CD.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActStatusSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatusSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActStatusSlot.java 4 Feb 2007 16:39:52 -0000 1.1 --- ActStatusSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationshipCheckpoint.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipCheckpoint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationshipCheckpoint.java 4 Feb 2007 16:39:55 -0000 1.1 --- ActRelationshipCheckpoint.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActParticipation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActParticipation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActParticipation.java 4 Feb 2007 16:39:55 -0000 1.1 --- ActParticipation.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: SETCESlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SETCESlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SETCESlot.java 4 Feb 2007 16:39:54 -0000 1.1 --- SETCESlot.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ObjectFactory.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ObjectFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ObjectFactory.java 4 Feb 2007 16:39:52 -0000 1.1 --- ObjectFactory.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // *************** *** 38,126 **** /** ! * Create an instance of {@link IVLTS } ! * ! */ ! public IVLTS createIVLTS() { ! return new IVLTS(); ! } ! ! /** ! * Create an instance of {@link CDSlot } ! * ! */ ! public CDSlot createCDSlot() { ! return new CDSlot(); ! } ! ! /** ! * Create an instance of {@link ActBind } * */ ! public ActBind createActBind() { ! return new ActBind(); } /** ! * Create an instance of {@link CE } * */ ! public CE createCE() { ! return new CE(); } /** ! * Create an instance of {@link SETCESlot } * */ ! public SETCESlot createSETCESlot() { ! return new SETCESlot(); } /** ! * Create an instance of {@link RoleParticipation } * */ ! public RoleParticipation createRoleParticipation() { ! return new RoleParticipation(); } /** ! * Create an instance of {@link RoleNull } * */ ! public RoleNull createRoleNull() { ! return new RoleNull(); } /** ! * Create an instance of {@link SETIISlot } * */ ! public SETIISlot createSETIISlot() { ! return new SETIISlot(); } /** ! * Create an instance of {@link ActInternal } * */ ! public ActInternal createActInternal() { ! return new ActInternal(); } /** ! * Create an instance of {@link CV } * */ ! public CV createCV() { ! return new CV(); } /** ! * Create an instance of {@link PQ } * */ ! public PQ createPQ() { ! return new PQ(); } --- 38,110 ---- /** ! * Create an instance of {@link ActParticipation } * */ ! public ActParticipation createActParticipation() { ! return new ActParticipation(); } /** ! * Create an instance of {@link ActInternal } * */ ! public ActInternal createActInternal() { ! return new ActInternal(); } /** ! * Create an instance of {@link ActStatusSlot } * */ ! public ActStatusSlot createActStatusSlot() { ! return new ActStatusSlot(); } /** ! * Create an instance of {@link GTS } * */ ! public GTS createGTS() { ! return new GTS(); } /** ! * Create an instance of {@link TELFieldType } * */ ! public TELFieldType createTELFieldType() { ! return new TELFieldType(); } /** ! * Create an instance of {@link OutboundActRelationship } * */ ! public OutboundActRelationship createOutboundActRelationship() { ! return new OutboundActRelationship(); } /** ! * Create an instance of {@link SETCESlot } * */ ! public SETCESlot createSETCESlot() { ! return new SETCESlot(); } /** ! * Create an instance of {@link II } * */ ! public II createII() { ! return new II(); } /** ! * Create an instance of {@link IntegrityCheck } * */ ! public IntegrityCheck createIntegrityCheck() { ! return new IntegrityCheck(); } *************** *** 134,222 **** /** ! * Create an instance of {@link GTSSlot } * */ ! public GTSSlot createGTSSlot() { ! return new GTSSlot(); } /** ! * Create an instance of {@link STSlot } * */ ! public STSlot createSTSlot() { ! return new STSlot(); } /** ! * Create an instance of {@link Observation } * */ ! public Observation createObservation() { ! return new Observation(); } /** ! * Create an instance of {@link ActStatusSlot } * */ ! public ActStatusSlot createActStatusSlot() { ! return new ActStatusSlot(); } /** ! * Create an instance of {@link CR } * */ ! public CR createCR() { ! return new CR(); } /** ! * Create an instance of {@link BL } * */ ! public BL createBL() { ! return new BL(); } /** ! * Create an instance of {@link CD } * */ ! public CD createCD() { ! return new CD(); } /** ! * Create an instance of {@link EDSlot } * */ ! public EDSlot createEDSlot() { ! return new EDSlot(); } /** ! * Create an instance of {@link OutboundActRelationship } * */ ! public OutboundActRelationship createOutboundActRelationship() { ! return new OutboundActRelationship(); } /** ! * Create an instance of {@link ObservationValueSlot } * */ ! public ObservationValueSlot createObservationValueSlot() { ! return new ObservationValueSlot(); } /** ! * Create an instance of {@link IntegrityCheck } * */ ! public IntegrityCheck createIntegrityCheck() { ! return new IntegrityCheck(); } --- 118,206 ---- /** ! * Create an instance of {@link CR } * */ ! public CR createCR() { ! return new CR(); } /** ! * Create an instance of {@link Observation } * */ ! public Observation createObservation() { ! return new Observation(); } /** ! * Create an instance of {@link RoleNull } * */ ! public RoleNull createRoleNull() { ! return new RoleNull(); } /** ! * Create an instance of {@link BLSlot } * */ ! public BLSlot createBLSlot() { ! return new BLSlot(); } /** ! * Create an instance of {@link ActReference } * */ ! public ActReference createActReference() { ! return new ActReference(); } /** ! * Create an instance of {@link RoleBind } * */ ! public RoleBind createRoleBind() { ! return new RoleBind(); } /** ! * Create an instance of {@link IntegrityCheckType } * */ ! public IntegrityCheckType createIntegrityCheckType() { ! return new IntegrityCheckType(); } /** ! * Create an instance of {@link DataType } * */ ! public DataType createDataType() { ! return new DataType(); } /** ! * Create an instance of {@link CDSlot } * */ ! public CDSlot createCDSlot() { ! return new CDSlot(); } /** ! * Create an instance of {@link Trim } * */ ! public Trim createTrim() { ! return new Trim(); } /** ! * Create an instance of {@link STSlot } * */ ! public STSlot createSTSlot() { ! return new STSlot(); } *************** *** 230,286 **** /** ! * Create an instance of {@link IVLINTSlot } * */ ! public IVLINTSlot createIVLINTSlot() { ! return new IVLINTSlot(); } /** ! * Create an instance of {@link TSSlot } * */ ! public TSSlot createTSSlot() { ! return new TSSlot(); } /** ! * Create an instance of {@link TsBoundary } * */ ! public TsBoundary createTsBoundary() { ! return new TsBoundary(); } /** ! * Create an instance of {@link ST } * */ ! public ST createST() { ! return new ST(); } /** ! * Create an instance of {@link RoleBind } * */ ! public RoleBind createRoleBind() { ! return new RoleBind(); } /** ! * Create an instance of {@link II } * */ ! public II createII() { ! return new II(); } /** ! * Create an instance of {@link DataType } * */ ! public DataType createDataType() { ! return new DataType(); } --- 214,278 ---- /** ! * Create an instance of {@link ObservationValueSlot } * */ ! public ObservationValueSlot createObservationValueSlot() { ! return new ObservationValueSlot(); } /** ! * Create an instance of {@link RoleInternal } * */ ! public RoleInternal createRoleInternal() { ! return new RoleInternal(); } /** ! * Create an instance of {@link CV } * */ ! public CV createCV() { ! return new CV(); } /** ! * Create an instance of {@link CE } * */ ! public CE createCE() { ! return new CE(); } /** ! * Create an instance of {@link IVLINT } * */ ! public IVLINT createIVLINT() { ! return new IVLINT(); } /** ! * Create an instance of {@link ActNull } * */ ! public ActNull createActNull() { ! return new ActNull(); } /** ! * Create an instance of {@link GTSSlot } * */ ! public GTSSlot createGTSSlot() { ! return new GTSSlot(); ! } ! ! /** ! * Create an instance of {@link IVLTS } ! * ! */ ! public IVLTS createIVLTS() { ! return new IVLTS(); } *************** *** 294,334 **** /** ! * Create an instance of {@link Act } * */ ! public Act createAct() { ! return new Act(); } /** ! * Create an instance of {@link IntegrityCheckType } * */ ! public IntegrityCheckType createIntegrityCheckType() { ! return new IntegrityCheckType(); } /** ! * Create an instance of {@link ActReference } * */ ! public ActReference createActReference() { ! return new ActReference(); } /** ! * Create an instance of {@link RoleReference } * */ ! public RoleReference createRoleReference() { ! return new RoleReference(); } /** ! * Create an instance of {@link Trim } * */ ! public Trim createTrim() { ! return new Trim(); } --- 286,326 ---- /** ! * Create an instance of {@link TSSlot } * */ ! public TSSlot createTSSlot() { ! return new TSSlot(); } /** ! * Create an instance of {@link TsBoundary } * */ ! public TsBoundary createTsBoundary() { ! return new TsBoundary(); } /** ! * Create an instance of {@link RoleParticipation } * */ ! public RoleParticipation createRoleParticipation() { ! return new RoleParticipation(); } /** ! * Create an instance of {@link PQ } * */ ! public PQ createPQ() { ! return new PQ(); } /** ! * Create an instance of {@link Act } * */ ! public Act createAct() { ! return new Act(); } *************** *** 342,406 **** /** ! * Create an instance of {@link RoleInternal } * */ ! public RoleInternal createRoleInternal() { ! return new RoleInternal(); } /** ! * Create an instance of {@link IVLINT } * */ ! public IVLINT createIVLINT() { ! return new IVLINT(); } /** ! * Create an instance of {@link GTS } * */ ! public GTS createGTS() { ! return new GTS(); } /** ! * Create an instance of {@link ActRelationship } * */ ! public ActRelationship createActRelationship() { ! return new ActRelationship(); } /** ! * Create an instance of {@link BLSlot } * */ ! public BLSlot createBLSlot() { ! return new BLSlot(); } /** ! * Create an instance of {@link ActParticipation } * */ ! public ActParticipation createActParticipation() { ! return new ActParticipation(); } /** ! * Create an instance of {@link TELFieldType } * */ ! public TELFieldType createTELFieldType() { ! return new TELFieldType(); } /** ! * Create an instance of {@link ActNull } * */ ! public ActNull createActNull() { ! return new ActNull(); } --- 334,406 ---- /** ! * Create an instance of {@link RoleReference } * */ ! public RoleReference createRoleReference() { ! return new RoleReference(); } /** ! * Create an instance of {@link BL } * */ ! public BL createBL() { ! return new BL(); } /** ! * Create an instance of {@link IVLINTSlot } * */ ! public IVLINTSlot createIVLINTSlot() { ! return new IVLINTSlot(); } /** ! * Create an instance of {@link ST } * */ ! public ST createST() { ! return new ST(); } /** ! * Create an instance of {@link EDSlot } * */ ! public EDSlot createEDSlot() { ! return new EDSlot(); } /** ! * Create an instance of {@link CD } * */ ! public CD createCD() { ! return new CD(); } /** ! * Create an instance of {@link ActBind } * */ ! public ActBind createActBind() { ! return new ActBind(); } /** ! * Create an instance of {@link ActRelationship } * */ ! public ActRelationship createActRelationship() { ! return new ActRelationship(); ! } ! ! /** ! * Create an instance of {@link SETIISlot } ! * ! */ ! public SETIISlot createSETIISlot() { ! return new SETIISlot(); } Index: CompressionAlgorithm.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CompressionAlgorithm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CompressionAlgorithm.java 4 Feb 2007 16:39:56 -0000 1.1 --- CompressionAlgorithm.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: PQ.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/PQ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PQ.java 4 Feb 2007 16:39:55 -0000 1.1 --- PQ.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationship.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationship.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationship.java 4 Feb 2007 16:39:56 -0000 1.1 --- ActRelationship.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: TimingEvent.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TimingEvent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TimingEvent.java 4 Feb 2007 16:39:56 -0000 1.1 --- TimingEvent.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: RoleBind.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleBind.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoleBind.java 4 Feb 2007 16:39:53 -0000 1.1 --- RoleBind.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: CESlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CESlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CESlot.java 4 Feb 2007 16:39:53 -0000 1.1 --- CESlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: UpdateCode.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/UpdateCode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UpdateCode.java 4 Feb 2007 16:39:56 -0000 1.1 --- UpdateCode.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: AddressUse.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressUse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddressUse.java 4 Feb 2007 16:39:55 -0000 1.1 --- AddressUse.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: TSSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TSSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TSSlot.java 4 Feb 2007 16:39:55 -0000 1.1 --- TSSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: TsBoundary.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TsBoundary.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TsBoundary.java 4 Feb 2007 16:39:53 -0000 1.1 --- TsBoundary.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: IVLTS.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLTS.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IVLTS.java 4 Feb 2007 16:39:55 -0000 1.1 --- IVLTS.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: RoleLinkType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleLinkType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoleLinkType.java 4 Feb 2007 16:39:52 -0000 1.1 --- RoleLinkType.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: ActRelationshipSplit.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSplit.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActRelationshipSplit.java 4 Feb 2007 16:39:51 -0000 1.1 --- ActRelationshipSplit.java 16 Feb 2007 03:58:25 -0000 1.2 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.03 at 07:59:42 PM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // Index: CDSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CDSlot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CDSlot.java 4 Feb 2007 16:39:52 -0000 1.1 --- CDSlot.java 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 3,7 **** // See <a href=... [truncated message content] |
|
From: John C. <jc...@us...> - 2007-02-16 03:58:27
|
Update of /cvsroot/tolven/tolvenEJB/resources/xsd In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23992/resources/xsd Modified Files: trim4.xsd Log Message: Updated TRIM schema Index: trim4.xsd =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** trim4.xsd 4 Feb 2007 16:39:58 -0000 1.1 --- trim4.xsd 16 Feb 2007 03:58:26 -0000 1.2 *************** *** 11,15 **** <xs:complexType name="Trim"> <xs:sequence> ! <xs:element name="act" type="ActSlot" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> --- 11,18 ---- <xs:complexType name="Trim"> <xs:sequence> ! <xs:element name="page" type="xs:string" maxOccurs="1"/> ! <xs:element name="instance" type="xs:string" maxOccurs="1"/> ! <xs:element name="menu" type="xs:string" maxOccurs="unbounded"/> ! <xs:element name="act" type="ActSlot" maxOccurs="1"/> </xs:sequence> </xs:complexType> |
|
From: John C. <jc...@us...> - 2007-02-16 03:57:51
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23592/resources/rules Added Files: ephr.drl Log Message: Sample rules for PHR --- NEW FILE: ephr.drl --- package test.rules import java.util.*; import org.tolven.trim.*; import org.tolven.doc.entity.*; import java.lang.Integer; import org.tolven.app.entity.MenuStructure; import org.tolven.app.entity.MenuData; global org.tolven.app.bean.AppEvalAdaptor app; rule "Document rule" when $doc: DocXML() then // to start, remove all menudata associated with this document // We'll decide where it should go in these rule now that the document is submitted. app.removeReferencingMenuData( $doc ); end /** * See what we can do with a TRIM object */ rule "trim" when $trim: Trim() then assert( $trim.getAct() ); end rule "act rule" when $act: Act( $id : id, $effectiveTime : effectiveTime ) then assert( $id ); assert( $effectiveTime ); for (ActParticipation part : $act.getParticipations() ) { assert ( part ); } System.out.println( "Act: " + $act ); end /** * Match a subject participation. * There may be more than one subject. If it results in the same patient, then that gets reduced to * a single facts since we manage facts by equality (not identity). */ rule "subject rule" when $subject: ActParticipation( typeCode == ParticipationType.SBJ ) then assert( $subject.getRole() ); System.out.println( "Got a subject" ); end /** * If we get a pointer to a patient, and there's metadata that cares about patient, * lookup the patient explicitly. We then bind to the menuData * thereafter. */ rule "Patient rule" when $pat: RoleInternal( classCode == RoleClass.PAT, $internalId : internalId ) $ms: MenuStructure( role == "placeholder", path == "echr:patient" ) then assert( app.findMenuData( $ms, $internalId ) ); System.out.println( "Got a patient id" + $internalId ); end /** * Really just to prove that we got the menuData item */ rule "Patient menuData rule" when $ms: MenuStructure( role == "placeholder", path == "echr:patient" ) $md: MenuData( menuStructure == $ms, $id : id, $path : path, $name : string01 ) then System.out.println( "MenuData id: " + $id + " Path: " + $path + " Name: " + $name ); end rule "act is event rule" when $act: Act( moodCode == ActMood.EVN ) then System.out.println( "Act: " + $act + " is in event mood" ); end rule "act is obs rule" when $act: Act( classCode == ActClass.OBS ) then System.out.println( "Act: " + $act + " is an Observation" ); end rule "act is event observation rule" when $act: Act( moodCode == ActMood.EVN, classCode == ActClass.OBS ) then System.out.println( "Act: " + $act + " is an observation event" ); end rule "Display ID slot" when $slot: SETIISlot() then for (II ii : $slot.getIIS( )) assert( ii ); end rule "display II" when $ii: II(); then System.out.println( "ID: " + $ii.getRoot() + "/" + $ii.getExtension() ); end rule "Display GTS slot" when $slot: GTSSlot() then System.out.println( "TS:" + $slot.getTS( )); end rule "Display MS placeholders" when $ms: MenuStructure( role == "placeholder") then System.out.println( "Placeholder: " + $ms.getPath( )); end /* Not a very interesting rule right now rule "Display MS lists" when $ms: MenuStructure( role == "list") then System.out.println( "Account: " + app.getAccount().getId() + " List: " + $ms.getPath( )); end */ |
|
From: John C. <jc...@us...> - 2007-02-12 07:12:30
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv528/web/wizard Modified Files: gcs.xhtml Log Message: Data entry fixes Index: gcs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/gcs.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gcs.xhtml 7 Feb 2007 01:40:33 -0000 1.4 --- gcs.xhtml 12 Feb 2007 07:12:29 -0000 1.5 *************** *** 13,17 **** <ui:composition template="wizTemplate.xhtml"> <ui:param name="skin" value="#{top.accountType}"/> ! <ui:param name="title" value="Glasgow Coma Scale"/> <ui:param name="author" value="Tolven"/> <ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/> --- 13,17 ---- <ui:composition template="wizTemplate.xhtml"> <ui:param name="skin" value="#{top.accountType}"/> ! <ui:param name="title" value="#{trim.trim.acts[0].title.ST.value}"/> <ui:param name="author" value="Tolven"/> <ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/> *************** *** 53,64 **** <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Assessment Time (T)</legend> ! <input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value="" size="30"/><br /> ! <a href="javascript:addHours('#{menu.elementLabel}gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">-1h</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-10);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">-10m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">-1m</a> ! <a href="javascript:setNow('#{menu.elementLabel}gcsT');#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">now</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">+1m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 10);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">+10m</a> ! <a href="javascript:addHours('#{menu.elementLabel}gcsT', 1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}gcsT'));">+1h</a> <br/> </fieldset> --- 53,65 ---- <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Assessment Time (T)</legend> ! <h:inputText id="gcsT" value="#{trim.trim.acts[0].effectiveTime.TS[0]}" size="30"/> ! <!-- input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value="" size="30"/--><br /> ! <a href="javascript:addHours('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1h</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}:gcsT',-10);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-10m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1m</a> ! <a href="javascript:setNow('#{menu.elementLabel}:gcsT');#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">now</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}:gcsT', 1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">+1m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}:gcsT', 10);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">+10m</a> ! <a href="javascript:addHours('#{menu.elementLabel}:gcsT', 1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">+1h</a> <br/> </fieldset> |
|
From: John C. <jc...@us...> - 2007-02-12 07:12:17
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv497/web/WEB-INF Modified Files: faces-config.xml Log Message: Add trim backing bean Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** faces-config.xml 4 Feb 2007 16:43:03 -0000 1.33 --- faces-config.xml 12 Feb 2007 07:12:15 -0000 1.34 *************** *** 759,762 **** --- 759,770 ---- <managed-bean-scope>request</managed-bean-scope> </managed-bean> + <managed-bean> + <description> + Templated RIM related actions + </description> + <managed-bean-name>trim</managed-bean-name> + <managed-bean-class>org.tolven.web.TRIMAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> </faces-config> |
|
From: John C. <jc...@us...> - 2007-02-12 07:11:37
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32569/web/scripts Modified Files: tolven6.js Log Message: Remove duplicate method Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tolven6.js 16 Jan 2007 06:46:35 -0000 1.11 --- tolven6.js 12 Feb 2007 07:11:35 -0000 1.12 *************** *** 387,403 **** } - // Periodic updating Submit - function ajaxUpdatingSubmit(action, rslt) { - var updater = new Ajax.PeriodicalUpdater( - rslt, // Put results here - action, // URL - { // options - frequency: 2, - decay: 1, - method:'get' - }); - return updater; - } - function displayableSibling( id ) { var thisNode = $(id + ":sel"); --- 387,390 ---- |
|
From: John C. <jc...@us...> - 2007-02-12 07:11:03
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32170/web/five Modified Files: dmpats.xhtml Log Message: Fix Diabetes registry list Index: dmpats.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/dmpats.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dmpats.xhtml 16 Jan 2007 06:41:38 -0000 1.2 --- dmpats.xhtml 12 Feb 2007 07:11:02 -0000 1.3 *************** *** 23,48 **** sortDescendImg:'../images/sort_desc.gif'}); ! prevdmpatsFilterValue = ''; ! dmpatsFilterChange = function (element, vax) { ! if (prevdmpatsFilterValue==vax) return; ! prevdmpatsFilterValue = vax; ! if (vax.length==0) { dmpatsGrid.setRequestParams( {name: 'element', value: visiblePage} ); } else { ! var lastFilter = ""; ! var firstFilter = ""; ! if (vax !=null) ! { ! var filters = vax.split(","); ! lastFilter = filters[0]; ! if (filters.length > 1) firstFilter = filters[1]; ! } ! dmpatsGrid.setRequestParams( {name: 'element', value: visiblePage}, {name: 'LastFilter', value: lastFilter}, {name: 'FirstFilter', value: firstFilter} ); } - // dmpatsGrid.setTotalRows(10); dmpatsGrid.resetContents(); ! dmpatsGrid.requestContentRefresh(0); ! }; ! dmpatsGridEventFilter = new Form.Element.Observer( "dmpatsFilter", 1, dmpatsFilterChange ); $("dmpatsFilter").focus(); // ]]> --- 23,39 ---- sortDescendImg:'../images/sort_desc.gif'}); ! prevDMPatFilterValue = ''; ! function dmpatFilterChange(element, vax) { ! if (prevDMPatFilterValue==vax) return; ! prevDMPatFilterValue = vax; ! if (vax==null || vax.length==0) { dmpatsGrid.setRequestParams( {name: 'element', value: visiblePage} ); } else { ! dmpatsGrid.setRequestParams( {name: 'element', value: visiblePage}, {name: 'NameFilter', value: prevDMPatFilterValue} ); } dmpatsGrid.resetContents(); ! dmpatsGrid.requestContentRefresh(0); ! } ! new Form.Element.Observer( $("dmpatsFilter"), 1, dmpatFilterChange ); $("dmpatsFilter").focus(); // ]]> *************** *** 55,63 **** <thead> <tr> ! <th align="left" width="100px">Last</th> ! <th align="left" width="150px">First</th> ! <th align="left" width="100px">DOB</th> <th align="left" width="90px">Age</th> <th align="center" width="60px">Sex</th> </tr> </thead> --- 46,53 ---- <thead> <tr> ! <th align="left" width="200px">Name</th> <th align="left" width="90px">Age</th> <th align="center" width="60px">Sex</th> + <th align="left" width="100px">Onset</th> </tr> </thead> *************** *** 65,84 **** <table id="dmpatsGrid" > <tbody> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> ! <tr><td width="100px">-</td><td width="150px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr> </tbody> </table> --- 55,74 ---- <table id="dmpatsGrid" > <tbody> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> ! <tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="100px">-</td></tr> </tbody> </table> |
|
From: John C. <jc...@us...> - 2007-02-12 07:10:37
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32117/web/five Modified Files: appointments.xhtml Log Message: Fix appointment list Index: appointments.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/appointments.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** appointments.xhtml 2 Aug 2006 01:28:58 -0000 1.1 --- appointments.xhtml 12 Feb 2007 07:10:22 -0000 1.2 *************** *** 6,13 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Lab results</title> </head> <body> ! <ui:composition><p>Appointments go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> \ No newline at end of file --- 6,59 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Apppointments</title> </head> <body> ! <ui:composition> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, ! 'menuData.ajax', ! {prefetchBuffer: true, ! tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, ! requestParameters: [{name: 'element', value: visiblePage}], ! loadingClass: 'dataGridLoading', ! sortAscendImg: '../images/sort_asc.gif', ! sortDescendImg:'../images/sort_desc.gif'}); ! // ]]> ! </script> ! <div style="width:900px"> ! <table id="#{menu.element}LG_header" > ! <thead> ! <tr> ! <th align="left" width="150px">Date</th> ! <th align="left" width="500px">Purpose</th> ! <th align="left" width="200px">With</th> ! </tr> ! </thead> ! </table> ! <table id="#{menu.element}LG" > ! <tbody> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! <tr><td width="150px">-</td><td width="500px">-</td><td width="200px">-</td></tr> ! </tbody> ! </table> ! </div> ! </ui:composition> </body> </html> \ No newline at end of file |
|
From: John C. <jc...@us...> - 2007-02-12 07:09:40
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31687/src/org/tolven/web Modified Files: MenuAction.java Added Files: TRIMAction.java Log Message: Data entry fixes Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** MenuAction.java 7 Feb 2007 01:41:07 -0000 1.32 --- MenuAction.java 12 Feb 2007 07:09:38 -0000 1.33 *************** *** 74,80 **** private MenuData menuDataItem = null; private Long menuDataCount = null; ! private DocumentLocal documentLocal; ! private XMLProtectedLocal xmlProtectedLocal; ! private CreatorLocal creatorBean; private String givenName; --- 74,81 ---- private MenuData menuDataItem = null; private Long menuDataCount = null; ! ! protected DocumentLocal documentLocal; ! protected XMLProtectedLocal xmlProtectedLocal; ! protected CreatorLocal creatorBean; private String givenName; *************** *** 569,575 **** * @throws Exception */ ! public String submit( ) throws Exception { ! MenuData md = getMenuDataItem( ); ! creatorBean.submit(md); return "success"; } --- 570,580 ---- * @throws Exception */ ! public String submit( ) { ! try { ! MenuData md = getMenuDataItem( ); ! creatorBean.submit(md); ! } catch (Exception e) { ! System.out.println( "Unable to submit" + e.getMessage()); ! } return "success"; } --- NEW FILE: TRIMAction.java --- package org.tolven.web; import javax.naming.NamingException; import org.tolven.app.entity.MenuData; import org.tolven.doc.entity.DocBase; import org.tolven.doc.entity.DocXML; import org.tolven.trim.Trim; public class TRIMAction extends MenuAction { private Trim trim; public TRIMAction() throws NamingException { super(); } /** * Get the root act of the trim object * @return * @throws Exception */ public Trim getTrim() throws Exception { if (trim==null) { MenuData md = getDrilldownItem(); System.out.println( "[getAct] MD.id=" + md.getId()); if (md.getDocumentId()==0) return null; DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { throw new RuntimeException( "Document id invalid in MD " + md.getId()); } if (!(doc instanceof DocXML)) { System.out.println( ); throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName()); } // Get the object graph trim = (Trim) xmlProtectedLocal.unmarshal((DocXML)doc ); } return trim; } public void setTrim(Trim trim) { this.trim = trim; } } |
|
From: John C. <jc...@us...> - 2007-02-12 07:09:21
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31660/src/org/tolven/web Modified Files: PersonGenAction.java RegisterAction.java Log Message: Modularize data generator Index: PersonGenAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/PersonGenAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PersonGenAction.java 20 Jan 2007 19:25:05 -0000 1.18 --- PersonGenAction.java 12 Feb 2007 07:09:18 -0000 1.19 *************** *** 35,38 **** --- 35,39 ---- import org.tolven.gen.PersonGenerator; import org.tolven.gen.bean.GenControlAccount; + import org.tolven.gen.bean.GenControlCHRAccount; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; *************** *** 124,128 **** */ public String createCHRPatients( ) throws Exception { ! GenControlAccount control = new GenControlAccount(); control.setUserId( getTop().getUser().getId()); control.setChrAccountId(getTop().getAccountId()); --- 125,129 ---- */ public String createCHRPatients( ) throws Exception { ! GenControlCHRAccount control = new GenControlCHRAccount(); control.setUserId( getTop().getUser().getId()); control.setChrAccountId(getTop().getAccountId()); Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** RegisterAction.java 7 Feb 2007 08:28:44 -0000 1.38 --- RegisterAction.java 12 Feb 2007 07:09:18 -0000 1.39 *************** *** 45,48 **** --- 45,50 ---- import org.tolven.gen.Generator; import org.tolven.gen.bean.GenControlAccount; + import org.tolven.gen.bean.GenControlCHRAccount; + import org.tolven.gen.bean.GenControlPHRAccount; import org.tolven.security.LDAPLocal; import org.tolven.security.LoginLocal; *************** *** 137,141 **** public String createNewAccount() throws Exception { Account account = accountBean.createAccount2( this.getNewAccountTitle(), getNewTimeZone(), getNewAccountType() ); ! System.out.println( "Created account: " + account.getId() + ", acct type " + account.getAccountType().getKnownType()); // Note, the user automatically gets administrator permission because they are the only user on that new account. accountBean.addAccountUser( account, getTop().getUser(), getNow(), true); --- 139,143 ---- public String createNewAccount() throws Exception { Account account = accountBean.createAccount2( this.getNewAccountTitle(), getNewTimeZone(), getNewAccountType() ); ! System.out.println( "Created account: " + account.getId() + ", acct type " + getNewAccountType().getKnownType()); // Note, the user automatically gets administrator permission because they are the only user on that new account. accountBean.addAccountUser( account, getTop().getUser(), getNow(), true); *************** *** 143,165 **** menu.createDefaultMenuStructure( account ); if (this.isGenDemoData()) { ! // Crank up the data generator ! GenControlAccount control = new GenControlAccount(); ! control.setUserId( getTop().getUser().getId()); ! control.setChrAccountId(account.getId()); ! control.setNow(getTop().getNow()); ! control.setStartYear( 1996 ); ! if (account.getAccountType().getKnownType().equals("ephr")) { ! control.setCount( 1 ); ! // chrGen.createFamily( getTop().getUser(), account, getTop().getNow(), 1999 ); ! System.out.println("created family"); ! } ! if (account.getAccountType().getKnownType().equals("echr")) { control.setCount( 100 ); ! // chrGen.createPatients( getTop().getUser(), account, 50, getTop().getNow(), 1996 ); } - // Now go. If a family, this should be done by the time the user logs in for the first time - chrGen.queueGeneration(control); } - return "success"; } --- 145,169 ---- menu.createDefaultMenuStructure( account ); if (this.isGenDemoData()) { ! // Clinical account ! if ("echr".equals(getNewAccountType().getKnownType())) { ! GenControlCHRAccount control = new GenControlCHRAccount(); ! control.setUserId( getTop().getUser().getId()); ! control.setChrAccountId(account.getId()); ! control.setNow(getTop().getNow()); ! control.setStartYear( 1996 ); control.setCount( 100 ); ! chrGen.queueGeneration(control); ! } ! // Personal account ! if ("ephr".equals(getNewAccountType().getKnownType())) { ! GenControlPHRAccount control = new GenControlPHRAccount(); ! control.setUserId( getTop().getUser().getId()); ! control.setFamilyName(getTop().getTp().getSn()); ! control.setChrAccountId(account.getId()); ! control.setNow(getTop().getNow()); ! control.setStartYear( 1996 ); ! chrGen.queueGeneration(control); } } return "success"; } |
3 messages has been excluded from this view by a project administrator.
