tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security/acl TolvenGroup.java, 1.2, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/acl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6786/src/org/tolven/security/acl

Removed Files:
      Tag: E_JI_MDBKeys
	TolvenGroup.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- TolvenGroup.java DELETED ---

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security TolvenPrincipal.java, 1.3, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6786/src/org/tolven/security

Removed Files:
      Tag: E_JI_MDBKeys
	TolvenPrincipal.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- TolvenPrincipal.java DELETED ---

[Tolven-cvs-commit] tolvenSecurity/src/org/tolven/security/auth AccountIdCallbackHandler.java, 1.1.2.1, NONE AccountUserIdCallback.java, 1.2, NONE TestKeyLoginModule.java, 1.1.2.1, NONE AccountIdCallback.java, 1.1.2.1, NONE MDBLoginModule.java, 1.1.2.2, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6395/src/org/tolven/security/auth

Removed Files:
      Tag: E_JI_MDBKeys
	AccountIdCallbackHandler.java AccountUserIdCallback.java 
	TestKeyLoginModule.java AccountIdCallback.java 
	MDBLoginModule.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- AccountIdCallbackHandler.java DELETED ---

--- TestKeyLoginModule.java DELETED ---

--- AccountIdCallback.java DELETED ---

--- AccountUserIdCallback.java DELETED ---

--- MDBLoginModule.java DELETED ---

[Tolven-cvs-commit] tolvenSecurity/src/org/tolven/security/acl TolvenGroup.java, 1.1.2.1, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/acl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6395/src/org/tolven/security/acl

Removed Files:
      Tag: E_JI_MDBKeys
	TolvenGroup.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- TolvenGroup.java DELETED ---

[Tolven-cvs-commit] tolvenSecurity/src/org/tolven/security/key UserPublicKey.java, 1.1.2.1, NONE AccountPrivateKey.java, 1.1.2.1, NONE AccountSecretKey.java, 1.1.2.1, NONE AccountPublicKey.java, 1.1.2.1, NONE AccountKeyRing.java, 1.1.2.1, NONE AccountProcessingPublicKey.java, 1.1.2.1, NONE UserPrivateKey.java, 1.1.2.1, NONE UserKeyRing.java, 1.1.2.1, NONE TolvenPublicKey.java, 1.1.2.1, NONE TolvenEncryptedPrivateKey.java, 1.1.2.1, NONE AccountProcessingPrivateKey.java, 1.1.2.1, NONE TolvenEncryptedSecretKey.java, 1.1.2.1, NONE DocumentSecretKey.java, 1.1.2.1, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/key
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6395/src/org/tolven/security/key

Removed Files:
      Tag: E_JI_MDBKeys
	UserPublicKey.java AccountPrivateKey.java 
	AccountSecretKey.java AccountPublicKey.java 
	AccountKeyRing.java AccountProcessingPublicKey.java 
	UserPrivateKey.java UserKeyRing.java TolvenPublicKey.java 
	TolvenEncryptedPrivateKey.java 
	AccountProcessingPrivateKey.java TolvenEncryptedSecretKey.java 
	DocumentSecretKey.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- AccountProcessingPrivateKey.java DELETED ---

--- TolvenEncryptedSecretKey.java DELETED ---

--- AccountSecretKey.java DELETED ---

--- AccountPrivateKey.java DELETED ---

--- AccountPublicKey.java DELETED ---

--- TolvenEncryptedPrivateKey.java DELETED ---

--- UserPrivateKey.java DELETED ---

--- UserPublicKey.java DELETED ---

--- TolvenPublicKey.java DELETED ---

--- AccountKeyRing.java DELETED ---

--- DocumentSecretKey.java DELETED ---

--- AccountProcessingPublicKey.java DELETED ---

--- UserKeyRing.java DELETED ---

[Tolven-cvs-commit] tolvenSecurity/src/org/tolven/security TolvenPrincipal.java, 1.1.2.1, NONE

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6395/src/org/tolven/security

Removed Files:
      Tag: E_JI_MDBKeys
	TolvenPrincipal.java 
Log Message:
Implemented MDB TolvenUser to encrypt messaging queues. Also rearranged modules to remove circular dependencies in security classes.

--- TolvenPrincipal.java DELETED ---

[Tolven-cvs-commit] tolvenSecurityCommon - New directory

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenSecurityCommon
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22621/tolvenSecurityCommon

Log Message:
Directory /cvsroot/tolven/tolvenSecurityCommon added to the repository

[Tolven-cvs-commit] tolvenSecurityWeb - New directory

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenSecurityWeb
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22200/tolvenSecurityWeb

Log Message:
Directory /cvsroot/tolven/tolvenSecurityWeb added to the repository

[Tolven-cvs-commit] tolvenWEB/web/wizard graphLipids.xhtml, NONE, 1.1 graph.xhtml, NONE, 1.1 glucose.xhtml, NONE, 1.1 graphDiabetes.xhtml, NONE, 1.1 weight.xhtml, 1.4, 1.5 datetime.xhtml, 1.4, 1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/wizard
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/wizard

Modified Files:
	weight.xhtml datetime.xhtml 
Added Files:
	graphLipids.xhtml graph.xhtml glucose.xhtml 
	graphDiabetes.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

--- NEW FILE: graphLipids.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>Graph Lab Results</title>
  </head>
  <body>
    <ui:composition>
		<c:if test="#{menu.menuDataItem.status=='NEW'}">
			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					<p>A graph of the level of lipids over time. </p>
					[Tolven Page: #{trim.trim.page}]
				</div>
				<div class="help" >
					<h1>getting Started</h1>
					<p>Help provides additional information about each page</p>
					<p>You can close this form by clicking the [x] above at any time. The form will remain in your list of new activity so that yuo can continue at any time later.
					If you want to completely cancel the form prior to submission, removing all traces of the form from the system, click the Cancel button.
					Once submitted, you will not be able to Cancel the form.</p>
				</div>
			</div>
			<div class="step" title="Enter #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					Date: <br/>
					<ui:include src="/wizard/datetime.xhtml">
						<ui:param name="ts" value="#{trim.trim.act.effectiveTime}"/>
						<ui:param name="id" value="effective"/>
					</ui:include><br/><br/>
					#{trim.trim.drilldown}<br/>
					Comments: <br/> 
					<h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/><br/>
					<h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
				</div>
				<div class="help">
					<h1>Graph of Lipid Levels</h1>
					<p>From triglicerides and low-density lipoproteins results.</p>
				</div>
			</div>
			<div class="step" title="Routing" style="display:none">
	    		<div class="pagesm">
	    			<p>Route a copy to the following:</p>
                    <h:dataTable value="#{trim.routing}" var="ae">
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Copy"/>
			                </f:facet>
			                <h:selectBooleanCheckbox value="#{ae.copy}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Id"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountId}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Name"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountName}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Comment"/>
			                </f:facet>
			                <h:inputText value="#{ae.comment}" size="100"/>
			            </h:column>
                    </h:dataTable>
				</div>
				<div class="help" >
					<h1>Routing</h1>
					<p>Upon submission, this graph will be kept in the #{top.accountUser.account.title} account.</p>
					<p>You may also wish to route this graph to another account. For a clinical account, this usually means
					routing to the patient and/or perhaps a consultant. For the patient, routing is usually to one or more providers
					that maintain a patient record. In either case, observations can be routed to research projects and public health departments.</p>
					<p>If the destination is not available in this list, you will need to </p>
				</div>
			</div>
			<div class="step" title="Finalize" style="display:none">
	    		<div class="pagesm">
					<div id="#{menu.element}:drilldown">
						Waiting for server...
					</div>
				</div>
				<div class="help" >
					<h1>Finalize</h1>
					<p>If you would like to modify this graph before submitting it, back up to previous steps and adjust the settings. </p>
					<p>Since a graph is typically a reflection of data already stored in the record, saving it (Submit) is not 
					strictly required. You may instead click Cancel to simply discard the graph when you are done viewing it.
					If you have indicated that you would like a copy of this graph sent to some other account, then you will have to Submit.</p>
					<p>If you do want to save this graph and perhaps add comments to it, back up to the previous step and add
					comments. </p>
					<p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact
					that only you could have submitted the form.</p>
				</div>
			</div>
		</c:if>
		<c:if test="#{menu.menuDataItem.status!='NEW'}">
			<div class="step" title="Complete" style="display:none" >
	    		<div class="pagesm">
					<ui:include src="/five/drilldown/lipidDD.xhtml">
						<ui:param name="act" value="#{trim.trim.act}"/>
					</ui:include>
				</div>
				<div class="help">
					<h1>Lipids Graph Summary</h1>
					<p>This is a saved graph. you may also create a new graph.</p>
				</div>
			</div>
		</c:if>
	</ui:composition>
  </body>
</html>
--- NEW FILE: glucose.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>Blood Glucose</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>

<body>
    <ui:composition>
		<c:if test="#{menu.menuDataItem.status=='NEW'}">
			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					<p>A blood glucose test measures the amount of glucose, in your blood. Glucose comes from carbohydrate foods. It is the main source of energy used by the body. Insulin is a hormone that helps your body use and control the amount of glucose in your blood. Insulin is produced in the pancreas and released into the blood when the amount of glucose in the blood rises. </p>
					[Tolven Page: #{trim.trim.page}]
				</div>
				<div class="help" >
					<h1>getting Started</h1>
					<p>Help provides additional information about each page</p>
					<p>You can close this form by clicking the [x] above at any time. The form will remain in your list of new activity so that yuo can continue at any time later.
					If you want to completely cancel the form prior to submission, removing all traces of the form from the system, click the Cancel button.
					Once submitted, you will not be able to Cancel the form.</p>
				</div>
			</div>
			<div class="step" title="Enter #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					Date of observation: <br/>
					<ui:include src="/wizard/datetime.xhtml">
						<ui:param name="ts" value="#{trim.trim.act.effectiveTime}"/>
						<ui:param name="id" value="effective"/>
					</ui:include><br/><br/>
					#{menu.menuDataItem.string01} <br/> 
					<h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}">
						<f:converter converterId="TrimDoubleConverter"/>
					</h:inputText> #{trim.trim.act.observation.value.PQS[0].unit}<br/>
					<h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
				</div>
				<div class="help">
					<h1>Blood Glucose</h1>
					<p>This might hurt a bit.</p>
				</div>
			</div>
			<div class="step" title="Routing" style="display:none">
	    		<div class="pagesm">
	    			<p>Route a copy of this to the following:</p>
                    <h:dataTable value="#{trim.routing}" var="ae">
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Copy"/>
			                </f:facet>
			                <h:selectBooleanCheckbox value="#{ae.copy}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Id"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountId}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Name"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountName}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Comment"/>
			                </f:facet>
			                <h:inputText value="#{ae.comment}" size="100"/>
			            </h:column>
                    </h:dataTable>
				</div>
				<div class="help" >
					<h1>Routing</h1>
					<p>This observation will be kept in the #{top.accountUser.account.title} account.</p>
					<p>You may also wish to route this observation to another account. For a clinical account, this usually means
					routing to the patient and/or perhaps a consultant. For the patient, routing is usually to one or more providers
					that maintain a patient record. In either case, observations can be routed to research projects and public health departments.</p>
				</div>
			</div>
			<div class="step" title="Finalize" style="display:none">
	    		<div class="pagesm">
					<div id="#{menu.element}:drilldown">
						Waiting for server...
					</div>
				</div>
				<div class="help" >
					<h1>Finalize</h1>
					<p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. 
					The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will
					mark this document as complete, actionable, and immutable.</p>
					<p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact
					that only you could have submitted the form.</p>
				</div>
			</div>
		</c:if>
		<c:if test="#{menu.menuDataItem.status!='NEW'}">
			<div class="step" title="Complete" style="display:none" >
	    		<div class="pagesm">
					<ui:include src="/five/drilldown/glucoseDD.xhtml">
						<ui:param name="act" value="#{trim.trim.act}"/>
					</ui:include>
				</div>
				<div class="help">
					<h1>Blood Glucose Summary</h1>
					<p>I hope that this is OK because it's too late to change now.</p>
				</div>
			</div>
		</c:if>
	</ui:composition>
</body>
</html>
--- NEW FILE: graph.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>Graph</title>
  </head>
  <body>
    <ui:composition template="wizTemplate.xhtml">
		<ui:param name="skin" value="#{top.accountType}"/>
		<ui:param name="title" value="#{trim.trim.act.title.ST.value}"/>
		<ui:param name="author" value="Tolven"/>
		<ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/>
		<ui:define name="steps">
			<ui:include src="../wizard/#{trim.trim.page}"/>
		</ui:define>
	</ui:composition>
  </body>
</html>
Index: weight.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/weight.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** weight.xhtml	27 Mar 2007 23:23:42 -0000	1.4
--- weight.xhtml	7 Apr 2007 22:40:49 -0000	1.5
***************
*** 13,17 ****
      <ui:composition>
  		<c:if test="#{menu.menuDataItem.status=='NEW'}">
! 			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" >
  				<div class="pagesm">
  					<p>How to enter your weight</p>
--- 13,17 ----
      <ui:composition>
  		<c:if test="#{menu.menuDataItem.status=='NEW'}">
! 			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" style="display:none">
  				<div class="pagesm">
  					<p>How to enter your weight</p>
***************
*** 28,32 ****
  				</div>
  			</div>
! 			<div class="step" title="Enter #{menu.menuDataItem.string01}" >
  				<div class="pagesm">
  					Date of observation: <br/>
--- 28,32 ----
  				</div>
  			</div>
! 			<div class="step" title="Enter #{menu.menuDataItem.string01}" style="display:none">
  				<div class="pagesm">
  					Date of observation: <br/>
***************
*** 36,40 ****
  					</ui:include><br/><br/>
  					#{menu.menuDataItem.string01} <br/> 
! 					<h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/>
  					<h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
  				</div>
--- 36,42 ----
  					</ui:include><br/><br/>
  					#{menu.menuDataItem.string01} <br/> 
! 					<h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}">
! 						<f:converter converterId="TrimDoubleConverter"/>
! 					</h:inputText> #{trim.trim.act.observation.value.PQS[0].unit}<br/>
  					<h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
  				</div>
***************
*** 44,48 ****
  				</div>
  			</div>
! 			<div class="step" title="Finalize" >
  	    		<div class="pagesm">
  					<div id="#{menu.element}:drilldown">
--- 46,88 ----
  				</div>
  			</div>
! 			<div class="step" title="Routing" style="display:none" >
! 	    		<div class="pagesm">
! 	    			<p>Route a copy of this to the following:</p>
!                     <h:dataTable value="#{trim.routing}" var="ae">
! 			            <h:column>
! 			                <f:facet name="header">
! 			                    <h:outputText value="Copy"/>
! 			                </f:facet>
! 			                <h:selectBooleanCheckbox value="#{ae.copy}"/>
! 			            </h:column>
! 			            <h:column>
! 			                <f:facet name="header">
! 			                    <h:outputText value="Account Id"/>
! 			                </f:facet>
! 			                <h:outputText value="#{ae.accountId}"/>
! 			            </h:column>
! 			            <h:column>
! 			                <f:facet name="header">
! 			                    <h:outputText value="Account Name"/>
! 			                </f:facet>
! 			                <h:outputText value="#{ae.accountName}"/>
! 			            </h:column>
! 			            <h:column>
! 			                <f:facet name="header">
! 			                    <h:outputText value="Comment"/>
! 			                </f:facet>
! 			                <h:inputText value="#{ae.comment}" size="100"/>
! 			            </h:column>
!                     </h:dataTable>
! 				</div>
! 				<div class="help" >
! 					<h1>Routing</h1>
! 					<p>This observation will be kept in the #{top.accountUser.account.title} account.</p>
! 					<p>You may also wish to route this observation to another account. For a clinical account, this usually means
! 					routing to the patient and/or perhaps a consultant. For the patient, routing is usually to one or more providers
! 					that maintain a patient record. In either case, observations can be routed to research projects and public health departments.</p>
! 				</div>
! 			</div>
! 			<div class="step" title="Finalize" style="display:none">
  	    		<div class="pagesm">
  					<div id="#{menu.element}:drilldown">
***************
*** 61,65 ****
  		</c:if>
  		<c:if test="#{menu.menuDataItem.status!='NEW'}">
! 			<div class="step" title="Complete" >
  	    		<div class="pagesm">
  					<ui:include src="/five/drilldown/weightDD.xhtml">
--- 101,105 ----
  		</c:if>
  		<c:if test="#{menu.menuDataItem.status!='NEW'}">
! 			<div class="step" title="Complete" style="display:none">
  	    		<div class="pagesm">
  					<ui:include src="/five/drilldown/weightDD.xhtml">

Index: datetime.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/datetime.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** datetime.xhtml	27 Mar 2007 23:23:42 -0000	1.4
--- datetime.xhtml	7 Apr 2007 22:40:49 -0000	1.5
***************
*** 13,16 ****
--- 13,17 ----
      <ui:composition>
  		<input id="#{menu.elementLabel}form:#{id}vis" name="#{menu.elementLabel}form:#{id}vis" readonly="true" type="text" value="0" size="60"/><br/>
+ 		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-1440);">-1d</a>
  		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-60);">-1h</a>
  		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-10);">-10m</a>
***************
*** 20,23 ****
--- 21,25 ----
  		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}', 10);">+10m</a>
  		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}', 60);">+1h</a>
+ 		<a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',1440);">+1d</a>
  	<script language="JavaScript" type="text/javascript">
  	 // <![CDATA[

--- NEW FILE: graphDiabetes.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>Graph Diabetes-related observations</title>
  </head>
  <body>
    <ui:composition>
		<c:if test="#{menu.menuDataItem.status=='NEW'}">
			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					<p>A graph of the level of weight and Blood glucose over time. </p>
					[Tolven Page: #{trim.trim.page}]
				</div>
				<div class="help" >
					<h1>getting Started</h1>
					<p>Help provides additional information about each page</p>
					<p>You can close this form by clicking the [x] above at any time. The form will remain in your list of new activity so that yuo can continue at any time later.
					If you want to completely cancel the form prior to submission, removing all traces of the form from the system, click the Cancel button.
					Once submitted, you will not be able to Cancel the form.</p>
				</div>
			</div>
			<div class="step" title="Enter #{menu.menuDataItem.string01}" style="display:none">
				<div class="pagesm">
					Date: <br/>
					<ui:include src="/wizard/datetime.xhtml">
						<ui:param name="ts" value="#{trim.trim.act.effectiveTime}"/>
						<ui:param name="id" value="effective"/>
					</ui:include><br/><br/>
					#{trim.trim.drilldown}<br/>
					Comments: <br/> 
					<h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/><br/>
					<h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
				</div>
				<div class="help">
					<h1>Graph of Weight and Glucose Levels</h1>
				</div>
			</div>
			<div class="step" title="Routing" style="display:none">
	    		<div class="pagesm">
	    			<p>Route a copy to the following:</p>
                    <h:dataTable value="#{trim.routing}" var="ae">
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Copy"/>
			                </f:facet>
			                <h:selectBooleanCheckbox value="#{ae.copy}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Id"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountId}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Account Name"/>
			                </f:facet>
			                <h:outputText value="#{ae.accountName}"/>
			            </h:column>
			            <h:column>
			                <f:facet name="header">
			                    <h:outputText value="Comment"/>
			                </f:facet>
			                <h:inputText value="#{ae.comment}" size="100"/>
			            </h:column>
                    </h:dataTable>
				</div>
				<div class="help" >
					<h1>Routing</h1>
					<p>Upon submission, this graph will be kept in the #{top.accountUser.account.title} account.</p>
					<p>You may also wish to route this graph to another account. For a clinical account, this usually means
					routing to the patient and/or perhaps a consultant. For the patient, routing is usually to one or more providers
					that maintain a patient record. In either case, observations can be routed to research projects and public health departments.</p>
					<p>If the destination is not available in this list, you will need to </p>
				</div>
			</div>
			<div class="step" title="Finalize" style="display:none">
	    		<div class="pagesm">
					<div id="#{menu.element}:drilldown">
						Waiting for server...
					</div>
				</div>
				<div class="help" >
					<h1>Finalize</h1>
					<p>If you would like to modify this graph before submitting it, back up to previous steps and adjust the settings. </p>
					<p>Since a graph is typically a reflection of data already stored in the record, saving it (Submit) is not 
					strictly required. You may instead click Cancel to simply discard the graph when you are done viewing it.
					If you have indicated that you would like a copy of this graph sent to some other account, then you will have to Submit.</p>
					<p>If you do want to save this graph and perhaps add comments to it, back up to the previous step and add
					comments. </p>
					<p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact
					that only you could have submitted the form.</p>
				</div>
			</div>
		</c:if>
		<c:if test="#{menu.menuDataItem.status!='NEW'}">
			<div class="step" title="Complete" style="display:none" >
	    		<div class="pagesm">
					<ui:include src="/five/drilldown/diabetesDD.xhtml">
						<ui:param name="act" value="#{trim.trim.act}"/>
					</ui:include>
				</div>
				<div class="help">
					<h1>Diabetes Graph Summary</h1>
					<p>This is a saved graph. you may also create a new graph.</p>
				</div>
			</div>
		</c:if>
	</ui:composition>
  </body>
</html>

[Tolven-cvs-commit] tolvenWEB/web/WEB-INF faces-config.xml, 1.45, 1.46

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/WEB-INF

Modified Files:
	faces-config.xml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** faces-config.xml	29 Mar 2007 07:45:57 -0000	1.45
--- faces-config.xml	7 Apr 2007 22:40:50 -0000	1.46
***************
*** 9,12 ****
--- 9,13 ----
  
    <application>
+     <view-handler>org.tolven.web.faces.TolvenViewHandler</view-handler>
      <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
     <el-resolver>org.tolven.web.PathELResolver</el-resolver>
***************
*** 43,46 ****
--- 44,54 ----
      <converter>
          <description>
+             Convert a double but allow null to mean 0.0
+         </description>
+         <converter-id>TrimDoubleConverter</converter-id>
+         <converter-class>org.tolven.web.rim.DoubleConverter</converter-class>
+     </converter>
+     <converter>
+         <description>
              Convert between a string and a List of Strings
          </description>
***************
*** 401,404 ****
--- 409,420 ----
      </navigation-rule>
      <navigation-rule>
+         <from-view-id>/five/providers.xhtml</from-view-id>
+         <navigation-case>
+             <from-action>#{menu.sendCCR}</from-action>
+             <from-outcome>success</from-outcome>
+             <to-view-id>/five/providers.xhtml</to-view-id>
+         </navigation-case>
+     </navigation-rule>
+     <navigation-rule>
          <from-view-id>/five/patients.xhtml</from-view-id>
          <navigation-case>
***************
*** 419,422 ****
--- 435,443 ----
          <from-view-id>/ajax/paneDispatch.xhtml</from-view-id>
          <navigation-case>
+             <from-action>#{menu.sendCCR}</from-action>
+             <from-outcome>success</from-outcome>
+             <to-view-id>/five/providers.xhtml</to-view-id>
+         </navigation-case>
+         <navigation-case>
              <from-action>#{trim.upload}</from-action>
              <from-outcome>success</from-outcome>
***************
*** 424,427 ****
--- 445,453 ----
          </navigation-case>
          <navigation-case>
+             <from-action>#{trim.upload}</from-action>
+             <from-outcome>fail</from-outcome>
+             <to-view-id>/five/drilldown/drilldown.xhtml</to-view-id>
+         </navigation-case>
+         <navigation-case>
              <from-action>#{menu.createPatient}</from-action>
              <from-outcome>success</from-outcome>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web TRIMAction.java, 1.5, 1.6 RegisterAction.java, 1.49, 1.50 AccountAction.java, 1.14, 1.15 MenuAction.java, 1.39, 1.40

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/src/org/tolven/web

Modified Files:
	TRIMAction.java RegisterAction.java AccountAction.java 
	MenuAction.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: AccountAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AccountAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AccountAction.java	29 Mar 2007 07:45:57 -0000	1.14
--- AccountAction.java	7 Apr 2007 22:40:49 -0000	1.15
***************
*** 14,17 ****
--- 14,18 ----
  package org.tolven.web;
  
+ import java.util.ArrayList;
  import java.util.Date;
  import java.util.List;
***************
*** 22,25 ****
--- 23,27 ----
  import javax.faces.model.DataModel;
  import javax.faces.model.ListDataModel;
+ import javax.faces.model.SelectItem;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 47,51 ****
  	private long sendAccountId;
  	private long receiveAccountId;
! 
  	// Starting with next login, remember my selection this time
      private boolean rememberDefault;
--- 49,54 ----
  	private long sendAccountId;
  	private long receiveAccountId;
! 	private List<SelectItem> routingChoices;
! 	
  	// Starting with next login, remember my selection this time
      private boolean rememberDefault;
***************
*** 117,121 ****
  	}
  
!     /**
       */
  	public List<AccountExchange> getAccountExchangeReceive() {
--- 120,124 ----
  	}
  
! 	/**
       */
  	public List<AccountExchange> getAccountExchangeReceive() {

Index: MenuAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** MenuAction.java	20 Mar 2007 09:13:43 -0000	1.39
--- MenuAction.java	7 Apr 2007 22:40:49 -0000	1.40
***************
*** 15,19 ****
  
  import java.awt.Color;
- import java.io.ByteArrayOutputStream;
  import java.io.IOException;
  import java.net.URLEncoder;
--- 15,18 ----
***************
*** 25,32 ****
  import java.util.Map;
  
! import javax.annotation.Resource;
  import javax.faces.context.FacesContext;
! import javax.jms.ConnectionFactory;
! import javax.jms.Queue;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
--- 24,31 ----
  import java.util.Map;
  
! import javax.annotation.EJB;
  import javax.faces.context.FacesContext;
! import javax.faces.model.DataModel;
! import javax.faces.model.ListDataModel;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 53,68 ****
  import org.tolven.app.entity.MenuStructure;
  import org.tolven.ccr.ContinuityOfCareRecord;
! import org.tolven.core.entity.Status;
! import org.tolven.core.util.Queuer;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
  import org.tolven.doc.XMLProtectedLocal;
- import org.tolven.doc.bean.TolvenMessage;
- import org.tolven.doc.bean.XMLBean;
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocBase;
  import org.tolven.doc.entity.DocCCR;
  import org.tolven.doc.entity.DocXML;
- import org.tolven.gen.entity.FamilyMember;
  import org.tolven.gen.model.GenMedicalCCR;
  import org.tolven.security.DocProtectionLocal;
--- 52,64 ----
  import org.tolven.app.entity.MenuStructure;
  import org.tolven.ccr.ContinuityOfCareRecord;
! import org.tolven.core.AccountDAOLocal;
! import org.tolven.core.entity.AccountExchange;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
  import org.tolven.doc.XMLProtectedLocal;
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocBase;
  import org.tolven.doc.entity.DocCCR;
  import org.tolven.doc.entity.DocXML;
  import org.tolven.gen.model.GenMedicalCCR;
  import org.tolven.security.DocProtectionLocal;
***************
*** 74,78 ****
   *
   */
! public class MenuAction extends TolvenAction{
  //  @EJB
      private MenuLocal menuLocal;
--- 70,74 ----
   *
   */
! public class MenuAction extends TolvenAction {
  //  @EJB
      private MenuLocal menuLocal;
***************
*** 86,89 ****
--- 82,87 ----
      private Long menuDataCount = null;
      private List<String> childPaths;
+     private List<AccountExchange> providers;
+     private DataModel providersModel;
  
      protected DocumentLocal documentLocal;
***************
*** 92,96 ****
      protected CreatorLocal creatorBean;
      protected DocProtectionLocal docProtectionBean;
!     private String givenName;
      private String value;
      
--- 90,96 ----
      protected CreatorLocal creatorBean;
      protected DocProtectionLocal docProtectionBean;
! 	@EJB protected AccountDAOLocal accountBean;
! 
! 	private String givenName;
      private String value;
      
***************
*** 109,112 ****
--- 109,113 ----
  	           xmlLocal = (XMLLocal) ctx.lookup("tolven/XMLBean/local");
                 docProtectionBean = (DocProtectionLocal) ctx.lookup("tolven/DocProtectionBean/local");
+                accountBean = (AccountDAOLocal) ctx.lookup("tolven/AccountDAOBean/local");
  	}
  	
***************
*** 386,389 ****
--- 387,391 ----
  		return ccr;
  	}
+ 
  	/**
       * Creates a chart based on MenuData
***************
*** 391,398 ****
       * @return A chart suitable for rendering
       */
!     public JFreeChart createChart(XYDataset dataset) {
  
          JFreeChart chart = ChartFactory.createTimeSeriesChart(
!             "Lipids",  // title
              "Date",             // x-axis label
              "Value",   // y-axis label
--- 393,400 ----
       * @return A chart suitable for rendering
       */
!     public JFreeChart createChart(String title, XYDataset dataset ) {
  
          JFreeChart chart = ChartFactory.createTimeSeriesChart(
!             title,  // title
              "Date",             // x-axis label
              "Value",   // y-axis label
***************
*** 478,482 ****
  //	        System.out.println("Preparing Graph");
  			MenuStructure ms = getThisMenu( );
! 			JFreeChart chart = createChart(createDataset( ms.getAccount().getAccountType().getKnownType() + ":patient:results:lab"));
  	        String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false));
  	        graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8");
--- 480,484 ----
  //	        System.out.println("Preparing Graph");
  			MenuStructure ms = getThisMenu( );
! 			JFreeChart chart = createChart("Lipids", createDataset( ms.getAccount().getAccountType().getKnownType() + ":patient:results:lab"));
  	        String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false));
  	        graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8");
***************
*** 485,488 ****
--- 487,553 ----
  		return graphURL;
  	}
+     /**
+      * Creates a dataset from menuData.
+      *
+      * @return An XY dataset
+      */
+     public XYDataset createDataset2(String path) {
+     	// Adjust the path to make this work
+     	MenuStructure msLab = menuLocal.findMenuStructure(getAccountId(), path);
+     	if (msLab==null) throw new IllegalArgumentException( "Path not valid for this account");
+     	// Create a new path based on the matching id(s) from the called path
+     	// for example, if patient were specified in the input nodeValues and the new path has a patient node, then
+     	// it's pulled.
+     	MenuPath mdPath = new MenuPath(msLab.getPath(), getTargetMenuPath() );
+ //        System.out.println("dataset: Query from " + msLab.getPath() + " for requested path: " + getTargetMenuPath());
+ 		MenuQueryControl ctrl = new MenuQueryControl();
+ 		ctrl.setLimit( 5000 );	// TODO: This is a hard coded hard query limit that should be in a property or something
+ 		ctrl.setMenuStructure( msLab );
+ 		ctrl.setNow( getNow());
+ 		ctrl.setOffset( 0 );
+ 		ctrl.setOriginalTargetPath( mdPath );
+ 		ctrl.setRequestedPath( mdPath );
+ 		List<MenuData> menuData = menuLocal.findMenuData( ctrl );
+         TimeSeries s1 = new TimeSeries("glucose (mg/dL)", Month.class);
+         TimeSeries s2 = new TimeSeries("Weight (lb)", Month.class);
+         for ( MenuData md : menuData ) {
+         	TimeSeries sx;
+ //            System.out.println("MD Item: " + md.getId());
+             String result = md.getString01();
+         	if ("Blood Glucose".equals(result)) {
+         		sx = s1;
+         	}
+         	else if ("Weight".equals(result)) {
+         		sx = s2;
+         	} else continue;
+         	GregorianCalendar cal = new GregorianCalendar();
+         	cal.setTime( md.getDate01() );
+         	Month m = new Month( cal.get(GregorianCalendar.MONTH)+1, cal.get(GregorianCalendar.YEAR));
+ //        	System.out.println( "Graph Data: " + m.getMonth() + "/" + m.getYear() + "=" + md.getPqValue01());
+         	sx.addOrUpdate(m, md.getPqValue01());
+         }
+         TimeSeriesCollection dataset = new TimeSeriesCollection();
+         dataset.addSeries(s1);
+         dataset.addSeries(s2);
+ 
+         dataset.setDomainIsPointsInTime(true);
+         System.out.println("Done preparing Dataset");
+ 
+         return dataset;
+ 
+     }
+ 	
+ 	public String getGraphURL2()  throws IOException {
+ 		if (graphURL==null) {
+ //	        System.out.println("Preparing Graph");
+ 			MenuStructure ms = getThisMenu( );
+ 			JFreeChart chart = createChart("Diabetes", createDataset2( ms.getAccount().getAccountType().getKnownType() + ":patient:doc:obs:values"));
+ 	        String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false));
+ 	        graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8");
+ 	        System.out.println("Graph2 URL: " + graphURL);
+ 		}
+ 		return graphURL;
+ 	}
+ 
  	static final String TRIM_NS = "urn:astm-org:trim:4.0"; 
  
***************
*** 557,561 ****
  		generator.setPatient( mdPatient );
  //		generator.setFamily(control.getFamilyUnit());
! 		Queuer q = new Queuer();
  		String OID = System.getProperty("tolven.repository.oid", "0");
  		generator.setDocumentId(OID + "." + getNow() + "." + 1 );
--- 622,626 ----
  		generator.setPatient( mdPatient );
  //		generator.setFamily(control.getFamilyUnit());
! //		Queuer q = new Queuer();
  		String OID = System.getProperty("tolven.repository.oid", "0");
  		generator.setDocumentId(OID + "." + getNow() + "." + 1 );
***************
*** 675,677 ****
--- 740,757 ----
  	}
  
+ 	public List<AccountExchange> getAccountExchangeSend() {
+ 		if (providers==null) {
+ 			providers = accountBean.findActiveEndPoints(getTop().getAccountUser().getAccount(), AccountExchange.Direction.SEND, false);
+         }
+ 		return providers;
+ 	}
+ 
+ 	public DataModel getProvidersModel() {
+ 		if (providersModel==null) {
+ 			providersModel = new ListDataModel();
+ 			providersModel.setWrappedData(getAccountExchangeSend());
+ 		}
+ 		return providersModel;
+ 	}
+ 
  }
\ No newline at end of file

Index: RegisterAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** RegisterAction.java	25 Mar 2007 13:52:24 -0000	1.49
--- RegisterAction.java	7 Apr 2007 22:40:49 -0000	1.50
***************
*** 202,208 ****
      public String updateAccount() {
      	Account account = getAccountUser().getAccount();
!     	account.setTitle(getAccountTitle());
!     	account.setTimeZone(getAccountTimeZone());
!     	account.setLocale(getAccountLocale());
      	accountBean.updateAccount(account);
  //    	getTop().setAccountTitle(getAccountTitle());
--- 202,208 ----
      public String updateAccount() {
      	Account account = getAccountUser().getAccount();
!     	account.setTitle(accountTitle);// Don't use accessor, doesn't work right when resetting locale to null
!     	account.setTimeZone(accountTimeZone);// Don't use accessor, doesn't work right when resetting locale to null
!     	account.setLocale(accountLocale); // Don't use accessor, doesn't work right when resetting locale to null
      	accountBean.updateAccount(account);
  //    	getTop().setAccountTitle(getAccountTitle());

Index: TRIMAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TRIMAction.java	29 Mar 2007 01:00:28 -0000	1.5
--- TRIMAction.java	7 Apr 2007 22:40:49 -0000	1.6
***************
*** 2,18 ****
  
  import java.io.ByteArrayOutputStream;
  
  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();
  	}
  
--- 2,32 ----
  
  import java.io.ByteArrayOutputStream;
+ import java.util.ArrayList;
+ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
  
+ import javax.annotation.EJB;
+ import javax.faces.model.SelectItem;
+ import javax.naming.InitialContext;
  import javax.naming.NamingException;
  
  import org.tolven.app.entity.MenuData;
+ import org.tolven.core.AccountDAOLocal;
+ import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.AccountExchange;
  import org.tolven.doc.entity.DocBase;
  import org.tolven.doc.entity.DocXML;
+ import org.tolven.trim.CopyTo;
  import org.tolven.trim.Trim;
  
  public class TRIMAction extends MenuAction {
+ 
  	private Trim trim;
! 	private List<CopyTo> routing;
  	public TRIMAction() throws NamingException {
  		super();
+         InitialContext ctx = new InitialContext();
  	}
  
***************
*** 45,49 ****
  		this.trim = trim;
  	}
! 	
  	/**
  	 * Marshal updated trim back into the document.
--- 59,120 ----
  		this.trim = trim;
  	}
! 
! 	/**
! 	 * Put together the list of accounts we could send this to if new or the accounts we did
! 	 * send this to if status = active. Note that this doesn't provide a status of the sent item.
! 	 * @return
! 	 * @throws Exception
! 	 */
! 	public List<CopyTo> getRouting() throws Exception {
! 		if (routing==null) {
! //			System.out.println( "[TrimAction.getRouting] - new");
! 			// Get the list so far from the document
! 			routing = getTrim().getCopyTos();
! 			// Make a list hash set
! 			Set<Long> existing = new HashSet<Long>(20);
! 			for ( CopyTo copyTo : routing ) {
! 				existing.add(new Long(copyTo.getAccountId()));
! 			}
! 				
! 			// Make sure any copyTo we know about is also in the list.
! 			List<AccountExchange> aes = accountBean.findActiveEndPoints(getTop().getAccountUser().getAccount(), AccountExchange.Direction.SEND, false);
! 			for ( AccountExchange ae : aes ) {
! 				if (!existing.contains(ae.getOtherAccount().getId())) {
! 					CopyTo copyTo = new CopyTo();
! 					copyTo.setAccountId(ae.getOtherAccount().getId());
! 					copyTo.setAccountName(ae.getOtherAccount().getTitle());
! 					copyTo.setCopy(false);
! 					routing.add(copyTo);
! 				}
! 			}
! 		}
! 		return routing;
! 	}
! 	/**
! 	 * Return a list of only the selected copyTo entries for this item
! 	 * @return 
! 	 * @throws Exception
! 	 */
! 	public List<CopyTo> getSelectedRouting() throws Exception {
! 		routing = getTrim().getCopyTos();
! 		List<CopyTo> rslt = new ArrayList<CopyTo>( routing.size() );
! 		for ( CopyTo copyTo : routing ) {
! 				if (copyTo.isCopy()) rslt.add( copyTo);
! 		}
! 		return rslt;
! 	}
! 
! 	public boolean isShowSelectedRouting() throws Exception {
! 		for ( CopyTo copyTo : getTrim().getCopyTos() ) {
! 			if (copyTo.isCopy()) return true;
! 		}
! 		return false;
! 	}
! 
! 	public void setRouting( List<CopyTo> routing) {
! 		System.out.println( "[TrimAction.setRouting]");
! 		this.routing = routing;
! 	}
! 
  	/**
  	 * Marshal updated trim back into the document.
***************
*** 52,71 ****
  	 */
  	public String upload( ) throws Exception {
! 		MenuData md = getMenuDataItem();
! 		if (md==null) {
! 			throw new RuntimeException( "upload requested but no menuDataItem specified");
! 		}
! 		DocBase doc = documentLocal.findDocument(md.getDocumentId());
! 		if (doc==null) {
! 			throw new RuntimeException( "Document id invalid in MD " + md.getId());
! 		}
! 		if (!(doc instanceof DocXML)) {
! 			throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName());
  		}
! 		ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ;
! 		xmlLocal.marshalTRIM(trim, trimXML);
! 		doc.setAsEncryptedContent(trimXML.toByteArray());
! 		return "success";
  	}
  
  }
--- 123,149 ----
  	 */
  	public String upload( ) throws Exception {
! 		
! 		try {
! 			MenuData md = getMenuDataItem();
! 			if (md==null) {
! 				throw new RuntimeException( "upload requested but no menuDataItem specified");
! 			}
! 			DocBase doc = documentLocal.findDocument(md.getDocumentId());
! 			if (doc==null) {
! 				throw new RuntimeException( "Document id invalid in MD " + md.getId());
! 			}
! 			if (!(doc instanceof DocXML)) {
! 				throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName());
! 			}
! 			ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ;
! 			xmlLocal.marshalTRIM(trim, trimXML);
! 			doc.setAsEncryptedContent(trimXML.toByteArray());
! 			return "success";
! 		} catch (RuntimeException e) {
! 			System.out.println( e.getMessage());
  		}
! 		return "fail";
  	}
  
+ 
  }

[Tolven-cvs-commit] tolvenWEB/web/manage editAccountProfile.xhtml, 1.5, 1.6

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/manage
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/manage

Modified Files:
	editAccountProfile.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: editAccountProfile.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editAccountProfile.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editAccountProfile.xhtml	29 Mar 2007 19:29:03 -0000	1.5
--- editAccountProfile.xhtml	7 Apr 2007 22:40:49 -0000	1.6
***************
*** 89,93 ****
  	            </h:column>
  	          </h:dataTable>
!                 <h:panelGrid columns="3" rendered="#{reg.user.demoUser and top.accountAdmin}">
  	                <h:outputText value="Add existing demo user to this account"/>
                      <h:inputText id="uid" value="#{reg.newDemoUser}" size="20"/>
--- 89,93 ----
  	            </h:column>
  	          </h:dataTable>
!                 <h:panelGrid columns="3" rendered="#{top.accountAdmin}">
  	                <h:outputText value="Add existing demo user to this account"/>
                      <h:inputText id="uid" value="#{reg.newDemoUser}" size="20"/>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/ajax InstantiateServlet.java, 1.6, 1.7

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/src/org/tolven/ajax

Modified Files:
	InstantiateServlet.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: InstantiateServlet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/InstantiateServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantiateServlet.java	24 Mar 2007 15:27:25 -0000	1.6
--- InstantiateServlet.java	7 Apr 2007 22:40:50 -0000	1.7
***************
*** 19,22 ****
--- 19,23 ----
  import org.tolven.app.MenuLocal;
  import org.tolven.app.entity.MenuData;
+ import org.tolven.core.entity.AccountExchange;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.Status;
***************
*** 59,63 ****
  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
  	try {
! 		InitialContext ctx;
  //		UserTransaction ut = null;
  //		ctx = new InitialContext();
--- 60,64 ----
  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
  	try {
! //		InitialContext ctx;
  //		UserTransaction ut = null;
  //		ctx = new InitialContext();
***************
*** 74,77 ****
--- 75,90 ----
  	    //	    writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
  
+ 	    if (uri.endsWith("sendCCR.ajaxi")) {
+ 	    	long menuDataId = Long.parseLong(req.getParameter("patientId"));
+ 	    	long otherAccount = Long.parseLong(req.getParameter("otherAccountId"));
+ 	    	String rslt = "Send menuDataId " + menuDataId + " to " + otherAccount;
+ 	    	MenuData md = menuBean.findMenuDataItem(menuDataId);
+ 	    	writer.write( rslt );
+     		System.out.println( rslt );
+     		creatorBean.sendCopyTo( accountUser, md.getDocumentId(), otherAccount);
+ 			writer.close();
+ 			return;
+     	}
+ 
      	/**
      	 * We have the data, now just submit to make it actionable.

[Tolven-cvs-commit] tolvenWEB/web/invitation activate.xhtml, 1.4, 1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/invitation
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/invitation

Modified Files:
	activate.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: activate.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/invitation/activate.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** activate.xhtml	12 Jul 2006 05:06:59 -0000	1.4
--- activate.xhtml	7 Apr 2007 22:40:49 -0000	1.5
***************
*** 10,14 ****
          <p>Congratulations. The activation process for your new tolven account is almost complete.
          To complete the activation process, click the following link (or paste it into your browser's address bar).
!         You will then need to login using your new username and your new password.
          </p>
         </ui:define>
--- 10,14 ----
          <p>Congratulations. The activation process for your new tolven account is almost complete.
          To complete the activation process, click the following link (or paste it into your browser's address bar).
!         You will then need to login using your new username (which will be your email address) and your new password.
          </p>
         </ui:define>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/rim DoubleConverter.java, NONE, 1.1

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/rim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/src/org/tolven/web/rim

Added Files:
	DoubleConverter.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

--- NEW FILE: DoubleConverter.java ---
package org.tolven.web.rim;

import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;

public class DoubleConverter extends javax.faces.convert.DoubleConverter {

	/** 
	 * Given a String containing a double floating number, convert it to a double. We use the
	 * Faces converter except when the string is null in which case we simply return 0.0 instead of
	 * an error.
	 * (non-Javadoc)
	 * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
	 */
	public Object getAsObject(FacesContext ctx, UIComponent comp, String value) throws ConverterException {
		if (value==null || value.trim().length()==0) {
			return Double.valueOf(0.0);
		}
		return super.getAsObject(ctx, comp, value);
	}

}

[Tolven-cvs-commit] tolvenWEB/web/scripts tolvenwiz.js, 1.9, 1.10 tolven6.js, 1.14, 1.15 rico.js, 1.5, 1.6

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/scripts
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/scripts

Modified Files:
	tolvenwiz.js tolven6.js rico.js 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: tolvenwiz.js
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolvenwiz.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tolvenwiz.js	27 Mar 2007 23:23:42 -0000	1.9
--- tolvenwiz.js	7 Apr 2007 22:40:48 -0000	1.10
***************
*** 12,23 ****
  // Cancel and destroy the current wizard, first on the server, then on the browser.
  function wizCancel( element ) {
! //	alert( "Cancel: " + element );
! 	var myAjax = new Ajax.Request(
! 			'wizCancel.ajaxi', 
! 			{
! 				method: 'get', 
! 				parameters: 'element='+element, 
! 				onComplete: wizCancelDone
! 			});
  }
  
--- 12,24 ----
  // Cancel and destroy the current wizard, first on the server, then on the browser.
  function wizCancel( element ) {
! 	if (confirm( "Completely cancel and remove?" )) {
! 		var myAjax = new Ajax.Request(
! 				'wizCancel.ajaxi', 
! 				{
! 					method: 'get', 
! 					parameters: 'element='+element, 
! 					onComplete: wizCancelDone
! 				});
! 	}
  }
  

Index: rico.js
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/rico.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rico.js	27 Mar 2007 23:23:42 -0000	1.5
--- rico.js	7 Apr 2007 22:40:48 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  /**
+   * Tolven note: This file has been modified for use in Tolven.
    *
    *  Copyright 2005 Sabre Airline Solutions
***************
*** 2219,2223 ****
         var onRefreshComplete = this.liveGrid.options.onRefreshComplete;
         if (onRefreshComplete != null)
!            onRefreshComplete();
     },
  
--- 2220,2224 ----
         var onRefreshComplete = this.liveGrid.options.onRefreshComplete;
         if (onRefreshComplete != null)
!            onRefreshComplete( this.liveGrid );
     },
  
***************
*** 2490,2493 ****
--- 2491,2495 ----
  
        if ( this.options.sortCol ) {
+ //      	alert( "setSortUI: " + this.options.sortCol + " " + this.options.sortDir );
           this.setSortUI( this.options.sortCol, this.options.sortDir );
        }

Index: tolven6.js
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tolven6.js	12 Mar 2007 08:46:39 -0000	1.14
--- tolven6.js	7 Apr 2007 22:40:48 -0000	1.15
***************
*** 32,35 ****
--- 32,36 ----
  }
  
+ 
  // Upload changes based on changes to the form
  function wizUpload( obj, value ) {
***************
*** 41,48 ****
--- 42,53 ----
  }
  
+ submitActive = false;
+ 
  // Intercept a normal Submit and do it Ajax-style instead. 
  // In this case, we don't overlay the pane, but rather load to the
  // drilldown pane
  function ajaxSubmit3(form, element ) {
+ 	if (submitActive) return false;
+ 	submitActive = true;
     var elements = Form.getElements(form);
      var queryComponents = new Array();
***************
*** 53,57 ****
  	queryComponents.push( 'element='+element );
  //	alert( "submit element=" + element + " to: " + form.action );
- //     Form.disable( form );  // Don't allow edits or button pushes
       var ajax = new Ajax.Updater(
           element+ ":drilldown",           // Put results here
--- 58,61 ----
***************
*** 59,62 ****
--- 63,67 ----
           {                // options
               method:'post',
+              onComplete: ajaxSubmit3Done,
               evalScripts: true,
               postBody: queryComponents.join('&')
***************
*** 67,98 ****
  // OK to allow Submit button now.
  function ajaxSubmit3Done( req ) {
! 	alert( req.getAttribute( "element") );
! }
! 
! // Intercept a normal Submit and do it Ajax-style instead
! function ajaxSubmit(b) {
! 	alert( "Use ajaxSubmit2 now" );
!     var elements = Form.getElements($(b.form));
!     var queryComponents = new Array();
!     for (var i = 0; i < elements.length; i++) {
!       if (elements[i].type!="submit" || elements[i].name == b.name) {
!           var queryComponent = Form.Element.serialize(elements[i]);
! //          alert( queryComponent );
!           if (queryComponent) queryComponents.push(queryComponent);
!       }
!     }
! 	queryComponents.push( 'element='+visiblePage );
! 	
!      Form.disable( b.form );  // Don't allow edits or button pushes
!      var ajax = new Ajax.Updater(
!          b.form.parentNode.id,           // Put results here
!          b.form.action,        // URL
!          {                // options
!              method:'post',
!              postBody: queryComponents.join('&')
!         });
  }
  
- 
  // Return the id of the parent that is a container node.
  // Referenced in AjaxServlet.java
--- 72,78 ----
  // OK to allow Submit button now.
  function ajaxSubmit3Done( req ) {
! 	submitActive = false;
  }
  
  // Return the id of the parent that is a container node.
  // Referenced in AjaxServlet.java
***************
*** 248,251 ****
--- 228,232 ----
  		return content;
  	}
+ 
  	// Ask the server to instantiate a new item and wait for the new element name
  	function instantiate( templateId, context ) {
***************
*** 265,268 ****
--- 246,266 ----
  	}
  
+ 	// Ask the server to sendCCR for the specified patient and 
+ 	function sendCCR( patientId, accountId ) {
+ 		var sendAjax = new Ajax.Request(
+ 			'sendCCR.ajaxi', 
+ 			{
+ 				method: 'get', 
+ 				parameters: 'patientId='+patientId+'&otherAccountId='+accountId, 
+ 				onComplete: sendCCRComplete
+ 			});
+ 	}
+ 
+ 	// Once sent, we can show the new item
+ 	function sendCCRComplete(req) {
+ 		alert( req.responseText );
+ 	}
+ 
+ 
  	// Fetch TRIM content of a document from server
  	function trimGet( element ) {
***************
*** 384,388 ****
  		var nodeDetail = nodes[nodes.length-1].split("-");
  		if (nodeDetail.length==1) nodeDetail[1] = '0';
! 		content.innerHTML = 'Awaiting content for ' + contentName;
  		serialNo++;
  //		alert( "Getting: " + contentName );
--- 382,386 ----
  		var nodeDetail = nodes[nodes.length-1].split("-");
  		if (nodeDetail.length==1) nodeDetail[1] = '0';
! //		content.innerHTML = 'Awaiting content for ' + contentName;
  		serialNo++;
  //		alert( "Getting: " + contentName );
***************
*** 457,462 ****
--- 455,477 ----
  		setupPaneArea('paneArea');
  		showPane( initialPage );
+ 		new PeriodicalExecuter(refreshTabs, 30 );
  	}
  	
+ 	function refreshTabs ( ) {
+ 		var containers = document.getElementsByClassName( "container" );
+ 		for (var x = 0; x < containers.length; x++) {
+ 			var element = containers[x];
+ 			if (element.getAttribute( 'refreshable') && element.style.display=='block') {
+ 				getRemoteContent(element.id);
+ 			}
+ 		}
+ ////		patientRefreshExec.stop();
+ ////		var offset = patientListOffset;
+ ////		patientGridz.resetContents();
+ ////        patientGridz.scroller.moveScroll(offset);
+ ////        patientGridz.viewPort.scrollTo(patientGridz.scroller.rowToPixel(offset));            
+ ////		patientGridz.requestContentRefresh(offset);
+ 	}
+ 
  function displayableSibling( id ) {
  	var thisNode = $(id + ":sel");
***************
*** 504,507 ****
--- 519,524 ----
  	showPane( np );
  }
+ 
+ 	
  	
  	
\ No newline at end of file

[Tolven-cvs-commit] tolvenWEB/web/five graphList.xhtml, NONE, 1.1 graphMenu.xhtml, NONE, 1.1 providers.xhtml, 1.5, 1.6 obsSummary.xhtml, 1.3, 1.4

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/five
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/five

Modified Files:
	providers.xhtml obsSummary.xhtml 
Added Files:
	graphList.xhtml graphMenu.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

--- NEW FILE: graphList.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 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( 'graph', 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: 'GraphFilter', 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 (graph name): <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="left" width="125px">Date</th>
					  <th align="left" width="210px">Graph</th>
					  <th align="left" width="150px">Source</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>
	</div>
	</ui:composition>
  </body>
</html>
--- NEW FILE: graphMenu.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>Graph 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">Graph</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>
Index: providers.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/providers.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** providers.xhtml	29 Nov 2006 01:35:33 -0000	1.5
--- providers.xhtml	7 Apr 2007 22:40:48 -0000	1.6
***************
*** 10,16 ****
    <body>
    	<ui:composition>
! <p>
! List of the patient's providers. #{param.element}, path #{menu.targetMenuPath.path}.
! </p>
    	</ui:composition>
    </body>
--- 10,38 ----
    <body>
    	<ui:composition>
!   		<div>
!    		      <h:dataTable value="#{menu.providersModel}" var="aes" styleClass="manage">
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Account"/>
! 	                </f:facet>
! 	                <h:outputText value="#{aes.otherAccount.id}" />
! 	            </h:column>
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Title"/>
! 	                </f:facet>
!                     <h:outputText value="#{aes.otherAccount.title}"/>
! 	            </h:column>
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Action"/>
! 	                </f:facet>
!                     <a href="#" onclick="sendCCR('#{menu.drilldownItem.id}', '#{aes.otherAccount.id}');">
!                     	Send Summary
!                     </a>
! 	            </h:column>
! 	          </h:dataTable>
! 	        <p>Temporary: the Summary is sent immediately rather than starting a wizard.</p>
! 		</div>	      
    	</ui:composition>
    </body>

Index: obsSummary.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/obsSummary.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** obsSummary.xhtml	24 Feb 2007 08:14:55 -0000	1.3
--- obsSummary.xhtml	7 Apr 2007 22:40:48 -0000	1.4
***************
*** 18,22 ****
             	<h:column>
             		<h:outputText value="#{md.date01}">
!            			<f:convertDateTime type="date" pattern="MM/dd" timeZone="#{top.timeZone}"/>
             		</h:outputText>
             	</h:column>
--- 18,22 ----
             	<h:column>
             		<h:outputText value="#{md.date01}">
!            			<f:convertDateTime type="date" pattern="MM/dd/yyyy" timeZone="#{top.timeZone}"/>
             		</h:outputText>
             	</h:column>

[Tolven-cvs-commit] tolvenWEB/web/five/drilldown lipidDD.xhtml, NONE, 1.1 diabetesDD.xhtml, NONE, 1.1 glucoseDD.xhtml, NONE, 1.1 drilldown.xhtml, 1.3, 1.4

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/five/drilldown

Modified Files:
	drilldown.xhtml 
Added Files:
	lipidDD.xhtml diabetesDD.xhtml glucoseDD.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: drilldown.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/drilldown/drilldown.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** drilldown.xhtml	27 Mar 2007 23:23:42 -0000	1.3
--- drilldown.xhtml	7 Apr 2007 22:40:48 -0000	1.4
***************
*** 11,21 ****
  <body>
      <ui:composition>
! 		<p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting
! 			is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step
! 			to display on a post-submission drilldown. </p>
! 			<ui:include src="/five/drilldown/weightDD.xhtml">
! 		   		<ui:param name="act" value="#{trim.trim.act}"/>
! 			</ui:include>
!     
  	</ui:composition>
  </body>
--- 11,40 ----
  <body>
      <ui:composition>
! 		<ui:include src="/five/drilldown/#{trim.trim.drilldown}">
! 	   		<ui:param name="act" value="#{trim.trim.act}"/>
! 		</ui:include>
! 		<h:panelGroup rendered="#{trim.showSelectedRouting}">
!    			<p>Route a copy of this to the following:</p>
!             <h:dataTable value="#{trim.selectedRouting}" var="ae">
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Account Id"/>
! 	                </f:facet>
! 	                <h:outputText value="#{ae.accountId}"/>
! 	            </h:column>
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Account Name"/>
! 	                </f:facet>
! 	                <h:outputText value="#{ae.accountName}"/>
! 	            </h:column>
! 	            <h:column>
! 	                <f:facet name="header">
! 	                    <h:outputText value="Comment"/>
! 	                </f:facet>
! 	                <h:outputText value="#{ae.comment}"/>
! 	            </h:column>
!             </h:dataTable>
! 		</h:panelGroup>			    
  	</ui:composition>
  </body>

--- NEW FILE: diabetesDD.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>Diabetes Graph - Drilldown</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>

<body>
    <ui:composition>
		<h:outputText value="#{act.title.ST.value}"/><br/>
		<h:panelGrid columns="2" >
			<h:outputText value="Graph created: "/>
			<h:outputText value="#{act.effectiveTime.TS[0]}">
				<f:converter converterId="TSDateConverter"/>
			</h:outputText>
		</h:panelGrid>
		<div id="#{menu.elementLabel}graphimage">
			<h:graphicImage value="#{menu.graphURL2}" width="600" height="400"/>
		</div>
	</ui:composition>
</body>
</html>
--- NEW FILE: lipidDD.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>Lipid Graph - Drilldown</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>

<body>
    <ui:composition>
		<h:outputText value="#{act.title.ST.value}"/><br/>
		<h:panelGrid columns="2" >
			<h:outputText value="Graph created: "/>
			<h:outputText value="#{act.effectiveTime.TS[0]}">
				<f:converter converterId="TSDateConverter"/>
			</h:outputText>
		</h:panelGrid>
		<div id="#{menu.elementLabel}graphimage">
			<h:graphicImage value="#{menu.graphURL}" width="600" height="400"/>
		</div>
	</ui:composition>
</body>
</html>
--- NEW FILE: glucoseDD.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>Blood glucose - Drilldown</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>

<body>
    <ui:composition>
		<h:outputText value="#{act.title.ST.value}"/><br/>
		<h:panelGrid columns="2" >
			<h:outputText value="Time of Observation: "/>
			<h:outputText value="#{act.effectiveTime.TS[0]}">
				<f:converter converterId="TSDateConverter"/>
			</h:outputText>
			<h:outputText value="Value: "/>
			<h:outputText value="#{act.observation.value.PQS[0].value} #{act.observation.value.PQS[0].unit}"/>
			<h:outputText value="Device: "/>
			<h:outputText value="n/a"/>
		</h:panelGrid>
	</ui:composition>
</body>
</html>

[Tolven-cvs-commit] tolvenWEB/web/five/test docList.xhtml,1.7,1.8

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/five/test
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/web/five/test

Modified Files:
	docList.xhtml 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: docList.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/docList.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** docList.xhtml	20 Jan 2007 22:40:35 -0000	1.7
--- docList.xhtml	7 Apr 2007 22:40:48 -0000	1.8
***************
*** 28,32 ****
  because the document is encryped. (Note: the encryption feature is not retroactive 
  so you may still find plaintext documents in older accounts).</p>
! <p>To see encrypted documents, you must have more than one account in the Select Account page presented when you logged in.</p>
  
  <div style="width:800px">
--- 28,32 ----
  because the document is encryped. (Note: the encryption feature is not retroactive 
  so you may still find plaintext documents in older accounts).</p>
! <p>In order to attempt to see encrypted documents, you must have more than one account in the Select Account page presented when you logged in.</p>
  
  <div style="width:800px">

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/faces TolvenViewHandler.java, NONE, 1.1

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/faces
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20009/src/org/tolven/web/faces

Added Files:
	TolvenViewHandler.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

--- NEW FILE: TolvenViewHandler.java ---
package org.tolven.web.faces;

import java.io.IOException;
import java.lang.NullPointerException;

import java.util.Locale;

import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ViewHandler;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextFactory;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;

import org.tolven.core.entity.AccountUser;

public class TolvenViewHandler extends ViewHandler {
	
	private ViewHandler originalViewHandler = null;
	
	public TolvenViewHandler() {}
	
	public TolvenViewHandler(ViewHandler originalViewHandler) {
		super();
		this.originalViewHandler = originalViewHandler;
	}

	public Locale calculateLocale(FacesContext facesContext) {
        ExternalContext ctx = facesContext.getExternalContext();
        HttpServletRequest request = ((HttpServletRequest) ctx.getRequest());
        AccountUser accountUser = (AccountUser) request.getAttribute("accountUser");
		String viewLocale;
		Locale tolvenLocale = originalViewHandler.calculateLocale(facesContext);
		if (null != accountUser ) {
			viewLocale = accountUser.getUser().getLocale();
			if (viewLocale == null) viewLocale = accountUser.getAccount().getLocale();
			if (viewLocale == null) viewLocale = System.getProperty("tolven.locale");
			if (viewLocale != null) {
				if (viewLocale.length() == 2) 
					tolvenLocale = new Locale(viewLocale);
				if (viewLocale.length() > 2){
					String[] localeComponents = viewLocale.split("_");
					tolvenLocale = new Locale(localeComponents[0], localeComponents[1]);
				}
			}
		}
		return tolvenLocale;
	}	
	
	public String calculateCharacterEncoding(FacesContext facesContext) {
		return originalViewHandler.calculateCharacterEncoding(facesContext);
	}
	 
	public String calculateRenderKitId(FacesContext facesContext) { 
	  return originalViewHandler.calculateRenderKitId(facesContext);
	 }
	 
	 public UIViewRoot createView(FacesContext facesContext, String viewName) {   
		 return originalViewHandler.createView(facesContext, viewName);
	 }
	 
	 public String getActionURL(FacesContext facesContext, String s) {  
	  return originalViewHandler.getActionURL(facesContext, s); 
	  
	 }
	 
	 public String getResourceURL(FacesContext facesContext, String s) {
	  return originalViewHandler.getResourceURL(facesContext, s);  
	 }
	 
	 public void renderView(FacesContext facesContext, UIViewRoot uiViewRoot) 
	 	throws IOException, FacesException { 
		 originalViewHandler.renderView(facesContext, uiViewRoot);
	 }
	 
	 public void initView(FacesContext facesContext) {
		 originalViewHandler.initView(facesContext);
	 }
	 
	 public UIViewRoot restoreView(FacesContext facesContext, String viewName) { 
	  return originalViewHandler.restoreView(facesContext, viewName);
	 }
	 
	 public void writeState(FacesContext facesContext) throws IOException {
		 originalViewHandler.writeState(facesContext);
	 }
}

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/faces - New directory

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/faces
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19962/src/org/tolven/web/faces

Log Message:
Directory /cvsroot/tolven/tolvenWEB/src/org/tolven/web/faces added to the repository

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/trim CopyTo.java, NONE, 1.1 TolvenId.java, NONE, 1.1 NewFacetLabel.java, 1.4, 1.5 RoleSlot.java, 1.5, 1.6 Participation.java, 1.5, 1.6 BinaryDataEncoding.java, 1.5, 1.6 EntityNamePartQualifier.java, 1.5, 1.6 EntityClass.java, 1.5, 1.6 ActParticipation.java, 1.5, 1.6 ED.java, 1.5, 1.6 CV.java, 1.5, 1.6 EntityStatus.java, 1.5, 1.6 RoleBind.java, 1.5, 1.6 GTS.java, 1.5, 1.6 EntityNamePartType.java, 1.5, 1.6 Observation.java, 1.5, 1.6 ObjectFactory.java, 1.5, 1.6 ParticipationSubset.java, 1.5, 1.6 CDSlot.java, 1.5, 1.6 RoleInternal.java, 1.5, 1.6 IVLINT.java, 1.5, 1.6 PostalAddressUse.java, 1.5, 1.6 TsBoundary.java, 1.5, 1.6 NullFlavor.java, 1.5, 1.6 ActMood.java, 1.5, 1.6 IntegrityCheckType.java, 1.5, 1.6 EntityNameUse.java, 1.5, 1.6 RoleReference.java, 1.5, 1.6 CD.java, 1.5, 1.6 NewFacetValidate.java, 1.4, 1.5 ActSlot.java, 1.5, 1.6 ActReference.java, 1.5, 1.6 DataType.java, 1.5, 1.6 ActRelationshipJoin.java, 1.5, 1.6 ActInternal.java, 1.5, 1.6 RoleLinkType.java, 1.5, 1.6 RealmCode.java, 1.5, 1.6 SetOperator.java, 1.5, 1.6 ParticipationSignature.java, 1.5, 1.6 GTSSlot.java, 1.5, 1.6 ActBind.java, 1.5, 1.6 OutboundActRelationship.java, 1.5, 1.6 NewFacetSet.java, 1.2, 1.3 IntegrityCheck.java, 1.5, 1.6 CESlot.java, 1.5, 1.6 AddressPartType.java, 1.5, 1.6 BL.java, 1.5, 1.6 TELFieldType.java, 1.5, 1.6 InboundActRelationship.java, 1.5, 1.6 ActRelationship.java, 1.5, 1.6 ConcreteDatatype.java, 1.4, 1.5 SETCESlot.java, 1.5, 1.6 RoleNull.java, 1.5, 1.6 ActStatus.java, 1.5, 1.6 ActRelationshipSubset.java, 1.5, 1.6 Slot.java, 1.5, 1.6 ActRelationshipCheckpoint.java, 1.5, 1.6 TimingEvent.java, 1.5, 1.6 CR.java, 1.5, 1.6 STSlot.java, 1.5, 1.6 package-info.java, 1.5, 1.6 TemplateId.java, 1.1, 1.2 Role.java, 1.5, 1.6 TSSlot.java, 1.5, 1.6 ActClass.java, 1.5, 1.6 PQ.java, 1.5, 1.6 NewFacetInput.java, 1.4, 1.5 CompressionAlgorithm.java, 1.5, 1.6 Act.java, 1.5, 1.6 IntegrityCheckAlgorithm.java, 1.5, 1.6 CE.java, 1.5, 1.6 Application.java, 1.1, 1.2 ActRelationshipType.java, 1.5, 1.6 ContextControl.java, 1.5, 1.6 ST.java, 1.5, 1.6 ParticipationType.java, 1.5, 1.6 ActNull.java, 1.5, 1.6 NewFacet.java, 1.4, 1.5 RoleStatus.java, 1.5, 1.6 UpdateCode.java, 1.5, 1.6 EDSlot.java, 1.5, 1.6 II.java, 1.5, 1.6 URL.java, 1.5, 1.6 IVLTS.java, 1.5, 1.6 EntityDeterminer.java, 1.5, 1.6 RoleClass.java, 1.5, 1.6 BLSlot.java, 1.5, 1.6 ActStatusSlot.java, 1.5, 1.6 RelationshipConjunction.java, 1.5, 1.6 ObservationValueSlot.java, 1.5, 1.6 IVLINTSlot.java, 1.5, 1.6 RoleParticipation.java, 1.5, 1.6 SETIISlot.java, 1.5, 1.6 Trim.java, 1.5, 1.6 TelecommunicationAddressUse.java, 1.5, 1.6 AddressUse.java, 1.5, 1.6 ActRelationshipSplit.java, 1.5, 1.6

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/trim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18116/src/org/tolven/trim

Modified Files:
	NewFacetLabel.java RoleSlot.java Participation.java 
	BinaryDataEncoding.java EntityNamePartQualifier.java 
	EntityClass.java ActParticipation.java ED.java CV.java 
	EntityStatus.java RoleBind.java GTS.java 
	EntityNamePartType.java Observation.java ObjectFactory.java 
	ParticipationSubset.java CDSlot.java RoleInternal.java 
	IVLINT.java PostalAddressUse.java TsBoundary.java 
	NullFlavor.java ActMood.java IntegrityCheckType.java 
	EntityNameUse.java RoleReference.java CD.java 
	NewFacetValidate.java ActSlot.java ActReference.java 
	DataType.java ActRelationshipJoin.java ActInternal.java 
	RoleLinkType.java RealmCode.java SetOperator.java 
	ParticipationSignature.java GTSSlot.java ActBind.java 
	OutboundActRelationship.java NewFacetSet.java 
	IntegrityCheck.java CESlot.java AddressPartType.java BL.java 
	TELFieldType.java InboundActRelationship.java 
	ActRelationship.java ConcreteDatatype.java SETCESlot.java 
	RoleNull.java ActStatus.java ActRelationshipSubset.java 
	Slot.java ActRelationshipCheckpoint.java TimingEvent.java 
	CR.java STSlot.java package-info.java TemplateId.java 
	Role.java TSSlot.java ActClass.java PQ.java NewFacetInput.java 
	CompressionAlgorithm.java Act.java 
	IntegrityCheckAlgorithm.java CE.java Application.java 
	ActRelationshipType.java ContextControl.java ST.java 
	ParticipationType.java ActNull.java NewFacet.java 
	RoleStatus.java UpdateCode.java EDSlot.java II.java URL.java 
	IVLTS.java EntityDeterminer.java RoleClass.java BLSlot.java 
	ActStatusSlot.java RelationshipConjunction.java 
	ObservationValueSlot.java IVLINTSlot.java 
	RoleParticipation.java SETIISlot.java Trim.java 
	TelecommunicationAddressUse.java AddressUse.java 
	ActRelationshipSplit.java 
Added Files:
	CopyTo.java TolvenId.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: NewFacetSet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NewFacetSet.java	29 Mar 2007 01:00:45 -0000	1.2
--- NewFacetSet.java	7 Apr 2007 22:36:44 -0000	1.3
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: EntityStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityStatus.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityStatus.java	29 Mar 2007 01:00:40 -0000	1.5
--- EntityStatus.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: BLSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BLSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BLSlot.java	29 Mar 2007 01:00:47 -0000	1.5
--- BLSlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActMood.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActMood.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActMood.java	29 Mar 2007 01:00:41 -0000	1.5
--- ActMood.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: SetOperator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SetOperator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SetOperator.java	29 Mar 2007 01:00:45 -0000	1.5
--- SetOperator.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: EDSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EDSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EDSlot.java	29 Mar 2007 01:00:46 -0000	1.5
--- EDSlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: InboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/InboundActRelationship.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InboundActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
--- InboundActRelationship.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: RelationshipConjunction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RelationshipConjunction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RelationshipConjunction.java	29 Mar 2007 01:00:47 -0000	1.5
--- RelationshipConjunction.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: OutboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/OutboundActRelationship.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OutboundActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
--- OutboundActRelationship.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActBind.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActBind.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActBind.java	29 Mar 2007 01:00:45 -0000	1.5
--- ActBind.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: EntityDeterminer.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityDeterminer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityDeterminer.java	29 Mar 2007 01:00:47 -0000	1.5
--- EntityDeterminer.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: IVLINT.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLINT.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IVLINT.java	29 Mar 2007 01:00:41 -0000	1.5
--- IVLINT.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: RoleParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleParticipation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RoleParticipation.java	29 Mar 2007 01:00:47 -0000	1.5
--- RoleParticipation.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: DataType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/DataType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataType.java	29 Mar 2007 01:00:44 -0000	1.5
--- DataType.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: EntityNamePartQualifier.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityNamePartQualifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityNamePartQualifier.java	29 Mar 2007 01:00:40 -0000	1.5
--- EntityNamePartQualifier.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: GTSSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/GTSSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GTSSlot.java	29 Mar 2007 01:00:45 -0000	1.5
--- GTSSlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: BinaryDataEncoding.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BinaryDataEncoding.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BinaryDataEncoding.java	29 Mar 2007 01:00:40 -0000	1.5
--- BinaryDataEncoding.java	7 Apr 2007 22:36:42 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: AddressPartType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressPartType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AddressPartType.java	29 Mar 2007 01:00:45 -0000	1.5
--- AddressPartType.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActClass.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActClass.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActClass.java	29 Mar 2007 01:00:46 -0000	1.5
--- ActClass.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ConcreteDatatype.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ConcreteDatatype.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConcreteDatatype.java	29 Mar 2007 01:00:45 -0000	1.4
--- ConcreteDatatype.java	7 Apr 2007 22:36:44 -0000	1.5
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActRelationshipJoin.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipJoin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActRelationshipJoin.java	29 Mar 2007 01:00:44 -0000	1.5
--- ActRelationshipJoin.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: NewFacet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NewFacet.java	29 Mar 2007 01:00:46 -0000	1.4
--- NewFacet.java	7 Apr 2007 22:36:44 -0000	1.5
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: STSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/STSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** STSlot.java	29 Mar 2007 01:00:45 -0000	1.5
--- STSlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActRelationshipSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSubset.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActRelationshipSubset.java	29 Mar 2007 01:00:45 -0000	1.5
--- ActRelationshipSubset.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActSlot.java	29 Mar 2007 01:00:41 -0000	1.5
--- ActSlot.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatus.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActStatus.java	29 Mar 2007 01:00:45 -0000	1.5
--- ActStatus.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActNull.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActNull.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActNull.java	29 Mar 2007 01:00:46 -0000	1.5
--- ActNull.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActRelationshipType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActRelationshipType.java	29 Mar 2007 01:00:46 -0000	1.5
--- ActRelationshipType.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: NullFlavor.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NullFlavor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NullFlavor.java	29 Mar 2007 01:00:41 -0000	1.5
--- NullFlavor.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: TelecommunicationAddressUse.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TelecommunicationAddressUse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TelecommunicationAddressUse.java	29 Mar 2007 01:00:47 -0000	1.5
--- TelecommunicationAddressUse.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: RoleSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RoleSlot.java	29 Mar 2007 01:00:40 -0000	1.5
--- RoleSlot.java	7 Apr 2007 22:36:42 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ParticipationType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParticipationType.java	29 Mar 2007 01:00:46 -0000	1.5
--- ParticipationType.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: NewFacetInput.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetInput.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NewFacetInput.java	29 Mar 2007 01:00:46 -0000	1.4
--- NewFacetInput.java	7 Apr 2007 22:36:44 -0000	1.5
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: Observation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/Observation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Observation.java	29 Mar 2007 01:00:40 -0000	1.5
--- Observation.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: IntegrityCheckType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IntegrityCheckType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IntegrityCheckType.java	29 Mar 2007 01:00:41 -0000	1.5
--- IntegrityCheckType.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ParticipationSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationSubset.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParticipationSubset.java	29 Mar 2007 01:00:41 -0000	1.5
--- ParticipationSubset.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: CD.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CD.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CD.java	29 Mar 2007 01:00:41 -0000	1.5
--- CD.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActStatusSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatusSlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActStatusSlot.java	29 Mar 2007 01:00:47 -0000	1.5
--- ActStatusSlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActRelationshipCheckpoint.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipCheckpoint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActRelationshipCheckpoint.java	29 Mar 2007 01:00:45 -0000	1.5
--- ActRelationshipCheckpoint.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActParticipation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActParticipation.java	29 Mar 2007 01:00:40 -0000	1.5
--- ActParticipation.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: SETCESlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SETCESlot.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SETCESlot.java	29 Mar 2007 01:00:45 -0000	1.5
--- SETCESlot.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ObjectFactory.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ObjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectFactory.java	29 Mar 2007 01:00:40 -0000	1.5
--- ObjectFactory.java	7 Apr 2007 22:36:43 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  
***************
*** 38,150 ****
  
      /**
!      * Create an instance of {@link BL }
!      * 
!      */
!     public BL createBL() {
!         return new BL();
!     }
! 
!     /**
!      * Create an instance of {@link CR }
       * 
       */
!     public CR createCR() {
!         return new CR();
      }
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * Create an instance of {@link IVLTS }
       * 
       */
!     public IVLTS createIVLTS() {
!         return new IVLTS();
      }
  
      /**
!      * Create an instance of {@link CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD createCD() {
!         return new CD();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheck }
       * 
       */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
      }
  
      /**
!      * Create an instance of {@link TsBoundary }
       * 
       */
!     public TsBoundary createTsBoundary() {
!         return new TsBoundary();
      }
  
      /**
!      * Create an instance of {@link IVLINT }
       * 
       */
!     public IVLINT createIVLINT() {
!         return new IVLINT();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link CV }
       * 
       */
!     public CV createCV() {
!         return new CV();
      }
  
--- 38,142 ----
  
      /**
!      * Create an instance of {@link InboundActRelationship }
       * 
       */
!     public InboundActRelationship createInboundActRelationship() {
!         return new InboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link NewFacetLabel }
       * 
       */
!     public NewFacetLabel createNewFacetLabel() {
!         return new NewFacetLabel();
      }
  
      /**
!      * Create an instance of {@link PQ }
       * 
       */
!     public PQ createPQ() {
!         return new PQ();
      }
  
      /**
!      * Create an instance of {@link NewFacetValidate }
       * 
       */
!     public NewFacetValidate createNewFacetValidate() {
!         return new NewFacetValidate();
      }
  
      /**
!      * Create an instance of {@link ED }
       * 
       */
!     public ED createED() {
!         return new ED();
      }
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link Application }
       * 
       */
!     public Application createApplication() {
!         return new Application();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link RoleBind }
       * 
       */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
***************
*** 158,374 ****
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link RoleParticipation }
       * 
       */
!     public RoleParticipation createRoleParticipation() {
!         return new RoleParticipation();
      }
  
      /**
!      * Create an instance of {@link TemplateId }
       * 
       */
!     public TemplateId createTemplateId() {
!         return new TemplateId();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
      }
  
      /**
!      * Create an instance of {@link SETIISlot }
       * 
       */
!     public SETIISlot createSETIISlot() {
!         return new SETIISlot();
      }
  
      /**
!      * Create an instance of {@link NewFacetInput }
       * 
       */
!     public NewFacetInput createNewFacetInput() {
!         return new NewFacetInput();
      }
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link ActNull }
       * 
       */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link PQ }
       * 
       */
!     public PQ createPQ() {
!         return new PQ();
      }
  
      /**
!      * Create an instance of {@link ST }
       * 
       */
!     public ST createST() {
!         return new ST();
      }
  
      /**
!      * Create an instance of {@link CDSlot }
       * 
       */
!     public CDSlot createCDSlot() {
!         return new CDSlot();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link InboundActRelationship }
       * 
       */
!     public InboundActRelationship createInboundActRelationship() {
!         return new InboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheckType }
       * 
       */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
      }
  
      /**
!      * Create an instance of {@link NewFacetSet }
       * 
       */
!     public NewFacetSet createNewFacetSet() {
!         return new NewFacetSet();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
      }
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link ED }
       * 
       */
!     public ED createED() {
!         return new ED();
      }
  
      /**
!      * Create an instance of {@link NewFacetLabel }
       * 
       */
!     public NewFacetLabel createNewFacetLabel() {
!         return new NewFacetLabel();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link RoleBind }
       * 
       */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
--- 150,366 ----
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
      /**
!      * Create an instance of {@link TolvenId }
       * 
       */
!     public TolvenId createTolvenId() {
!         return new TolvenId();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link Act }
       * 
       */
!     public Act createAct() {
!         return new Act();
      }
  
      /**
!      * Create an instance of {@link ST }
       * 
       */
!     public ST createST() {
!         return new ST();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link TsBoundary }
       * 
       */
!     public TsBoundary createTsBoundary() {
!         return new TsBoundary();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD createCD() {
!         return new CD();
      }
  
      /**
!      * Create an instance of {@link TemplateId }
       * 
       */
!     public TemplateId createTemplateId() {
!         return new TemplateId();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link RoleParticipation }
       * 
       */
!     public RoleParticipation createRoleParticipation() {
!         return new RoleParticipation();
      }
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
      }
  
      /**
!      * 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 RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link BL }
       * 
       */
!     public BL createBL() {
!         return new BL();
      }
  
      /**
!      * Create an instance of {@link CV }
       * 
       */
!     public CV createCV() {
!         return new CV();
      }
  
      /**
!      * Create an instance of {@link CR }
       * 
       */
!     public CR createCR() {
!         return new CR();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link CopyTo }
       * 
       */
!     public CopyTo createCopyTo() {
!         return new CopyTo();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
      }
  
***************
*** 382,454 ****
  
      /**
!      * Create an instance of {@link RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
      /**
!      * Create an instance of {@link NewFacetValidate }
       * 
       */
!     public NewFacetValidate createNewFacetValidate() {
!         return new NewFacetValidate();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link RoleInternal }
       * 
       */
!     public RoleInternal createRoleInternal() {
!         return new RoleInternal();
      }
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link Act }
       * 
       */
!     public Act createAct() {
!         return new Act();
      }
  
      /**
!      * Create an instance of {@link Application }
       * 
       */
!     public Application createApplication() {
!         return new Application();
      }
  
--- 374,470 ----
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link NewFacetInput }
       * 
       */
!     public NewFacetInput createNewFacetInput() {
!         return new NewFacetInput();
      }
  
      /**
!      * Create an instance of {@link NewFacetSet }
       * 
       */
!     public NewFacetSet createNewFacetSet() {
!         return new NewFacetSet();
      }
  
      /**
!      * Create an instance of {@link SETIISlot }
       * 
       */
!     public SETIISlot createSETIISlot() {
!         return new SETIISlot();
      }
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * 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 CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
!     }
! 
!     /**
!      * Create an instance of {@link IntegrityCheckType }
!      * 
!      */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
!     }
! 
!     /**
!      * Create an instance of {@link IntegrityCheck }
!      * 
!      */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
!     }
! 
!     /**
!      * Create an instance of {@link ActNull }
!      * 
!      */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  

Index: NewFacetValidate.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetValidate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NewFacetValidate.java	29 Mar 2007 01:00:41 -0000	1.4
--- NewFacetValidate.java	7 Apr 2007 22:36:43 -0000	1.5
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: CompressionAlgorithm.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CompressionAlgorithm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompressionAlgorithm.java	29 Mar 2007 01:00:46 -0000	1.5
--- CompressionAlgorithm.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: PQ.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/PQ.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PQ.java	29 Mar 2007 01:00:46 -0000	1.5
--- PQ.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

Index: ActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationship.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
--- ActRelationship.java	7 Apr 2007 22:36:44 -0000	1.6
***************
*** 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.03.28 at 05:41:27 PM PDT 
  //
  
--- 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.04.04 at 03:49:08 PM PDT 
  //
  

--- NEW FILE: CopyTo.java ---
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs 
// 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.04.04 at 03:49:08 PM PDT 
//


package org.tolven.trim;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;


/**
 * <p>Java class for CopyTo complex type.
 * 
 * <p>The following schema fragment specifies the expected content contained within this class.
 * 
 * <pre>
 * &lt;complexType name="CopyTo">
 *   &lt;complexContent>
 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
 *       &lt;sequence>
 *         &lt;element name="comment" type="{http://www.w3.org/2001/XMLSchema}string"/>
 *       &lt;/sequence>
 *       &lt;attribute name="accountId" type="{http://www.w3.org/2001/XMLSchema}long" />
 *       &lt;attribute name="accountName" type="{http://www.w3.org/2001/XMLSchema}string" />
 *       &lt;attribute name="copy" type="{http://www.w3.org/2001/XMLSchema}boolean" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
 * </pre>
 * 
 * 
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CopyTo", propOrder = {
    "comment"
})
public class CopyTo {

    @XmlElement(required = true)
    protected String comment;
    @XmlAttribute
    protected Long accountId;
    @XmlAttribute
    protected String accountName;
    @XmlAttribute
    protected Boolean copy;

    /**
     * Gets the value of the comment property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getComment() {
        return comment;
    }

    /**
     * Sets the value of the comment property.
     * 
     * @param value
  ...
 
[truncated message content]

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/bean EvaluateCCR.java, 1.2, 1.3 EvaluateCCRPersonal.java, 1.5, 1.6 EvaluateCCRClinical.java, 1.4, 1.5 TolvenMessage.java, 1.3, 1.4 Evaluator.java, 1.13, 1.14

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18116/src/org/tolven/doc/bean

Modified Files:
	EvaluateCCR.java EvaluateCCRPersonal.java 
	EvaluateCCRClinical.java TolvenMessage.java Evaluator.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: Evaluator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Evaluator.java	27 Mar 2007 23:23:58 -0000	1.13
--- Evaluator.java	7 Apr 2007 22:36:45 -0000	1.14
***************
*** 14,21 ****
  package org.tolven.doc.bean;
  
- import java.io.File;
- import java.io.IOException;
- import java.text.ParseException;
- 
  import javax.annotation.EJB;
  import javax.annotation.Resource;
--- 14,17 ----
***************
*** 23,30 ****
  import javax.ejb.MessageDriven;
  import javax.ejb.MessageDrivenContext;
  import javax.jms.Message;
  import javax.jms.MessageListener;
  import javax.jms.ObjectMessage;
! import javax.xml.bind.JAXBException;
  
  import org.drools.RuleBase;
--- 19,27 ----
  import javax.ejb.MessageDriven;
  import javax.ejb.MessageDrivenContext;
+ import javax.jms.ConnectionFactory;
  import javax.jms.Message;
  import javax.jms.MessageListener;
  import javax.jms.ObjectMessage;
! import javax.jms.Queue;
  
  import org.drools.RuleBase;
***************
*** 32,57 ****
  import org.tolven.app.MenuLocal;
  import org.tolven.app.bean.AppEvalAdaptor;
  import org.tolven.app.entity.MenuData;
- import org.tolven.app.entity.MenuStructure;
- import org.tolven.ccr.ActorType;
- import org.tolven.ccr.ContinuityOfCareRecord;
- import org.tolven.ccr.DateTimeType;
- import org.tolven.ccr.EncounterType;
- import org.tolven.ccr.PersonNameType;
- import org.tolven.ccr.ProblemType;
- import org.tolven.ccr.ResultType;
- import org.tolven.ccr.TestType;
  import org.tolven.core.AccountDAOLocal;
  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;
  import org.tolven.doc.entity.DocXML;
  import org.tolven.security.DocProtectionLocal;
  import org.tolven.trim.Act;
! import org.tolven.trim.ActInternal;
! import org.tolven.trim.ActNull;
! import org.tolven.trim.ActSlot;
  import org.tolven.trim.Trim;
  /**
--- 29,45 ----
  import org.tolven.app.MenuLocal;
  import org.tolven.app.bean.AppEvalAdaptor;
+ import org.tolven.app.bean.MenuPath;
  import org.tolven.app.entity.MenuData;
  import org.tolven.core.AccountDAOLocal;
  import org.tolven.core.entity.Account;
+ import org.tolven.core.util.Queuer;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
  import org.tolven.doc.entity.DocXML;
  import org.tolven.security.DocProtectionLocal;
  import org.tolven.trim.Act;
! import org.tolven.trim.ActParticipation;
! import org.tolven.trim.CopyTo;
! import org.tolven.trim.RoleInternal;
  import org.tolven.trim.Trim;
  /**
***************
*** 63,68 ****
  @MessageDriven(activationConfig =
  {
! // We essentially single-thread this queue so we don't clobber user performance.
!   @ActivationConfigProperty(propertyName="maxPoolSize", propertyValue="1"),
    @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
    @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rule")
--- 51,56 ----
  @MessageDriven(activationConfig =
  {
! // Keep thread-count small so we don't clobber user performance.
!   @ActivationConfigProperty(propertyName="maxPoolSize", propertyValue="2"),
    @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
    @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rule")
***************
*** 76,79 ****
--- 64,73 ----
      @EJB private DocProtectionLocal docProtectionBean;
  
+     @Resource(mappedName="java:/JmsXA")
+     private ConnectionFactory connectionFactory;
+ 
+     @Resource(mappedName="queue/rule")
+     private  Queue ruleQueue; 
+ 
      @Resource MessageDrivenContext ctx;
  
***************
*** 110,114 ****
--- 104,151 ----
  		}
  	}
+ 
+ 	public void rebindInternalIds( TolvenMessage tm, Act act ) {
+ 		for (ActParticipation part : act.getParticipations()) {
+ 			if (part.getRole() instanceof RoleInternal) {
+ 				RoleInternal ri = (RoleInternal) part.getRole();
+ 				MenuPath path = new MenuPath( ri.getInternalId());
+ 				// ******* Short cut as proof of concept
+ 				long fromPatientId = path.getNodeValues().get("patient");
+ 				MenuData mdOurPatient = menuLocal.findPatientMatch( tm.getFromAccountId(), fromPatientId, tm.getAccountId() );
+ 				if (mdOurPatient!=null) {
+ 					ri.setInternalId(mdOurPatient.getPath());
+ 				}
+ 			}
+ 		}
+ 		
+ 	}
+ 
+ 	public void rebindInternalIds(TolvenMessage tm, Trim trim) {
+ 		if (trim.getAct() instanceof Act) {
+ 			rebindInternalIds( tm, (Act) trim.getAct());
+ 		}
+ 	}
  	
+ 	public void sendCopies( Trim trim, TolvenMessage tmSource ) throws Exception {
+ 		Queuer q = new Queuer();
+ 		q.init(connectionFactory, ruleQueue);
+ 		for (CopyTo copyTo : trim.getCopyTos()) {
+ 			// TODO: If you get a compile error on getCopy(), don't change the method name, rather, add a getCopy() to CopyTo
+ 			// otherwise, Faces EL will break (it doesn't understand isXXX bean rules.
+ 			if ( copyTo.getCopy()) {
+ 				// Send the document to the other account for persistence and rule processing
+ 				TolvenMessage tm = new TolvenMessage();
+ 				tm.setFromAccountId(tmSource.getFromAccountId());
+ 				tm.setAccountId(copyTo.getAccountId());
+ 				tm.setAuthorId(tmSource.getAuthorId());
+ 				tm.setPayload( tmSource.getPayload() );
+ 				tm.setXmlName( tmSource.getXmlName());
+ 				tm.setXmlNS( tmSource.getXmlNS());
+ 				q.send( tm );
+ 			}
+ 		}
+ 		q.close();
+ 	}
+ 
  	public void processTRIM( TolvenMessage tm ) throws Exception {
  		System.out.println( "Processing TRIM document for account: " + tm.getAccountId());
***************
*** 133,136 ****
--- 170,181 ----
  		String accountType = docXML.getAccount().getAccountType().getKnownType();
  		Trim trim = (Trim) xmlBean.unmarshal(tm.getXmlNS(), tm.getPayloadInputStream());
+ 		// Need to modify internal ids in the document to match our account rather than the sender's.
+ 		// **** Need to persist the modified internal ids - I think.
+ 		if (tm.getAccountId()!=tm.getFromAccountId()) {
+ 			rebindInternalIds(tm, trim);
+ 		} else {
+ 			sendCopies( trim, tm );
+ 		}
+ 		
  		RuleBase ruleBase = ruleBaseFactory.open( "rules/" + accountType + ".drl");
         	//load up the rulebase
***************
*** 138,141 ****
--- 183,187 ----
          AppEvalAdaptor app = new AppEvalAdaptor( docXML.getAccount());
          app.setDocument( docXML);
+         app.setSourceAccount(accountDAOLocal.findAccount(tm.getFromAccountId()));
          app.init(menuLocal, workingMemory);
          

Index: EvaluateCCRClinical.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRClinical.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EvaluateCCRClinical.java	27 Mar 2007 23:23:58 -0000	1.4
--- EvaluateCCRClinical.java	7 Apr 2007 22:36:45 -0000	1.5
***************
*** 89,93 ****
--- 89,95 ----
  		menuLocal.persistMenuData(mdAllPatients);
  
+ 		processAllergies( mdPatient, documentId, ccr);
  		processProblems( mdPatient, documentId, ccr);
+ 		processMedications( mdPatient, documentId, ccr);
  		processResults( mdPatient, documentId, ccr);
  		processAppointments( mdPatient, documentId, ccr);
***************
*** 167,257 ****
  	}
  
- 	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");
- 		MenuStructure msResultsSumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:resultsum");
- 		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);
- 
- 			// Create the summary result
- 			MenuData mdSummResult = new MenuData();
- 			mdSummResult.setMenuStructure( msResultsSumm );
- 			mdSummResult.setDocumentId(documentId);
- 			mdSummResult.setAccount(mdPatient.getAccount());
- 			mdSummResult.setParent01(mdPatient);
- 			mdSummResult.setString01(result.getDescriptionText());
- 			mdSummResult.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue());
- 			mdSummResult.setString02(result.getStatusText());
- 			mdSummResult.setReference(mdResult);
- 			menuLocal.persistMenuData(mdSummResult);
- 			// 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 {
--- 169,172 ----

Index: EvaluateCCRPersonal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRPersonal.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EvaluateCCRPersonal.java	27 Mar 2007 23:23:57 -0000	1.5
--- EvaluateCCRPersonal.java	7 Apr 2007 22:36:45 -0000	1.6
***************
*** 153,340 ****
  		}
  	}
- 	/**
- 	 * 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");
- 		MenuStructure msResultsSumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:resultsum");
- 		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);
- 			// Create the summary result
- 			MenuData mdSummResult = new MenuData();
- 			mdSummResult.setMenuStructure( msResultsSumm );
- 			mdSummResult.setDocumentId(documentId);
- 			mdSummResult.setAccount(mdPatient.getAccount());
- 			mdSummResult.setParent01(mdPatient);
- 			mdSummResult.setString01(result.getDescriptionText());
- 			mdSummResult.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue());
- 			mdSummResult.setString02(result.getStatusText());
- 			mdSummResult.setReference(mdResult);
- 			menuLocal.persistMenuData(mdSummResult);
- 
- 			// 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 {
--- 153,156 ----

Index: EvaluateCCR.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EvaluateCCR.java	20 Mar 2007 09:13:07 -0000	1.2
--- EvaluateCCR.java	7 Apr 2007 22:36:45 -0000	1.3
***************
*** 1,7 ****
--- 1,20 ----
  package org.tolven.doc.bean;
  
+ import java.io.IOException;
+ import java.text.ParseException;
+ 
+ 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.AlertType;
+ import org.tolven.ccr.ContinuityOfCareRecord;
+ import org.tolven.ccr.ResultType;
+ import org.tolven.ccr.StructuredProductType;
+ import org.tolven.ccr.TestType;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
+ import org.tolven.doc.entity.CCRException;
  import org.tolven.security.DocProtectionLocal;
  
***************
*** 21,23 ****
--- 34,221 ----
      public abstract void process( TolvenMessage tm ) throws Exception;
      
+ 	/**
+ 	 * 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");
+ 		MenuStructure msResultsSumm = menuLocal.findDescendentMenuStructure(mdPatient.getAccount().getId(), mdPatient.getMenuStructure(), "summary:resultsum");
+ 		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);
+ 
+ 			// Create the summary result
+ 			MenuData mdSummResult = new MenuData();
+ 			mdSummResult.setMenuStructure( msResultsSumm );
+ 			mdSummResult.setDocumentId(documentId);
+ 			mdSummResult.setAccount(mdPatient.getAccount());
+ 			mdSummResult.setParent01(mdPatient);
+ 			mdSummResult.setString01(result.getDescriptionText());
+ 			mdSummResult.setDate01(result.getDateTimeType(ResultType.COLLECTION_DATE).getDateValue());
+ 			mdSummResult.setString02(result.getStatusText());
+ 			mdSummResult.setReference(mdResult);
+ 			menuLocal.persistMenuData(mdSummResult);
+ 			// 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);
+ 			}
+ 		}
+ 	}
+ 	
  }

Index: TolvenMessage.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/TolvenMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TolvenMessage.java	7 Feb 2007 01:37:50 -0000	1.3
--- TolvenMessage.java	7 Apr 2007 22:36:45 -0000	1.4
***************
*** 14,17 ****
--- 14,18 ----
  	private String xmlName;
  	private long accountId;
+ 	private long fromAccountId;
  	private String sender;
  	private String recipient;
***************
*** 87,90 ****
--- 88,97 ----
  		this.documentId = documentId;
  	}
+ 	public long getFromAccountId() {
+ 		return fromAccountId;
+ 	}
+ 	public void setFromAccountId(long fromAccountId) {
+ 		this.fromAccountId = fromAccountId;
+ 	}
  	
  }

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/bean CreatorBean.java, 1.8, 1.9 QueryControl.java, 1.3, 1.4 MenuBean.java, 1.53, 1.54 TrimBean.java, 1.3, 1.4 AppEvalAdaptor.java, 1.6, 1.7

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18116/src/org/tolven/app/bean

Modified Files:
	CreatorBean.java QueryControl.java MenuBean.java TrimBean.java 
	AppEvalAdaptor.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: MenuBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** MenuBean.java	29 Mar 2007 01:00:47 -0000	1.53
--- MenuBean.java	7 Apr 2007 22:36:45 -0000	1.54
***************
*** 152,155 ****
--- 152,174 ----
  	}
  
+ 	public MenuData findPatientMatch( long fromAccountId, long fromPatientId, long accountId ) {
+ 		Query query = em.createQuery("SELECT md2 FROM MenuData md1, MenuData md2, MenuStructure ms WHERE " +
+ 				"ms.account.id = :accountId AND " + 
+ 				"ms.path = 'echr:patient' AND " +
+ 				"md2.menuStructure = ms AND " +
+ 				"md1.id = :patient AND " +
+ 				"md1.string01 = md2.string01 AND " +
+ 				"md1.string02 = md2.string02 AND " +
+ 				"md1.string03 = md2.string03 AND " +
+ 				"md1.string04 = md2.string04 AND " +
+ 				"md1.date01 = md2.date01");
+ 		query.setParameter("patient", fromPatientId);
+ 		query.setParameter("accountId", accountId);
+ 		List<MenuData> rslt = query.getResultList();
+ 		if (rslt.size()==1) {
+ 			return rslt.get(0);
+ 		}
+ 		return null;
+ 	}
  
  	/**
***************
*** 648,651 ****
--- 667,672 ----
  						account, summary,    "obsSummary.xhtml",   null,        7, "obssum",  "Observations",  "true", root.getPath() + ":patient:doc:obs:values", "portlet" );
  				em.persist( obsSummary );
+ 				em.persist( new MSColumn( obsSummary, 1, "Date", "date01", "yyyy") );
+ 				em.persist( new MSColumn( obsSummary, 2, "Observation", "string01", null) );
  		
  				MenuStructure reminderSummary = new MenuStructure(
***************
*** 755,759 ****
  				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" );
--- 776,780 ----
  				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" );
***************
*** 844,848 ****
  	
  			MenuStructure providers = new MenuStructure(
! 					account, pers,    "providers.xhtml",   null,        3, "providers",  "Providers",  "true", null, "list" );
  			em.persist( providers );
  	
--- 865,869 ----
  	
  			MenuStructure providers = new MenuStructure(
! 					account, pers,    "providers.xhtml",   null,        3, "providers",  "Providers",  "true", root.getPath() + ":patient", "list" );
  			em.persist( providers );
  	
***************
*** 889,902 ****
  			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 );
  
--- 910,936 ----
  			em.persist( hmaint );
  	
! 			MenuStructure graphs = new MenuStructure(
! 					account, patient,  "bar2.xhtml",    null,      9, "graphs",    "Graph",    "true", null, "tab" );
! 			em.persist( graphs );
  
! 			MenuStructure graphList = new MenuStructure(
! 					account, graphs,  "graphList.xhtml",    null,      1, "values",    "List",    "true", root.getPath() +":patient:graph", "list" );
! 			em.persist( graphList );
! 				em.persist( new MSColumn( graphList, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") );
! 				em.persist( new MSColumn( graphList, 2, "Graph", "reference", "string01") );
! 				em.persist( new MSColumn( graphList, 3, "Source", "string02",  null) );
! 
! 			MenuStructure graphMenu = new MenuStructure(
! 					account, root,  null,    null,      0, "graphMenu",    null,    "false", null, "list" );
! 			em.persist( graphMenu );
! 				em.persist( new MSColumn( graphMenu, 1, "Graph", "instantiate", "string01") );
! 			
! 			MenuStructure graphMenuList = new MenuStructure(
! 						account, graphs,  "graphMenu.xhtml",    null,      2, "menu",    "Menu",    "true", null, "list" );
! 				graphMenuList.setReferenced(graphMenu);
! 				em.persist( graphMenuList );
  	
  				MenuStructure graphAdHoc = new MenuStructure(
! 						account, graphs,  "graphAdHoc.xhtml",    null,      3, "adhoc",    "Ad Hoc",    "true", null, "list" );
  				em.persist( graphAdHoc );
  
***************
*** 922,925 ****
--- 956,963 ----
  		em.persist( observation );
  
+ 		MenuStructure graph = new MenuStructure(
+ 				account, patient,     "../wizard/graph.xhtml",   "obsLink.xhtml", -1, "graph",    "Graph",    "false", "graph", "placeholder" );
+ 		em.persist( graph );
+ 
  		MenuStructure problem = new MenuStructure(
  				account, patient,     "problem.xhtml",   "probLink.xhtml", -1, "problem",    "Problem",    "false", "problem", "placeholder" );

Index: CreatorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CreatorBean.java	29 Mar 2007 01:00:47 -0000	1.8
--- CreatorBean.java	7 Apr 2007 22:36:45 -0000	1.9
***************
*** 25,28 ****
--- 25,29 ----
  import org.tolven.ccr.ContinuityOfCareRecord;
  import org.tolven.core.ActivationLocal;
+ import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
***************
*** 87,91 ****
  	public void scanTrim( MenuStructure ms, Trim trim, List<MenuPath> context ) {
  		ActSlot actSlot = trim.getAct();
! 		if (actSlot instanceof Act ) {
  			scanAct( ms, (Act) actSlot, context );
  		}
--- 88,92 ----
  	public void scanTrim( MenuStructure ms, Trim trim, List<MenuPath> context ) {
  		ActSlot actSlot = trim.getAct();
! 		if (actSlot !=null && actSlot instanceof Act ) {
  			scanAct( ms, (Act) actSlot, context );
  		}
***************
*** 298,303 ****
  		md.setDate01(now);
  		ActSlot actSlot = trim.getAct();
! 		if (actSlot instanceof Act) {
  			md.setString01(((Act)actSlot).getTitle().getST().getValue());
  		}
  		md.setStatus( Status.NEW );
--- 299,306 ----
  		md.setDate01(now);
  		ActSlot actSlot = trim.getAct();
! 		if (actSlot != null && actSlot instanceof Act) {
  			md.setString01(((Act)actSlot).getTitle().getST().getValue());
+ 		} else {
+ 			md.setString01( "No Title");
  		}
  		md.setStatus( Status.NEW );
***************
*** 345,349 ****
  	*/
  	public void submit( DocXML docXML, byte[] payload ) throws Exception {
! 		System.out.println( "Submitting document: " + docXML.getId());
  //		System.out.println( "Try to unmarshal " + docXML.getId());
  //		Trim trim = (Trim) xmlProtectedBean.unmarshal(docXML);
--- 348,352 ----
  	*/
  	public void submit( DocXML docXML, byte[] payload ) throws Exception {
! 		System.out.println( "Submitting document: " + docXML.getId() + " from Principal: " + ejbContext.getCallerPrincipal());
  //		System.out.println( "Try to unmarshal " + docXML.getId());
  //		Trim trim = (Trim) xmlProtectedBean.unmarshal(docXML);
***************
*** 353,356 ****
--- 356,360 ----
  		TolvenMessage tm = new TolvenMessage();
  		tm.setAccountId(docXML.getAccount().getId());
+ 		tm.setFromAccountId(docXML.getAccount().getId());
  		tm.setAuthorId(docXML.getAuthor().getId());
  		tm.setDocumentId(docXML.getId() );
***************
*** 362,365 ****
--- 366,370 ----
  //		System.out.println( "Payload: " + new String(tm.getPayload()));
  		q.send( tm );
+ 		q.close();
  		System.out.println( "Document sent: " + docXML.getId());
  	}
***************
*** 368,374 ****
  		Queuer q = new Queuer();
  		q.init(connectionFactory, ruleQueue);
! 		// Send the resulting document to toven for persistence and rule processing
  		TolvenMessage tm = new TolvenMessage();
  		tm.setAccountId(accountId);
  		tm.setAuthorId(userId);
  		tm.setXmlName("ContinuityOfCareRecord");
--- 373,380 ----
  		Queuer q = new Queuer();
  		q.init(connectionFactory, ruleQueue);
! 		// Send the resulting document to tolven for persistence and rule processing
  		TolvenMessage tm = new TolvenMessage();
  		tm.setAccountId(accountId);
+ 		tm.setFromAccountId(tm.getAccountId());
  		tm.setAuthorId(userId);
  		tm.setXmlName("ContinuityOfCareRecord");
***************
*** 378,383 ****
  		tm.setPayload(output.toByteArray());
  		q.send( tm );
  		
  	}
! 
  }
--- 384,421 ----
  		tm.setPayload(output.toByteArray());
  		q.send( tm );
+ 		q.close();
+ 	}
+ 	
+ 	/**
+ 	 * Verify and cross reference a CCR document exchange. For each id we are about to send, store
+ 	 * a cross-reference entry in our "send" account exchange record, no duplicates.
+ 	 * 
+ 	 */
+ 	public void verifyCCR( ) {
  		
  	}
! 	
! 	/**
! 	 * Send a copy of an existing document to another account
! 	 * @throws Exception 
! 	 */
! 	public void sendCopyTo( AccountUser accountUser, long documentId, long otherAccountId ) throws Exception {
! 		DocXML docXML = (DocXML) documentBean.findDocument(documentId);
! 		byte[] payload = docProtectionBean.getDecryptedContent(docXML);
! 		Queuer q = new Queuer();
! 		q.init(connectionFactory, ruleQueue);
! 		// Send the document to the other account for persistence and rule processing
! 		TolvenMessage tm = new TolvenMessage();
! 		tm.setFromAccountId(accountUser.getAccount().getId());
! 		tm.setAccountId(otherAccountId);
! 		tm.setAuthorId(accountUser.getUser().getId());
! 		tm.setPayload( payload );
! 		tm.setXmlName( docXML.getXmlName());
! 		tm.setXmlNS( docXML.getXmlNS());
! //		ByteArrayOutputStream output = new ByteArrayOutputStream( );
! //		xmlBean.marshalCCR( ccr, output );
! //		tm.setPayload(output.toByteArray());
! 		q.send( tm );
! 		q.close();
! 	}
  }

Index: TrimBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/TrimBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrimBean.java	29 Mar 2007 01:00:47 -0000	1.3
--- TrimBean.java	7 Apr 2007 22:36:45 -0000	1.4
***************
*** 166,169 ****
--- 166,171 ----
  		loadTRIM( "temperature", "trim/temperature.trim");
  		loadTRIM( "weight", "trim/weight.trim");
+ 		loadTRIM( "lipids", "trim/lipids.trim");
+ 		loadTRIM( "diabetes", "trim/diabetes.trim");
  
  //		System.out.println( "URL=" + url.getFile());

Index: QueryControl.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/QueryControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QueryControl.java	21 Aug 2006 00:26:30 -0000	1.3
--- QueryControl.java	7 Apr 2007 22:36:45 -0000	1.4
***************
*** 58,64 ****
--- 58,66 ----
  		return now;
  	}
+ 
  	public void setNow(Date now) {
  		this.now = now;
  	}
+ 
  	/**
  	 * The offset into the result set to start returning results. An offset of zero causes the query to start at the begining. 

Index: AppEvalAdaptor.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/AppEvalAdaptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AppEvalAdaptor.java	12 Mar 2007 08:47:12 -0000	1.6
--- AppEvalAdaptor.java	7 Apr 2007 22:36:45 -0000	1.7
***************
*** 35,38 ****
--- 35,39 ----
  	private String rootName;
  	private DocBase document;
+ 	private Account sourceAccount;
  	
  	/**
***************
*** 299,301 ****
--- 300,311 ----
  		this.document = document;
  	}
+ 
+ 	public Account getSourceAccount() {
+ 		return sourceAccount;
+ 	}
+ 
+ 	public void setSourceAccount(Account sourceAccount) {
+ 		this.sourceAccount = sourceAccount;
+ 	}
+ 
  }

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app MenuLocal.java, 1.19, 1.20 CreatorLocal.java, 1.4, 1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18116/src/org/tolven/app

Modified Files:
	MenuLocal.java CreatorLocal.java 
Log Message:
Data entry including sharing with other accounts. 

Also include graph wizard, very rough.

Index: CreatorLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/CreatorLocal.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CreatorLocal.java	28 Feb 2007 06:58:18 -0000	1.4
--- CreatorLocal.java	7 Apr 2007 22:36:45 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  import org.tolven.app.entity.MenuStructure;
  import org.tolven.ccr.ContinuityOfCareRecord;
+ import org.tolven.core.entity.AccountUser;
  import org.tolven.doc.entity.DocXML;
  import org.tolven.trim.util.TRIMException;
***************
*** 45,47 ****
--- 46,54 ----
  	public void submit( long accountId, long userId, ContinuityOfCareRecord ccr ) throws Exception;
  
+ 	/**
+ 	 * Send a copy of an existing document to another account
+ 	 * @throws Exception 
+ 	 */
+ 	public void sendCopyTo( AccountUser accountUser, long documentId, long otherAccountId ) throws Exception;
+ 
  }

Index: MenuLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/MenuLocal.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MenuLocal.java	8 Mar 2007 17:13:19 -0000	1.19
--- MenuLocal.java	7 Apr 2007 22:36:45 -0000	1.20
***************
*** 204,207 ****
--- 204,217 ----
  	 */
  	public MenuStructure getRootMenuStructure( Account account );
+ 	
+ 	/**
+ 	 * Proof of concept EMPI. Temporary.
+ 	 * @param fromAccountId
+ 	 * @param fromPatientId
+ 	 * @param accountId
+ 	 * @return
+ 	 */
+ 	public MenuData findPatientMatch( long fromAccountId, long fromPatientId, long accountId );
+ 	
  
  }