Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2006-10-21 00:14:33
|
Update of /cvsroot/tolven/tolven/conf In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13137/conf Removed Files: persistence.xml Log Message: Not used. See tolvenEJB/conf/persistence.xml --- persistence.xml DELETED --- |
|
From: John C. <jc...@us...> - 2006-10-21 00:13:06
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12579/installer/izpack-8.1 Modified Files: tolven-install.xml shortcutSpec.xml Log Message: fix dos2unix and java_home problem in installer. Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tolven-install.xml 16 Oct 2006 08:56:11 -0000 1.14 --- tolven-install.xml 21 Oct 2006 00:13:04 -0000 1.15 *************** *** 246,257 **** targetdir="$INSTALL_PATH/bin" os="unix" /> <parsable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.sh" ! os="unix" /> <file src="bin/deployTolvenEAR.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> <parsable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.bat" ! os="windows" /> ! <executable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.sh" os="unix" /> <executable --- 246,257 ---- targetdir="$INSTALL_PATH/bin" os="unix" /> <parsable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.sh" ! type="shell" os="unix" /> <file src="bin/deployTolvenEAR.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> <parsable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.bat" ! type="shell" os="windows" /> ! <executable targetfile="$INSTALL_PATH/bin/deployTolvenEAR.sh" os="unix" /> <executable Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/shortcutSpec.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shortcutSpec.xml 9 Oct 2006 20:31:02 -0000 1.6 --- shortcutSpec.xml 21 Oct 2006 00:13:04 -0000 1.7 *************** *** 23,27 **** target="$INSTALL_PATH\bin\startTolvenJBoss.bat" workingDirectory="$INSTALL_PATH" ! description="Start Tolven JBoss" programGroup="yes" desktop="no" applications="no" startMenu="no" startup="no"> --- 23,27 ---- target="$INSTALL_PATH\bin\startTolvenJBoss.bat" workingDirectory="$INSTALL_PATH" ! description="Run Tolven JBoss" programGroup="yes" desktop="no" applications="no" startMenu="no" startup="no"> |
|
From: John C. <jc...@us...> - 2006-10-21 00:13:06
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12579/installer/izpack-8.1/bin Modified Files: deployTolvenEAR.bat deployTolvenEAR.sh Log Message: fix dos2unix and java_home problem in installer. Index: deployTolvenEAR.sh =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/bin/deployTolvenEAR.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** deployTolvenEAR.sh 2 Oct 2006 06:49:03 -0000 1.2 --- deployTolvenEAR.sh 21 Oct 2006 00:13:04 -0000 1.3 *************** *** 1,3 **** #!/bin/bash ! $INSTALL_PATH/apache-ant-1.6.5/bin/ant -Dbasedir=$INSTALL_PATH/tolven -buildfile $INSTALL_PATH/tolven/build.xml deploy \ No newline at end of file --- 1,6 ---- #!/bin/bash ! JAVA_HOME=%{JDKPath} ! cd %{INSTALL_PATH}/tolven ! ! %{INSTALL_PATH}/apache-ant-1.6.5/bin/ant deploy \ No newline at end of file Index: deployTolvenEAR.bat =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/bin/deployTolvenEAR.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** deployTolvenEAR.bat 2 Oct 2006 06:49:03 -0000 1.3 --- deployTolvenEAR.bat 21 Oct 2006 00:13:04 -0000 1.4 *************** *** 1 **** ! $INSTALL_PATH\apache-ant-1.6.5\bin\ant -Dbasedir=$INSTALL_PATH\tolven -buildfile $INSTALL_PATH\tolven\build.xml deploy \ No newline at end of file --- 1,5 ---- ! set JAVA_HOME=%{JDKPath} ! ! cd %{INSTALL_PATH}\tolven ! ! %{INSTALL_PATH}\apache-ant-1.6.5\bin\ant deploy |
|
From: John C. <jc...@us...> - 2006-10-21 00:12:27
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12284 Modified Files: build.xml Log Message: Copy tolven.properties to its resting place in jboss (it is no longer included in tolven.ear) Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** build.xml 15 Oct 2006 22:39:29 -0000 1.66 --- build.xml 21 Oct 2006 00:12:23 -0000 1.67 *************** *** 90,93 **** --- 90,98 ---- </fileset> </copy> + <copy toDir="${deploy.location}/conf/props" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> + <fileset dir="${tolven.location}/resources"> + <include name="tolven.properties" /> + </fileset> + </copy> <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/deploy"> *************** *** 166,170 **** </zipfileset> <zipfileset dir="conf" prefix="META-INF"/> - <zipfileset dir="resources"/> </jar> </target> --- 171,174 ---- |
|
From: Joseph I. <jos...@us...> - 2006-10-20 05:54:25
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11248/installer/izpack-8.1/bin Modified Files: startAntelope.sh Log Message: Updated with JAVA_HOME to match the windows version Index: startAntelope.sh =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/bin/startAntelope.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** startAntelope.sh 2 Oct 2006 06:49:03 -0000 1.2 --- startAntelope.sh 20 Oct 2006 05:53:50 -0000 1.3 *************** *** 2,4 **** --- 2,5 ---- ANT_HOME=$INSTALL_PATH/apache-ant-1.6.5 + JAVA_HOME=$JDKPath java -jar $INSTALL_PATH/tolven/lib/antelope/AntelopeApp_3.2.18/AntelopeApp.jar \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-10-20 04:58:24
|
Update of /cvsroot/tolven/tolven/ldap-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17843/ldap-config Modified Files: slapd_linux.conf slapd.conf Log Message: Currently TLSVerifyClient does not work with client JXplorer but works fine with JBoss. If not using an LDAP client browser, then uncommenting the TLSVerifyClient ensures that only JBoss is allowed to connect to the LDAP server. Index: slapd.conf =================================================================== RCS file: /cvsroot/tolven/tolven/ldap-config/slapd.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** slapd.conf 21 Aug 2006 00:18:09 -0000 1.4 --- slapd.conf 20 Oct 2006 04:58:22 -0000 1.5 *************** *** 40,42 **** # Specifies the file that contains the private key that matches the certificate stored in the TLSCertificateFile file ! TLSCertificateKeyFile ./tolvendev-ldap-key.pem \ No newline at end of file --- 40,47 ---- # Specifies the file that contains the private key that matches the certificate stored in the TLSCertificateFile file ! TLSCertificateKeyFile ./tolvendev-ldap-key.pem ! ! # Specifies the file that contains the private key that matches the certificate stored in the TLSCertificateFile file ! # Currently TLSVerifyClient does not work with client JXplorer, but works fine with JBoss. If not using an LDAP client ! # browser, then uncommenting the TLSVerifyClient ensures that only JBoss is allowed to connect to the LDAP server. ! # TLSVerifyClient demand \ No newline at end of file Index: slapd_linux.conf =================================================================== RCS file: /cvsroot/tolven/tolven/ldap-config/slapd_linux.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** slapd_linux.conf 14 Oct 2006 23:10:06 -0000 1.3 --- slapd_linux.conf 20 Oct 2006 04:58:22 -0000 1.4 *************** *** 33,39 **** TLSCipherSuite HIGH:MEDIUM:+SSLv2 ! TLSCACertificateFile ./tolvendev-ldap-cacerts.pem ! TLSCertificateFile ./tolvendev-ldap-cert.pem ! TLSCertificateKeyFile ./tolvendev-ldap-key.pem # Sample security restrictions --- 33,44 ---- TLSCipherSuite HIGH:MEDIUM:+SSLv2 ! TLSCACertificateFile ./tolvendev-ldap-cacerts.pem ! TLSCertificateFile ./tolvendev-ldap-cert.pem ! TLSCertificateKeyFile ./tolvendev-ldap-key.pem ! ! # Currently TLSVerifyClient does not work with client JXplorer but works fine ! # with JBoss. If not using an LDAP client browser, then uncommenting the TLSVerifyClient ! # ensures that only JBoss is allowed to connect to the LDAP server. ! # TLSVerifyClient demand # Sample security restrictions |
|
From: John C. <jc...@us...> - 2006-10-19 14:02:05
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10694/installer/izpack-8.1 Modified Files: installUserInputSpec.xml Log Message: Add reference required Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** installUserInputSpec.xml 16 Oct 2006 08:51:02 -0000 1.9 --- installUserInputSpec.xml 19 Oct 2006 14:01:59 -0000 1.10 *************** *** 1095,1101 **** creating a demo user account has a separate username (which is NOT an email address) and an email mail address field which is not verified. The full email-activation page, ! on the other hand, requires an email address as user id and it verifies the address via email." /> <field type="staticText" align="left" ! txt="If you enable email activation, the following two ." /> </panel> <panel order="10"> --- 1095,1106 ---- creating a demo user account has a separate username (which is NOT an email address) and an email mail address field which is not verified. The full email-activation page, ! on the other hand, requires an email address which is used as the user id. Tolven verifies the address via email." /> <field type="staticText" align="left" ! txt="The following option enables a special sponsorship mode. Instead of allowing anyone to create an account, ! this option requires users to obtain a referenceCode from someone with account who has create a code. At a minimum, this provides a mechanism for tracking how each user came to the register in the system (once registered, the reference code is no longer required)." /> ! <field type="check" variable="REFERENCE_REQUIRED"> ! <spec txt="Reference Required" true="true" false="false" set="$REFERENCE_REQUIRED" /> ! </field> ! </panel> <panel order="10"> |
|
From: John C. <jc...@us...> - 2006-10-19 14:01:30
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10657/jboss-config Modified Files: tolven-properties-service.xml Log Message: Externalize tolven.properties Index: tolven-properties-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/tolven-properties-service.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tolven-properties-service.xml 2 Sep 2006 03:06:08 -0000 1.6 --- tolven-properties-service.xml 19 Oct 2006 14:01:16 -0000 1.7 *************** *** 42,52 **** <!-- | Load properties from each of the given comma seperated URLs ! <attribute name="URLList"> ! http://somehost/some-location.properties, ! ./conf/somelocal.properties ! </attribute> - --> <!-- Set raw properties file style properties. --> --- 42,49 ---- <!-- | Load properties from each of the given comma seperated URLs + --> ! <attribute name="URLList">conf/props/tolven.properties</attribute> <!-- Set raw properties file style properties. --> |
|
From: John C. <jc...@us...> - 2006-10-19 13:49:12
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5615/src/org/tolven/core/bean Modified Files: TolvenProperties.java Log Message: Active externalized tolven.properties Index: TolvenProperties.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/TolvenProperties.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TolvenProperties.java 14 Oct 2006 20:13:35 -0000 1.6 --- TolvenProperties.java 19 Oct 2006 13:49:10 -0000 1.7 *************** *** 37,41 **** /** ! * Initialize our properties in memory. * @throws IOException * --- 37,41 ---- /** ! * Initialize our properties in memory. Obsolete. * @throws IOException * *************** *** 72,77 **** */ public Properties getProperties() throws IOException { ! if (props==null) initializeProperties(); ! return props; } } --- 72,78 ---- */ public Properties getProperties() throws IOException { ! return System.getProperties(); ! // if (props==null) initializeProperties(); ! // return props; } } |
|
From: John C. <jc...@us...> - 2006-10-19 01:50:16
|
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8257/web/private Modified Files: selectAccount.xhtml adminAccount.xhtml Log Message: Provide a cleaner flow when logging in for the first time and a new account needs to be created. Also, provider a URL that can be cut and paste to subscribers (when ReferralCode is required on new account registration). Index: adminAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/adminAccount.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** adminAccount.xhtml 14 Oct 2006 23:08:04 -0000 1.7 --- adminAccount.xhtml 19 Oct 2006 01:50:14 -0000 1.8 *************** *** 108,111 **** --- 108,117 ---- <h:outputText value="#{sp.referenceCode}" /> </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="URL"/> + </f:facet> + <h:outputText value="http://#{top.properties['tolven.invitation.host']}:#{top.properties['tolven.invitation.port']}#{top.properties['tolven.invitation.root']}/public/register.jsf?referenceCode=#{sp.referenceCode}" /> + </h:column> </h:dataTable> <h:panelGrid columns="2" > Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** selectAccount.xhtml 17 Oct 2006 03:03:10 -0000 1.14 --- selectAccount.xhtml 19 Oct 2006 01:50:14 -0000 1.15 *************** *** 26,29 **** --- 26,39 ---- </script> </c:if> + <c:if test="#{acc.accountUserCount==0}"> + <h:commandLink id="continue" action="createAccount" value="Create Account"/> + <script language="JavaScript" type="text/javascript"> + // <![CDATA[ + window.onload=function() { + $('accountForm:continue').click(); + } + // ]]> + </script> + </c:if> <c:if test="#{top.accountUserId==0}"> <h:panelGroup rendered="#{invitation.openInvitationCount!=0}"> |
|
From: John C. <jc...@us...> - 2006-10-19 01:50:16
|
Update of /cvsroot/tolven/tolvenWEB/web/public In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8257/web/public Modified Files: newDemoUser.xhtml register.xhtml Log Message: Provide a cleaner flow when logging in for the first time and a new account needs to be created. Also, provider a URL that can be cut and paste to subscribers (when ReferralCode is required on new account registration). Index: register.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/register.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** register.xhtml 14 Oct 2006 20:15:51 -0000 1.6 --- register.xhtml 19 Oct 2006 01:50:14 -0000 1.7 *************** *** 22,26 **** <h:form id="register"> <h:panelGrid columns="2"> ! <h:outputText value="reference Code" rendered="#{reg.referenceRequired}"/> <h:panelGroup rendered="#{reg.referenceRequired}"> <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> --- 22,26 ---- <h:form id="register"> <h:panelGrid columns="2"> ! <h:outputText value="Reference Code" rendered="#{reg.referenceRequired}"/> <h:panelGroup rendered="#{reg.referenceRequired}"> <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> Index: newDemoUser.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/newDemoUser.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newDemoUser.xhtml 14 Oct 2006 20:15:51 -0000 1.3 --- newDemoUser.xhtml 19 Oct 2006 01:50:14 -0000 1.4 *************** *** 22,26 **** <h:form id="register"> <h:panelGrid columns="2"> ! <h:outputText value="reference Code" rendered="#{reg.referenceRequired}"/> <h:panelGroup rendered="#{reg.referenceRequired}"> <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> --- 22,26 ---- <h:form id="register"> <h:panelGrid columns="2"> ! <h:outputText value="Reference Code" rendered="#{reg.referenceRequired}"/> <h:panelGroup rendered="#{reg.referenceRequired}"> <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> *************** *** 57,64 **** <h:message for="userPassword2" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> - <h:selectBooleanCheckbox value="#{reg.ephr}"/> - <h:outputText value="Create a new personal health record account"/> - <h:selectBooleanCheckbox value="#{reg.echr}"/> - <h:outputText value="Create a new clinical health record account"/> </h:panelGrid> <h:panelGroup rendered="#{reg.referenceRequired}"> --- 57,60 ---- |
|
From: John C. <jc...@us...> - 2006-10-19 01:50:16
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8257/web/WEB-INF Modified Files: faces-config.xml Log Message: Provide a cleaner flow when logging in for the first time and a new account needs to be created. Also, provider a URL that can be cut and paste to subscribers (when ReferralCode is required on new account registration). Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** faces-config.xml 17 Oct 2006 03:03:10 -0000 1.23 --- faces-config.xml 19 Oct 2006 01:50:14 -0000 1.24 *************** *** 333,336 **** --- 333,340 ---- <to-view-id>/private/createAccount.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>createAccount</from-outcome> + <to-view-id>/private/createAccount.xhtml</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> |
|
From: John C. <jc...@us...> - 2006-10-19 01:50:16
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8257/src/org/tolven/web Modified Files: RegisterAction.java Log Message: Provide a cleaner flow when logging in for the first time and a new account needs to be created. Also, provider a URL that can be cut and paste to subscribers (when ReferralCode is required on new account registration). Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** RegisterAction.java 17 Oct 2006 03:03:10 -0000 1.21 --- RegisterAction.java 19 Oct 2006 01:50:14 -0000 1.22 *************** *** 117,121 **** try { ! echr = true; // Default == true ephr = false; InitialContext ctx = new InitialContext(); --- 117,121 ---- try { ! echr = false; ephr = false; InitialContext ctx = new InitialContext(); *************** *** 425,428 **** --- 425,429 ---- tp = new TolvenPerson(); } + tp.setReferenceCode((String)this.getRequestParameter("referenceCode")); } return tp; *************** *** 433,436 **** --- 434,438 ---- } + public String getRepeatUid() { return repeatUid; |
|
From: John C. <jc...@us...> - 2006-10-18 15:36:00
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14871/web/five Modified Files: providers.xhtml protocols.xhtml Log Message: Corrected descriptions (checked in on behalf of Leslie) Index: providers.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/providers.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** providers.xhtml 4 Oct 2006 17:12:05 -0000 1.1 --- providers.xhtml 18 Oct 2006 15:35:57 -0000 1.2 *************** *** 11,17 **** <ui:composition> <p> ! A full list of medical history for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> ! </html> \ No newline at end of file --- 11,17 ---- <ui:composition> <p> ! A full list of providers for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> ! </html> Index: protocols.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/protocols.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** protocols.xhtml 4 Oct 2006 17:12:05 -0000 1.1 --- protocols.xhtml 18 Oct 2006 15:35:57 -0000 1.2 *************** *** 11,17 **** <ui:composition> <p> ! A list of the providers for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> ! </html> \ No newline at end of file --- 11,17 ---- <ui:composition> <p> ! A list of the protocols for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> ! </html> |
|
From: John C. <jc...@us...> - 2006-10-17 06:25:02
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11656/src/org/tolven/web Modified Files: TopAction.java Log Message: Clean up close icon on echr and ephr patient tabs Index: TopAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TopAction.java 16 Oct 2006 08:58:27 -0000 1.17 --- TopAction.java 17 Oct 2006 06:24:59 -0000 1.18 *************** *** 15,21 **** import java.io.IOException; - import java.text.SimpleDateFormat; import java.util.Collection; - import java.util.Date; import java.util.LinkedList; import java.util.List; --- 15,19 ---- *************** *** 23,46 **** import java.util.Properties; import java.util.Set; ! //import javax.ejb.EJB; ! import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.tolven.app.MenuLocal; - import org.tolven.app.entity.MenuStructure; import org.tolven.core.ActivationLocal; import org.tolven.core.InvitationLocal; import org.tolven.core.TolvenPropertiesLocal; - import org.tolven.core.bean.InvitationException; - import org.tolven.core.entity.Account; - import org.tolven.core.entity.AccountType; import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.TolvenUser; - import org.tolven.doc.entity.Invitation; import org.tolven.gen.CHRGenerator; import org.tolven.security.TolvenPerson; --- 21,37 ---- import java.util.Properties; import java.util.Set; ! import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.http.HttpSession; import org.tolven.app.MenuLocal; import org.tolven.core.ActivationLocal; import org.tolven.core.InvitationLocal; import org.tolven.core.TolvenPropertiesLocal; import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.TolvenUser; import org.tolven.gen.CHRGenerator; import org.tolven.security.TolvenPerson; *************** *** 72,76 **** private long invitationId; private TolvenUser user; ! private String timeZone; --- 63,67 ---- private long invitationId; private TolvenUser user; ! private String accountType; private String timeZone; *************** *** 231,237 **** // System.out.println( "Session Attribute: " + x ); // } ! String knownType = accountUser.getAccount().getKnownType(); ! System.out.println( "Dispatching to KnownType: " + knownType ); ! return knownType; } --- 222,228 ---- // System.out.println( "Session Attribute: " + x ); // } ! accountType = accountUser.getAccount().getKnownType(); ! System.out.println( "Dispatching to KnownType: " + accountType ); ! return accountType; } *************** *** 471,474 **** --- 462,471 ---- this.genDemoData = genDemoData; } + public String getAccountType() { + return accountType; + } + public void setAccountType(String accountType) { + this.accountType = accountType; + } } |
|
From: John C. <jc...@us...> - 2006-10-17 06:25:02
|
Update of /cvsroot/tolven/tolvenWEB/web/styles In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11656/web/styles Modified Files: ephr.css echr.css Log Message: Clean up close icon on echr and ephr patient tabs Index: echr.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/echr.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** echr.css 2 Oct 2006 05:29:59 -0000 1.1 --- echr.css 17 Oct 2006 06:24:59 -0000 1.2 *************** *** 181,188 **** } .tabs .closetab { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: url(../images/phr_closetab_inactive.gif) no-repeat left center; PADDING-BOTTOM: 0px; MARGIN: 0px -8px 0px 10px; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none } .tabs .closetab:hover { ! BACKGROUND: url(../images/phr_closetab_inactive_over.gif) no-repeat left center } .bar1 { --- 181,188 ---- } .tabs .closetab { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: url(../images/chr_closetab_inactive.gif) no-repeat left center; PADDING-BOTTOM: 0px; MARGIN: 0px -8px 0px 10px; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none } .tabs .closetab:hover { ! BACKGROUND: url(../images/chr_closetab_inactive_over.gif) no-repeat left center } .bar1 { Index: ephr.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/ephr.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ephr.css 2 Oct 2006 05:29:59 -0000 1.1 --- ephr.css 17 Oct 2006 06:24:59 -0000 1.2 *************** *** 207,214 **** } .tabs .closetab { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: url(../images/closetab_inactive.gif) no-repeat left center; PADDING-BOTTOM: 0px; MARGIN: 0px -8px 0px 10px; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none } .tabs .closetab:hover { ! BACKGROUND: url(../images/closetab_inactive_over.gif) no-repeat left center } .bar1 { --- 207,214 ---- } .tabs .closetab { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: url(../images/phr_closetab_inactive.gif) no-repeat left center; PADDING-BOTTOM: 0px; MARGIN: 0px -8px 0px 10px; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none } .tabs .closetab:hover { ! BACKGROUND: url(../images/phr_closetab_inactive_over.gif) no-repeat left center } .bar1 { |
Update of /cvsroot/tolven/tolvenWEB/web/images In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11656/web/images Modified Files: phr_closetab_active.gif Added Files: chr_closetab_active.gif echr_closetab_inactive.gif ephr_closetab_inactive.gif Removed Files: phr_closetab_inactive.gif Log Message: Clean up close icon on echr and ephr patient tabs --- NEW FILE: chr_closetab_active.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: echr_closetab_inactive.gif --- (This appears to be a binary file; contents omitted.) --- phr_closetab_inactive.gif DELETED --- Index: phr_closetab_active.gif =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/images/phr_closetab_active.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsAxGJPB and /tmp/cvsIeaGvT differ --- NEW FILE: ephr_closetab_inactive.gif --- (This appears to be a binary file; contents omitted.) |
|
From: John C. <jc...@us...> - 2006-10-17 06:25:01
|
Update of /cvsroot/tolven/tolvenWEB/web/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11656/web/templates Modified Files: menuTemplate.xhtml portalTemplate.xhtml Log Message: Clean up close icon on echr and ephr patient tabs Index: menuTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/menuTemplate.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** menuTemplate.xhtml 1 Aug 2006 15:47:07 -0000 1.4 --- menuTemplate.xhtml 17 Oct 2006 06:24:59 -0000 1.5 *************** *** 9,14 **** Description goes here. </ui:insert> ! <img class="closetab" src="../images/phr_closetab_inactive.gif" onclick="closeTab('#{param.element}');return false;"/> ! </a> </f:view> \ No newline at end of file --- 9,14 ---- Description goes here. </ui:insert> ! <img class="closetab" src="../images/#{top.accountType}_closetab_inactive.gif" onclick="closeTab('#{param.element}');return false;"/> ! </a> </f:view> \ No newline at end of file Index: portalTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/portalTemplate.xhtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** portalTemplate.xhtml 14 Oct 2006 20:15:52 -0000 1.11 --- portalTemplate.xhtml 17 Oct 2006 06:24:59 -0000 1.12 *************** *** 67,71 **** <li><a href="#">Literature Search</a></li> <h:panelGroup rendered="#{top.accountUserId!=0}"> - <li><a href="javascript:showPane('root:demo');">[Demo]</a></li> <li><a href="javascript:getRemoteContent(visiblePage);" >[Refresh]</a></li> </h:panelGroup> --- 67,70 ---- |
|
From: John C. <jc...@us...> - 2006-10-17 03:03:15
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32299/web/WEB-INF Modified Files: faces-config.xml Log Message: In select account, move create account and data generation to a separate page. Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** faces-config.xml 16 Oct 2006 08:58:27 -0000 1.22 --- faces-config.xml 17 Oct 2006 03:03:10 -0000 1.23 *************** *** 330,341 **** </navigation-case> <navigation-case> ! <from-action>#{acc.createNewCHR}</from-action> ! <from-outcome>success</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> ! </navigation-case> ! <navigation-case> ! <from-action>#{acc.createNewPHR}</from-action> ! <from-outcome>success</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> </navigation-case> </navigation-rule> --- 330,335 ---- </navigation-case> <navigation-case> ! <from-outcome>createAccount</from-outcome> ! <to-view-id>/private/createAccount.xhtml</to-view-id> </navigation-case> </navigation-rule> *************** *** 369,372 **** --- 363,381 ---- </navigation-case> </navigation-rule> + <navigation-rule> + <from-view-id>/private/createAccount.xhtml</from-view-id> + <navigation-case> + <from-outcome>cancel</from-outcome> + <to-view-id>/private/selectAccount.xhtml</to-view-id> + <redirect/> + </navigation-case> + <navigation-case> + <from-action>#{reg.createNewAccount}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/private/selectAccount.xhtml</to-view-id> + <redirect/> + </navigation-case> + </navigation-rule> + <navigation-rule> |
|
From: John C. <jc...@us...> - 2006-10-17 03:03:14
|
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32299/web/private Modified Files: selectAccount.xhtml Added Files: createAccount.xhtml Log Message: In select account, move create account and data generation to a separate page. --- NEW FILE: createAccount.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> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="brand" value="brandt"/> <ui:param name="skin" value="echr"/> <ui:define name="content"> <h:form id="newAccountForm" > <h2>Create a new health record account</h2> <h:panelGrid columns="2"> <h:outputText value="Account Type"/> <h:selectOneMenu value="#{reg.accountType}" > <f:selectItem itemLabel="Clinical Account" itemValue="echr"/> <f:selectItem itemLabel="Personal Account" itemValue="ephr"/> </h:selectOneMenu> <h:outputText value="Account Title"/> <h:inputText value="#{reg.newAccountTitle}" size="50" /> <h:outputText value="Timezone"/> <h:selectOneMenu value="#{reg.newTimeZone}" > <f:selectItems value="#{reg.timeZones}"/> </h:selectOneMenu> <h:selectBooleanCheckbox value="#{reg.genDemoData}" /> <h:outputText value="Add 100 demo patients to the clinical account you create*"/> </h:panelGrid> <p>* If checked, 100 new patients will be added to the clinical account being created. <b>This will take a few minutes.</b> You can add more patients later from the Account Administration page. </p> <p>The generated patients will have names and dates of birth corresponding to US population distribution. Addresses and zip codes are within the US roughly in proportion to US demographics. Patients may have been diagnosed with a disease many years ago but the data represented in this account will only go back 10 years or so. Not all pregnancies and not all diagnoses result in data being generated. This accounts for people that go elsewhere for care or decide not to seek further care. Only a few diagnoses are generated (so far). They are generated roughly in proportion to the occurance in the US population.</p> <p>As each patient is added to the patient list for the clinical account, each adult patient is given a user id consisting of the first and last name of the patient with a dot in between. eg Ficticious patient Nancy Cartwright would be given a username and password of nancy.cartwright (all lower case). Married couples will have their records in a combined family account. Some family accounts also have kids but the kids usually don't have a user id and therefore cannot login. Some people will just have one user and one medical record, their own, in an account.</p> <p>you can create a personal account for a family or just for yourself. However, for demo purposes, you should create a clinical account and then generate patients. This will also populate personal accounts which you can then access.</p> <h:commandButton action="cancel" immediate="true" value="Cancel"/> <h:commandButton action="#{reg.createNewAccount}" value="Create Account"/> </h:form> </ui:define> </ui:composition> </body> </html> Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** selectAccount.xhtml 16 Oct 2006 17:04:45 -0000 1.13 --- selectAccount.xhtml 17 Oct 2006 03:03:10 -0000 1.14 *************** *** 90,126 **** <h:outputText value="Comments"/> </f:facet> - <h:panelGroup rendered="#{item.account.knownType=='echr'}"> - <h:selectBooleanCheckbox value="#{top.genDemoData}" /> - <h:outputText value="Add 100 demo patients*"/> - </h:panelGroup> </h:column> </h:dataTable> - <p>* If checked, 100 new patients will be added to the clinical account you log into. - <b>This will take a few minutes.</b> You can add more patients from the Account Administration - page under Preferences. </p> - <p>The generated patients will have names and dates of birth corresponding to US population distribution. - Addresses and zip codes are within the US roughly in proportion to US demographics. - Patients may have been diagnosed with a disease many - years ago but the data represented in this account will only go back 10 years or so. Not all - pregnancies and not all diagnoses result in data being generated. This accounts for people - that go elsewhere for care or decide not to seek further care. Only a few diagnoses are - generated (so far). They are generated roughly in proportion to the occurance in the US population.</p> - <p>As each patient is added to the patient list for the clinical account, each adult patient - is given a user id consisting of the first and last name of the patient with a dot in between. eg - Ficticious patient Nancy Cartwright would be given a username and password of nancy.cartwright - (all lower case). Married couples will have their records in a combined family account. Some family - accounts also have kids but the kids usually don't have a user id and therefore cannot login. - Some people will just have one user and one medical record, their own, in an account.</p> </h:panelGroup> ! <h2>Create a new account to log into</h2> ! <p>You can create one or more clinical and personal accounts. Typically you'll only need one. ! Create a clinical account for a clinic, hospital unit or department, or a public health program.</p> ! <h:commandLink action="#{acc.createNewCHR}"> ! <h:outputText value="Create a new clinical account"/> ! </h:commandLink> ! <p>Create a personal account for a family or just for yourself. (For demo purposes, create a clinical account and generate patients which in turn generates pre-populated personal accounts.)</p> ! <h:commandLink action="#{acc.createNewPHR}"> ! <h:outputText value="Create a new personal account"/> ! </h:commandLink> </c:if> </h:form> --- 90,99 ---- <h:outputText value="Comments"/> </f:facet> </h:column> </h:dataTable> </h:panelGroup> ! <h:commandLink action="createAccount"> ! <h:outputText value="Create a new clinical or personal account"/> ! </h:commandLink> </c:if> </h:form> |
|
From: John C. <jc...@us...> - 2006-10-17 03:03:13
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32299/src/org/tolven/web Modified Files: RegisterAction.java AccountAction.java Log Message: In select account, move create account and data generation to a separate page. Index: AccountAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AccountAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AccountAction.java 16 Oct 2006 08:58:27 -0000 1.7 --- AccountAction.java 17 Oct 2006 03:03:10 -0000 1.8 *************** *** 31,35 **** // @EJB private ActivationLocal activation; - private AccountDAOLocal accountBean; private AccountUser accountUser; --- 31,34 ---- *************** *** 43,47 **** // I think this is a JBOSS-only scam. activation = (ActivationLocal) ctx.lookup("tolven/ActivationBean/local"); - accountBean = (AccountDAOLocal) ctx.lookup("tolven/AccountDAOBean/local"); } catch (NamingException e) --- 42,45 ---- *************** *** 94,112 **** } - public String createNewCHR() { - Account account = accountBean.createAccount( "echr", "New Clinical Account" ); - System.out.println( "Created account: " + account.getId()); - // Note, the user automatically gets account permission because they are the only user on that new account. - accountBean.addAccountUser( account, getTop().getUser(), getNow(), true); - accountUsers = null; - return "success"; - } - public String createNewPHR() { - Account account = accountBean.createAccount( "ephr", "New Personal Account" ); - System.out.println( "Created account: " + account.getId()); - // Note, the user automatically gets account permission because they are the only user on that new account. - accountBean.addAccountUser( account, getTop().getUser(), getNow(), true); - accountUsers = null; - return "success"; - } } --- 92,94 ---- Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RegisterAction.java 16 Oct 2006 08:58:27 -0000 1.20 --- RegisterAction.java 17 Oct 2006 03:03:10 -0000 1.21 *************** *** 65,68 **** --- 65,71 ---- // @EJB private AccountDAOLocal accountBean; + // @EJB + private CHRGenerator chrGen; + private TolvenPerson tp; *************** *** 75,78 **** --- 78,84 ---- private String accountTitle; + private String newAccountTitle; + private String newTimeZone; + private boolean genDemoData; private boolean noActivation; *************** *** 122,125 **** --- 128,132 ---- menu = (MenuLocal) ctx.lookup("tolven/MenuBean/local"); doc = (DocumentLocal) ctx.lookup("tolven/DocumentBean/local"); + chrGen = (CHRGenerator) ctx.lookup("tolven/CHRGeneratorBean/local"); } catch (NamingException e) *************** *** 133,136 **** --- 140,156 ---- } + public String createNewAccount() throws Exception { + Account account = accountBean.createAccount( this.getAccountType(), this.getNewAccountTitle(), getNewTimeZone() ); + System.out.println( "Created account: " + account.getId()); + // Note, the user automatically gets account permission because they are the only user on that new account. + accountBean.addAccountUser( account, getTop().getUser(), getNow(), true); + accountUsers = null; + menu.createDefaultMenuStructure( account ); + if (this.isGenDemoData()) { + chrGen.createPatients( getTop().getUser(), account, 100, getTop().getNow(), 1996 ); + } + return "success"; + } + /** * Read-only attribute to get the account-user associated with this user *************** *** 638,640 **** --- 658,684 ---- } + public String getNewAccountTitle() { + return newAccountTitle; + } + + public void setNewAccountTitle(String newAccountTitle) { + this.newAccountTitle = newAccountTitle; + } + + public boolean isGenDemoData() { + return genDemoData; + } + + public void setGenDemoData(boolean genDemoData) { + this.genDemoData = genDemoData; + } + + public String getNewTimeZone() { + return newTimeZone; + } + + public void setNewTimeZone(String newTimeZone) { + this.newTimeZone = newTimeZone; + } + } |
|
From: John C. <jc...@us...> - 2006-10-17 03:02:12
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32246/src/org/tolven/core Modified Files: AccountDAOLocal.java Log Message: Add timezone parameter when creating an account. Also, make the timezone of a generated person account the same as the timezone of the clinical account. (Patients live near the doc). Index: AccountDAOLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/AccountDAOLocal.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AccountDAOLocal.java 14 Oct 2006 23:08:08 -0000 1.6 --- AccountDAOLocal.java 17 Oct 2006 03:02:10 -0000 1.7 *************** *** 46,52 **** * Create a new account. No users are associated with this account. * @param accountType * @return A new Account object */ ! public Account createAccount( String accountType, String title ); /** --- 46,53 ---- * Create a new account. No users are associated with this account. * @param accountType + * @param timeZone Java time zone, null means use tolven default * @return A new Account object */ ! public Account createAccount( String accountType, String title, String timeZone ); /** |
|
From: John C. <jc...@us...> - 2006-10-17 03:02:12
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32246/src/org/tolven/gen/bean Modified Files: CHRGeneratorBean.java Log Message: Add timezone parameter when creating an account. Also, make the timezone of a generated person account the same as the timezone of the clinical account. (Patients live near the doc). Index: CHRGeneratorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CHRGeneratorBean.java 3 Oct 2006 03:14:43 -0000 1.10 --- CHRGeneratorBean.java 17 Oct 2006 03:02:10 -0000 1.11 *************** *** 124,128 **** public void createAccount( TolvenUser user, int count, Date now, String title, int startYear ) throws Exception { initCriteria(); ! Account account = accountBean.createAccount( "echr", title ); // We're counting on this menu structure to exist for the rest of the process to work. menu.createDefaultMenuStructure(account); --- 124,128 ---- public void createAccount( TolvenUser user, int count, Date now, String title, int startYear ) throws Exception { initCriteria(); ! Account account = accountBean.createAccount( "echr", title, null ); // We're counting on this menu structure to exist for the rest of the process to work. menu.createDefaultMenuStructure(account); *************** *** 185,189 **** // Create a personal account for the famiily ! Account personalAccount = accountBean.createAccount( "ephr", "The " + mother.getLast() + " family" ); menu.createDefaultMenuStructure(personalAccount); // We're counting on this menu structure to exist for the rest of the process to work. --- 185,189 ---- // Create a personal account for the famiily ! Account personalAccount = accountBean.createAccount( "ephr", "The " + mother.getLast() + " family", account.getTimeZone() ); menu.createDefaultMenuStructure(personalAccount); // We're counting on this menu structure to exist for the rest of the process to work. *************** *** 215,219 **** for ( VirtualPerson father : fathers ) { // Create a personal account for the famiily ! Account personalAccount = accountBean.createAccount( "ephr", father.getLast() + " Health Account" ); menu.createDefaultMenuStructure(personalAccount); FamilyUnit family = new FamilyUnit(); --- 215,219 ---- for ( VirtualPerson father : fathers ) { // Create a personal account for the famiily ! Account personalAccount = accountBean.createAccount( "ephr", father.getLast() + " Health Account", account.getTimeZone() ); menu.createDefaultMenuStructure(personalAccount); FamilyUnit family = new FamilyUnit(); |
|
From: John C. <jc...@us...> - 2006-10-17 03:02:12
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32246/src/org/tolven/core/bean Modified Files: AccountDAOBean.java InvitationBean.java Log Message: Add timezone parameter when creating an account. Also, make the timezone of a generated person account the same as the timezone of the clinical account. (Patients live near the doc). Index: AccountDAOBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AccountDAOBean.java 14 Oct 2006 23:08:08 -0000 1.6 --- AccountDAOBean.java 17 Oct 2006 03:02:10 -0000 1.7 *************** *** 59,66 **** * @return A new Account object */ ! public Account createAccount( String accountType, String title ) { Account account = new Account(); account.setKnownType( accountType ); account.setTitle(title); em.persist( account ); return account; --- 59,67 ---- * @return A new Account object */ ! public Account createAccount( String accountType, String title, String timeZone ) { Account account = new Account(); account.setKnownType( accountType ); account.setTitle(title); + account.setTimeZone( timeZone ); em.persist( account ); return account; *************** *** 73,77 **** */ public Account createAccount( String accountType ) { ! return createAccount( accountType, null ); } --- 74,78 ---- */ public Account createAccount( String accountType ) { ! return createAccount( accountType, null, null ); } Index: InvitationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationBean.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** InvitationBean.java 16 Oct 2006 08:58:32 -0000 1.12 --- InvitationBean.java 17 Oct 2006 03:02:10 -0000 1.13 *************** *** 299,303 **** JoinNewAccountInvitation jna = (JoinNewAccountInvitation)detail; // TODO: Localization issue - Account title is seeded with English ! Account account = accountBean.createAccount( jna.getAccountType(), "New Account" ); System.out.println( "Created account: " + account.getId()); // Note, the user automatically gets account permission since they are the only user on that new account. --- 299,303 ---- JoinNewAccountInvitation jna = (JoinNewAccountInvitation)detail; // TODO: Localization issue - Account title is seeded with English ! Account account = accountBean.createAccount( jna.getAccountType(), "New Account", null ); System.out.println( "Created account: " + account.getId()); // Note, the user automatically gets account permission since they are the only user on that new account. |
|
From: John C. <jc...@us...> - 2006-10-16 19:08:21
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6104/src/org/tolven/app/bean Modified Files: MenuBean.java Log Message: New accounts now have the Patient's Summary pane show first instead of the New activity pane Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** MenuBean.java 6 Oct 2006 03:18:58 -0000 1.33 --- MenuBean.java 16 Oct 2006 19:08:13 -0000 1.34 *************** *** 340,349 **** em.persist( overview ); - MenuStructure patActivity = new MenuStructure( - account, overview, "patActivity.xhtml", null, 1, "patact", "New Activity", "true", null, "tab" ); - em.persist( patActivity ); - MenuStructure summary = new MenuStructure( ! account, overview, "summary.xhtml", null, 2, "summary", "Summary", "true", null, "tab" ); em.persist( summary ); --- 340,345 ---- em.persist( overview ); MenuStructure summary = new MenuStructure( ! account, overview, "summary.xhtml", null, 1, "summary", "Summary", "true", null, "tab" ); em.persist( summary ); *************** *** 390,393 **** --- 386,393 ---- em.persist( immSummary ); + MenuStructure patActivity = new MenuStructure( + account, overview, "patActivity.xhtml", null, 2, "patact", "New Activity", "true", null, "tab" ); + em.persist( patActivity ); + MenuStructure todo = new MenuStructure( account, overview, "todo.xhtml", null, 3, "todo", "Things To Do", "true", null, "tab" ); |
3 messages has been excluded from this view by a project administrator.
