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-12-03 08:37:53
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15312/src/org/tolven/security/bean Modified Files: LDAPBean.java LDAPLocal.java Log Message: Add delete user feature for expired invitations Index: LDAPBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LDAPBean.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LDAPBean.java 4 Nov 2006 06:14:27 -0000 1.7 --- LDAPBean.java 3 Dec 2006 08:37:52 -0000 1.8 *************** *** 81,97 **** if (ctx!=null) return; getLdapSettings(); ! try { ! LoginContext lc = new LoginContext("tolvenApplicationLDAP", new CallbackHandler(){public void handle(Callback[] callbacks){}}); ! lc.login(); ! String principal = ((Principal)lc.getSubject().getPrincipals().iterator().next()).getName(); ! String password = String.valueOf(((PasswordCredential)lc.getSubject().getPrivateCredentials().iterator().next()).getPassword()); ! lc.logout(); InitialContext iniCtx = new InitialContext(); ctx = (LdapContext)iniCtx.lookup("tolven/ldap"); ! ctx.addToEnvironment("java.naming.security.principal", principal); ! ctx.addToEnvironment("java.naming.security.credentials", password); ! } catch(LoginException ex) { ! throw new RuntimeException(ex); ! } } --- 81,97 ---- if (ctx!=null) return; getLdapSettings(); ! // try { ! // LoginContext lc = new LoginContext("tolvenApplicationLDAP", new CallbackHandler(){public void handle(Callback[] callbacks){}}); ! // lc.login(); ! // String principal = ((Principal)lc.getSubject().getPrincipals().iterator().next()).getName(); ! // String password = String.valueOf(((PasswordCredential)lc.getSubject().getPrivateCredentials().iterator().next()).getPassword()); ! // lc.logout(); InitialContext iniCtx = new InitialContext(); ctx = (LdapContext)iniCtx.lookup("tolven/ldap"); ! // ctx.addToEnvironment("java.naming.security.principal", principal); ! // ctx.addToEnvironment("java.naming.security.credentials", password); ! // } catch(LoginException ex) { ! // throw new RuntimeException(ex); ! // } } *************** *** 208,211 **** --- 208,226 ---- } } + /** + * Delete a UID from LDAP + * @throws NamingException + * @throws IOException + */ + public void deleteUser( String uid ) throws NamingException, IOException { + baseDN = System.getProperty("tolven.ldap.baseDN"); + String path = "uid=" + uid + "," + baseDN; + try { + connectLDAP(); + ctx.destroySubcontext(path); + } finally { + closeLDAP(); + } + } /** * Delete a person from LDAP. Index: LDAPLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LDAPLocal.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LDAPLocal.java 21 Aug 2006 00:26:29 -0000 1.4 --- LDAPLocal.java 3 Dec 2006 08:37:52 -0000 1.5 *************** *** 45,48 **** --- 45,55 ---- public void updatePerson( TolvenPerson tp ) throws NamingException, IOException; + /** + * Delete a UID from LDAP + * @throws NamingException + * @throws IOException + */ + public void deleteUser( String uid ) throws NamingException, IOException; + /** * Delete a person from LDAP. |
|
From: John C. <jc...@us...> - 2006-12-03 08:36:42
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14874/src/org/tolven/gen/bean Modified Files: GenMedical.java CHRGeneratorBean.java Log Message: Add definsive code around demographics Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenMedical.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GenMedical.java 29 Nov 2006 01:31:21 -0000 1.15 --- GenMedical.java 3 Dec 2006 08:36:39 -0000 1.16 *************** *** 162,167 **** public Date getDOB( ) throws ParseException { Person person = null; ! if (mdCHR!=null) person = mdCHR.getPatientActor().getPerson(); ! if (mdPHR!=null) person = mdPHR.getPatientActor().getPerson(); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getDateValue(); --- 162,171 ---- public Date getDOB( ) throws ParseException { Person person = null; ! if (mdCHR!=null) { ! person = mdCHR.getPatientActor().getPerson(); ! } else if (mdPHR!=null) { ! person = mdPHR.getPatientActor().getPerson(); ! } ! if (person==null) System.out.println( "No person" ); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getDateValue(); Index: CHRGeneratorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CHRGeneratorBean.java 15 Nov 2006 07:00:11 -0000 1.13 --- CHRGeneratorBean.java 3 Dec 2006 08:36:39 -0000 1.14 *************** *** 152,162 **** for (int c = 0; c < 100; c++) { VirtualPerson person = personGen.generatePerson(); ! int age = person.getAgeInYears( now ); ! if ( age < 18 ) continue; family.setFamilyName(person.getLast()); primaryGender = person.getGender(); - primaryAge = person.getAgeInYears(now); MenuData mdPrimary = registerPatient( user, account, person, family, now, startYear ); ! generateMedicalData( null, mdPrimary, now, startYear, person.getDod()); break; } --- 152,162 ---- for (int c = 0; c < 100; c++) { VirtualPerson person = personGen.generatePerson(); ! primaryAge = person.getAgeInYears(now); ! if ( primaryAge < 18 ) continue; family.setFamilyName(person.getLast()); primaryGender = person.getGender(); MenuData mdPrimary = registerPatient( user, account, person, family, now, startYear ); ! if (mdPrimary==null) continue; ! generateMedicalData( null, mdPrimary, now, startYear, person.getDod()); break; } *************** *** 173,176 **** --- 173,177 ---- person.setLast(family.getFamilyName()); MenuData mdPrimary = registerPatient( user, account, person, family, now, startYear ); + if (mdPrimary==null) continue; generateMedicalData( null, mdPrimary, now, startYear, person.getDod()); break; |
|
From: John C. <jc...@us...> - 2006-12-03 08:34:19
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13988/src/org/tolven/core/bean Modified Files: InvitationSender.java InvitationBean.java ActivationBean.java Log Message: Expired activation invitations now delete the new user login. Index: InvitationSender.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationSender.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InvitationSender.java 6 Nov 2006 07:41:24 -0000 1.9 --- InvitationSender.java 3 Dec 2006 08:34:18 -0000 1.10 *************** *** 27,30 **** --- 27,31 ---- import javax.persistence.PersistenceContext; + import org.tolven.core.ActivationLocal; import org.tolven.core.InvitationLocal; import org.tolven.core.entity.Status; *************** *** 45,48 **** --- 46,51 ---- @EJB private InvitationLocal invitationBean; + @EJB + private ActivationLocal activationBean; @Resource private MessageDrivenContext ctx; *************** *** 53,59 **** // We'll persist test messages, too. em.persist( invitation ); if ("test".equals(invitation.getDispatchAction())) { System.out.println("[InvitationSender:onMessage] TEST MSG: " + invitation.getTitle()); ! String completedStatus = Status.fromValue("COMPLETED").value(); invitation.setStatus(completedStatus); return; --- 56,64 ---- // We'll persist test messages, too. em.persist( invitation ); + // The invitation may require followup if the user doesn't activate in time + activationBean.followup(invitation); if ("test".equals(invitation.getDispatchAction())) { System.out.println("[InvitationSender:onMessage] TEST MSG: " + invitation.getTitle()); ! String completedStatus = Status.COMPLETED.value(); invitation.setStatus(completedStatus); return; Index: InvitationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationBean.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** InvitationBean.java 6 Nov 2006 07:41:24 -0000 1.14 --- InvitationBean.java 3 Dec 2006 08:34:18 -0000 1.15 *************** *** 22,25 **** --- 22,26 ---- import javax.annotation.EJB; import javax.annotation.Resource; + import javax.ejb.EJBContext; import javax.ejb.Local; import javax.ejb.SessionContext; *************** *** 219,223 **** */ public Invitation createInvitation( String principal, InvitationDetail detail ) throws JAXBException, IOException { ! String activeStatus = Status.fromValue("ACTIVE").value(); Invitation invite = new Invitation( ); invite.setTargetEmail(principal); --- 220,224 ---- */ public Invitation createInvitation( String principal, InvitationDetail detail ) throws JAXBException, IOException { ! String activeStatus = Status.ACTIVE.value(); Invitation invite = new Invitation( ); invite.setTargetEmail(principal); Index: ActivationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/ActivationBean.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ActivationBean.java 6 Nov 2006 07:41:24 -0000 1.18 --- ActivationBean.java 3 Dec 2006 08:34:18 -0000 1.19 *************** *** 22,27 **** --- 22,33 ---- import javax.annotation.EJB; + import javax.annotation.Resource; + import javax.ejb.EJBContext; import javax.ejb.Local; import javax.ejb.Stateless; + import javax.ejb.Timeout; + import javax.ejb.Timer; + import javax.ejb.TimerService; + import javax.naming.NamingException; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; *************** *** 34,37 **** --- 40,44 ---- import org.tolven.admin.AdministrativeDetail; import org.tolven.admin.InvitationDetail; + import org.tolven.admin.JoinNewAccountInvitation; import org.tolven.core.AccountDAOLocal; import org.tolven.core.ActivationLocal; *************** *** 64,75 **** @PersistenceContext private EntityManager em; - @EJB private LDAPLocal ldap; - - // @EJB private TolvenPropertiesLocal propertyBean; @EJB private InvitationLocal invitationBean; @EJB private AccountDAOLocal accountBean; @EJB private DocumentLocal documentBean; - /** * Default constructor --- 71,83 ---- @PersistenceContext private EntityManager em; + + @Resource + EJBContext ejbContext; + + @EJB private LDAPLocal ldap; @EJB private InvitationLocal invitationBean; @EJB private AccountDAOLocal accountBean; @EJB private DocumentLocal documentBean; /** * Default constructor *************** *** 113,117 **** user.setSponsorship(sponsorship); } ! String completedStatus = Status.fromValue("completed").value(); invitation.setStatus(completedStatus); em.merge(invitation); --- 121,125 ---- user.setSponsorship(sponsorship); } ! String completedStatus = Status.COMPLETED.value(); invitation.setStatus(completedStatus); em.merge(invitation); *************** *** 134,137 **** --- 142,180 ---- return user; } + + /** + * If the userID isn't registered within an hour, cancel the activation + */ + public void followup( Invitation invitation ) { + if (invitation.getExpiration()!=null) { + ejbContext.getTimerService().createTimer( invitation.getExpiration(), new Long(invitation.getId())); + } + } + + /** + * Cancel an activation that has not been responded to within an hour or so. + * @param UID + * @throws IOException + * @throws JAXBException + * @throws NamingException + */ + @Timeout + public void timeout( Timer timer ) throws JAXBException, IOException, NamingException { + long invitationId = (Long) timer.getInfo(); + Invitation invitation = invitationBean.findInvitation(invitationId); + System.out.println( "Checking " + invitation.getId() + " for activation"); + + List<AdministrativeDetail> details = documentBean.getDetails(invitation.getDetails()); + for (AdministrativeDetail detail : details) { + if (detail instanceof ActivateInvitation) { + // If the invitation is still active, blow it away and delete the LDAP entry. + if (invitation.getStatus().equals(Status.ACTIVE.value())) { + invitation.setStatus(Status.OBSOLETE.value()); + ActivateInvitation ai = (ActivateInvitation) detail; + ldap.deleteUser(ai.getPrincipal()); + } + } + } + } /** *************** *** 160,170 **** invitation.setTemplate("/invitation/activate.jsf"); invitation.setAccount( null ); // No owner for registrations (could be sponsor) ! GregorianCalendar t = new GregorianCalendar(); ! t.setTime( now ); ! invitation.setCreated( t.getTime() ); ! t.add(GregorianCalendar.DAY_OF_MONTH, 2); ! invitation.setExpiration( t.getTime() ); ActivateInvitation detail = new ActivateInvitation( ); ! detail.setExpirationTime( DatatypeFactory.newInstance().newXMLGregorianCalendar( t)); detail.setPrincipal( tp.getUid()); detail.setReferenceCode( rc ); --- 203,215 ---- invitation.setTemplate("/invitation/activate.jsf"); invitation.setAccount( null ); // No owner for registrations (could be sponsor) ! String expiration = System.getProperty("tolven.register.expiration"); ! if (expiration!=null) { ! long elapsed = Long.parseLong(expiration)*1000; ! if (elapsed > 0) { ! invitation.setExpiration( new Date( now.getTime()+ (Long.parseLong(expiration)*1000) ) ); ! } ! } ActivateInvitation detail = new ActivateInvitation( ); ! // detail.setExpirationTime( DatatypeFactory.newInstance().newXMLGregorianCalendar( t)); detail.setPrincipal( tp.getUid()); detail.setReferenceCode( rc ); *************** *** 172,176 **** // Create a document containing the details and associate it with the invitation invitation.setDetails( invitationBean.createDetail( detail) ); ! // em.persist( invitation ); // Once sent, the invitation state will be updated to reflect completion. Workflow, man. Workflow. invitationBean.queueInvitation( invitation ); --- 217,221 ---- // Create a document containing the details and associate it with the invitation invitation.setDetails( invitationBean.createDetail( detail) ); ! // em.persist( invitation ); // Done by the MDB when the invitation is dequeued // Once sent, the invitation state will be updated to reflect completion. Workflow, man. Workflow. invitationBean.queueInvitation( invitation ); *************** *** 223,227 **** public TolvenUser deactivateUser( String principal) { TolvenUser user = accountBean.findUser( principal ); ! String inactiveStatus = Status.fromValue("inactive").value(); if (user!=null) { --- 268,272 ---- public TolvenUser deactivateUser( String principal) { TolvenUser user = accountBean.findUser( principal ); ! String inactiveStatus = Status.INACTIVE.value(); if (user!=null) { *************** *** 237,241 **** { String activeStatus = Status.fromValue("active").value(); ! String oldActiveStatus = Status.fromValue("ACTIVE").value(); String select = "SELECT au FROM AccountUser au WHERE au.user = :user "; select += "and ( au.status = '" + activeStatus + "' or au.status = '" + oldActiveStatus; --- 282,286 ---- { String activeStatus = Status.fromValue("active").value(); ! String oldActiveStatus = Status.ACTIVE.value(); String select = "SELECT au FROM AccountUser au WHERE au.user = :user "; select += "and ( au.status = '" + activeStatus + "' or au.status = '" + oldActiveStatus; |
|
From: John C. <jc...@us...> - 2006-12-03 08:34:19
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13988/src/org/tolven/core Modified Files: ActivationLocal.java Log Message: Expired activation invitations now delete the new user login. Index: ActivationLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/ActivationLocal.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ActivationLocal.java 6 Nov 2006 07:41:24 -0000 1.14 --- ActivationLocal.java 3 Dec 2006 08:34:18 -0000 1.15 *************** *** 55,58 **** --- 55,63 ---- public TolvenUser registerAndActivate( TolvenPerson tp, Date now ) throws Exception; + /** + * If the userID isn't registered within an hour, cancel the activation + */ + public void followup( Invitation invitation ); + /** * Activate a user. At this point, a user will have an entry in LDAP, they will have received an invitation |
|
From: John C. <jc...@us...> - 2006-12-03 08:34:16
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13972/template Modified Files: tolven.template Log Message: Expired activation invitations now delete the new user login. Index: tolven.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/tolven.template,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tolven.template 28 Nov 2006 07:14:31 -0000 1.8 --- tolven.template 3 Dec 2006 08:34:14 -0000 1.9 *************** *** 8,11 **** --- 8,12 ---- tolven.login.create.activatedUser=true tolven.register.referenceRequired=false + tolven.register.expiration=3600 tolven.mail.from=no...@my... tolven.mail.fromName=My Organization |
|
From: John C. <jc...@us...> - 2006-12-03 08:32:15
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13153/jboss-config Added Files: gen-queue-service.xml Log Message: Add generator queue for data generator --- NEW FILE: gen-queue-service.xml --- <?xml version="1.0" encoding="UTF-8"?> <server> <loader-repository>jboss.messaging:loader=ScopedLoaderRepository <loader-repository-config>java2ParentDelegation=false</loader-repository-config> </loader-repository> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=generator" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="guest" read="true" write="true"/> <role name="publisher" read="true" write="true" create="false"/> <role name="noacc" read="false" write="false" create="false"/> </security> </attribute> </mbean> </server> |
|
From: John C. <jc...@us...> - 2006-12-03 02:33:48
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27329/src/org/tolven/web Modified Files: TransactionFilter.java Log Message: Cleaner handling of transaction timeout Index: TransactionFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TransactionFilter.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TransactionFilter.java 24 Aug 2006 23:36:25 -0000 1.12 --- TransactionFilter.java 3 Dec 2006 02:33:47 -0000 1.13 *************** *** 65,70 **** long beginNanoTime = 0; try { ! ctx = new InitialContext(); ! ut = (UserTransaction) ctx.lookup("UserTransaction"); if(ut.getStatus()==Status.STATUS_NO_TRANSACTION) { // ut.setTransactionTimeout(10000); --- 65,71 ---- long beginNanoTime = 0; try { ! ctx = new InitialContext(); ! while (true) { ! ut = (UserTransaction) ctx.lookup("UserTransaction"); if(ut.getStatus()==Status.STATUS_NO_TRANSACTION) { // ut.setTransactionTimeout(10000); *************** *** 74,81 **** // Keep track of transaction start time beginNanoTime = System.nanoTime(); } else { ! ut = null; ! throw new IllegalStateException( "[TransactionFilter] Unable to establish user transaction: state=" + ut.getStatus()); } } catch (Exception e) { config.getServletContext().log("Error setting up UserTransaction or starting a transaction", e); --- 75,90 ---- // Keep track of transaction start time beginNanoTime = System.nanoTime(); + break; + } else if (ut.getStatus()==Status.STATUS_ACTIVE) { + System.out.println( "***** Transaction already active *******"); + break; } else { ! // ut = null; ! System.out.println( "***** Transaction not in a good state [" + ut.getStatus() + "] trying again *******"); ! ut.setRollbackOnly(); ! ut.rollback(); ! // throw new IllegalStateException( "[TransactionFilter] Unable to establish user transaction" ); } + } } catch (Exception e) { config.getServletContext().log("Error setting up UserTransaction or starting a transaction", e); *************** *** 84,87 **** --- 93,102 ---- try { chain.doFilter(request, response); + { + InitialContext ctx2; + ctx2 = new InitialContext(); + UserTransaction ut2 = (UserTransaction) ctx2.lookup("UserTransaction"); + if (ut!=ut2) System.out.println( "***** UT Difference!!!!!!!!!"); + } if(ut != null) { if (ut.getStatus()==Status.STATUS_ACTIVE) ut.commit(); |
|
From: John C. <jc...@us...> - 2006-12-03 02:33:11
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27234/src/org/tolven/web Modified Files: TopAction.java RegisterAction.java Log Message: Reset TolvenPerson in Top when user preferences are updated. Index: TopAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** TopAction.java 15 Nov 2006 07:03:11 -0000 1.21 --- TopAction.java 3 Dec 2006 02:33:08 -0000 1.22 *************** *** 157,174 **** return "dispatch"; } ! String principal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName(); ! info = "Login Processing: " + principal; ! setTp(ldap.createTolvenPerson( principal )); // Get the TolvenUser ! setUser( activation.loginUser( principal, getNow() ) ); // Get invitation id if any // If the user object is missing but we have an invitation, see if it might get the user all the way logged in. if (getUser()==null && getInvitationId()!=0) { // Since we have no user yet, we'll try executing an activation invitation (if it works) ! if (!activation.activate(principal, getInvitationId(), getNow())) { return dispatchingLogout("invalidInvitation"); } // try TolvenUser again ! setUser( activation.loginUser( principal, getNow() ) ); if (getUser()==null) return dispatchingLogout("waitingActivation"); // Now we can complete the activation --- 157,172 ---- return "dispatch"; } ! info = "Login Processing: " + getTp().getUid(); // Get the TolvenUser ! setUser( activation.loginUser( getTp().getUid(), getNow() ) ); // Get invitation id if any // If the user object is missing but we have an invitation, see if it might get the user all the way logged in. if (getUser()==null && getInvitationId()!=0) { // Since we have no user yet, we'll try executing an activation invitation (if it works) ! if (!activation.activate(getTp().getUid(), getInvitationId(), getNow())) { return dispatchingLogout("invalidInvitation"); } // try TolvenUser again ! setUser( activation.loginUser( getTp().getUid(), getNow() ) ); if (getUser()==null) return dispatchingLogout("waitingActivation"); // Now we can complete the activation *************** *** 254,258 **** public String deleteUser( ) throws Exception { ldap.deletePerson( getTp()); ! activation.deactivateUser( FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName()); return logout(); } --- 252,256 ---- public String deleteUser( ) throws Exception { ldap.deletePerson( getTp()); ! activation.deactivateUser( getTp().getUid()); return logout(); } *************** *** 290,294 **** } ! public TolvenPerson getTp() { return tp; } --- 288,296 ---- } ! public TolvenPerson getTp() throws NamingException, IOException { ! if (tp==null) { ! String principal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName(); ! tp=ldap.createTolvenPerson( principal ); ! } return tp; } Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** RegisterAction.java 15 Nov 2006 07:03:11 -0000 1.24 --- RegisterAction.java 3 Dec 2006 02:33:08 -0000 1.25 *************** *** 367,370 **** --- 367,372 ---- // Reset the timezone getTop().setTimeZone(null); + // Reset tolven person (so it picks up the new LDAP changes) + getTop().setTp(null); FacesContext.getCurrentInstance().addMessage( null, new FacesMessage("Preference update completed " + new Date())); // If there's a new likeness, load it also. |
|
From: John C. <jc...@us...> - 2006-11-29 01:36:12
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30105/src/org/tolven/web Modified Files: MenuAction.java Log Message: Add new wizard and new Patient menu structure Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MenuAction.java 17 Nov 2006 03:17:39 -0000 1.25 --- MenuAction.java 29 Nov 2006 01:36:11 -0000 1.26 *************** *** 63,67 **** private MenuData menuDataItem = null; - private List<MenuStructure> menus = null; --- 63,66 ---- *************** *** 420,424 **** MenuData ass = new MenuData(); // Find the assessment MS ! MenuStructure msa = menuLocal.findDescendentMenuStructure(patientMS.getAccount().getId(), patientMS, "assessments:assessment"); ass.setMenuStructure(msa); ass.setAccount(patientMS.getAccount()); --- 419,423 ---- MenuData ass = new MenuData(); // Find the assessment MS ! MenuStructure msa = menuLocal.findDescendentMenuStructure(patientMS.getAccount().getId(), patientMS, "assessment"); ass.setMenuStructure(msa); ass.setAccount(patientMS.getAccount()); *************** *** 428,437 **** ass.setString02( "new"); menuLocal.persistMenuData(ass); // That should be it for an assessment but since we don't have reflexive queries ! // done yet, we have to manually att this assessment to the list of assessments // but in fact, this should be in a list of pending assessments but we won't // go there yet. MenuData assAll = new MenuData(); ! // MenuStructure msaa = menuLocal.findDescendentMenuStructure(patientMS.getAccount().getId(), patientMS, "assessments:all"); MenuStructure msaa = this.getThisMenu(); assAll.setMenuStructure(msaa); --- 427,438 ---- ass.setString02( "new"); menuLocal.persistMenuData(ass); + // Note the elementId of this new item + menuDataItem = ass; // That should be it for an assessment but since we don't have reflexive queries ! // done yet, we have to manually add this assessment to the list of assessments // but in fact, this should be in a list of pending assessments but we won't // go there yet. MenuData assAll = new MenuData(); ! // MenuStructure msaa = menuLocal.findDescendentMenuStructure(patientMS.getAccount().getId(), patientMS, "ass:all"); MenuStructure msaa = this.getThisMenu(); assAll.setMenuStructure(msaa); *************** *** 440,444 **** assAll.setDate01(getNow()); assAll.setString01("GCS"); ! assAll.setString02( "incomplete"); assAll.setReference(ass); menuLocal.persistMenuData(assAll); --- 441,445 ---- assAll.setDate01(getNow()); assAll.setString01("GCS"); ! assAll.setString02( "new"); assAll.setReference(ass); menuLocal.persistMenuData(assAll); |
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29680/web/five Modified Files: providers.xhtml activity.xhtml assAll.xhtml patients.xhtml patient.xhtml login.xhtml medsummary.xhtml rad.xhtml assessment.xhtml summary.xhtml protocols.xhtml bar1.xhtml Added Files: pxhx.xhtml resultSummary.xhtml procSummary.xhtml dx.xhtml dxSummary.xhtml pendingOrders.xhtml images.xhtml fun.xhtml obs.xhtml selfMon.xhtml dxhx.xhtml allergySummary.xhtml famhx.xhtml reminders.xhtml psyhx.xhtml goals.xhtml otcm.xhtml apptSummary.xhtml pathology.xhtml imm.xhtml access.xhtml reminderSummary.xhtml ins.xhtml newResults.xhtml nok.xhtml obsSummary.xhtml rx.xhtml hmaint.xhtml physio.xhtml questionaires.xhtml wip.xhtml Log Message: Add new wizard and new Patient menu structure Index: rad.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/rad.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rad.xhtml 7 Nov 2006 08:41:03 -0000 1.3 --- rad.xhtml 29 Nov 2006 01:35:33 -0000 1.4 *************** *** 53,75 **** <table id="#{menu.element}LG" > <tbody> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr> </tbody> </table> ! </div> </ui:composition> </body> </html> \ No newline at end of file --- 53,76 ---- <table id="#{menu.element}LG" > <tbody> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> ! <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> </tbody> </table> ! </div> ! </ui:composition> </body> </html> \ No newline at end of file --- NEW FILE: goals.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>Past Appointments</title> </head> <body> <ui:composition><p>Goals go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: nok.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>Past Appointments</title> </head> <body> <ui:composition><p>Next of kin go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: famhx.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>Past Appointments</title> </head> <body> <ui:composition><p>Family History goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: resultSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="resultsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="MM/dd" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No new results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: obs.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>Past Appointments</title> </head> <body> <ui:composition><p>Observations go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: newResults.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>Lab results</title> </head> <body> <ui:composition> <script language="JavaScript" type="text/javascript"> // <![CDATA[ #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: false, tableClass: 'dataGrid', largeBufferSize: 4.0, nearLimitFactor: 0.7, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', sortAscendImg: '../images/sort_asc.gif', sortDescendImg:'../images/sort_desc.gif'}); #{menu.elementLabel}DG.setSupressColumnRange( 0, 1); #{menu.elementLabel}DG.addSortSupressColumn( 'date', 0, 1); #{menu.elementLabel}DG.addSortSupressColumn( 'test', 1, 2); #{menu.elementLabel}DG.addSortSupressColumn( 'result', 2, 3); #{menu.elementLabel}DG.requestContentRefresh(0); #{menu.elementLabel}DGFilter = ''; #{menu.elementLabel}DGFilterChange = function (element, vax) { if (#{menu.elementLabel}DGFilter==vax) return; #{menu.elementLabel}DGFilter = vax; #{menu.elementLabel}DG.setRequestParams( {name: 'element', value: visiblePage}, {name: 'TestFilter', value: #{menu.elementLabel}DGFilter} ); // #{menu.elementLabel}DG.setTotalRows(10); #{menu.elementLabel}DG.resetContents(); #{menu.elementLabel}DG.requestContentRefresh(0); }; new Form.Element.Observer( $("#{menu.element}DGFilter"), 1, #{menu.elementLabel}DGFilterChange ); // ]]> </script> <form action="#" onsubmit="return false;"> Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" /> </form> <div id="#{menu.element}LGDG" style="width:990px;"> <table id="#{menu.element}LG_header" > <thead> <tr> <th align="right" width="125px">Date</th> <th align="left" width="210px">Test</th> <th align="left" width="75px">Status</th> <th align="left" width="100px">Source</th> </tr> </thead> </table> <table id="#{menu.element}LG" > <tbody> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> <tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="75px">-</td><td width="100px">-</td></tr> </tbody> </table> </div> </ui:composition> </body> </html> Index: patient.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patient.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** patient.xhtml 19 Nov 2006 20:04:02 -0000 1.5 --- patient.xhtml 29 Nov 2006 01:35:33 -0000 1.6 *************** *** 11,15 **** <ui:composition> <div class="info"> ! <div class="allergies"><p>Patient Allergies: None <a href="#" title="Display the problems page">see detail</a></p></div> </div> <ui:include src="bar1.xhtml"/> --- 11,35 ---- <ui:composition> <div class="info"> ! <div class="allergies"> ! <table> ! <tr><td><p>Allergies: None <a href="javascript:showPane('#{param.element}:doc:allergies');" title="Display the problems page">see detail</a> ! </p></td><td> ! <div class="wip"> ! <ul> ! <c:forEach var="item" items="#{menu.thisMenu.sortedChildren}"> ! <c:if test="#{item.role=='tab' and item.visible=='true' and item.sequence lt 0}"> ! <li id="#{param.element}:#{item.node}:sel"> ! <a href="javascript:showPane('#{param.element}:#{item.node}');"> #{item.text}</a> ! </li> ! </c:if> ! <c:if test="#{item.role=='placeholder' and item.sequence lt 0 }"> ! <li id="#{param.element}:#{item.node}:sel" style="display:none"></li> ! </c:if> ! </c:forEach> ! </ul> ! </div> ! </td></tr> ! </table> ! </div> </div> <ui:include src="bar1.xhtml"/> --- NEW FILE: wip.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>Assessment</title> </head> <body> <ui:composition> <ui:include src="../wizard/gcs.xhtml" /> <p>#{menu.element}</p> </ui:composition> </body> </html> --- NEW FILE: questionaires.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>Medical History</title> </head> <body> <ui:composition> <ui:include src="../wizard/bccIntake.xhtml" /> </ui:composition> </body> </html> --- NEW FILE: hmaint.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>Past Appointments</title> </head> <body> <ui:composition><p>Health Maintenance goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> Index: medsummary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/medsummary.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** medsummary.xhtml 12 Aug 2006 07:19:01 -0000 1.2 --- medsummary.xhtml 29 Nov 2006 01:35:33 -0000 1.3 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Medication list</title> </head> <body> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>List of problems for this patient</title> </head> <body> *************** *** 12,18 **** <h:dataTable id="medsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> ! <h:outputText value="#{menu.thisMenu.text}"/> </f:facet> <h:column> <h:outputText value="#{md.string01}"/> </h:column> --- 12,25 ---- <h:dataTable id="medsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> ! <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> ! <h:outputText value="#{menu.thisMenu.text}"/> ! </h:outputLink> </f:facet> <h:column> + <h:outputText value="#{md.date01}"> + <f:convertDateTime type="date" pattern="MM/dd" timeZone="#{top.timeZone}"/> + </h:outputText> + </h:column> + <h:column> <h:outputText value="#{md.string01}"/> </h:column> *************** *** 21,25 **** </h:column> </h:dataTable> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No medications"/> </ui:composition> </body> --- 28,35 ---- </h:column> </h:dataTable> ! <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> ! <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> ! </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No observations" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> --- NEW FILE: fun.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>Past Appointments</title> </head> <body> <ui:composition><p>Functional Status goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: pathology.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>Past Appointments</title> </head> <body> <ui:composition><p>Pathology Results go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> Index: assAll.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/assAll.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assAll.xhtml 15 Nov 2006 07:03:11 -0000 1.1 --- assAll.xhtml 29 Nov 2006 01:35:33 -0000 1.2 *************** *** 10,14 **** <body> <ui:composition> ! <div id="#{menu.element}pane"> <c:if test="#{menu.menuDataCount==0}"> <p> --- 10,15 ---- <body> <ui:composition> ! <div id="#{menu.element}-pane"> ! <c:if test="#{menu.menuDataCount==0}"> <p> *************** *** 20,24 **** <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, --- 21,25 ---- <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! new Rico.LiveGrid( '#{menu.element}-LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, *************** *** 33,39 **** // ]]> </script> ! <div id="#{menu.element}LGDG" style="width:975px"> ! <table id="#{menu.element}LG_header"> <thead> <tr> --- 34,40 ---- // ]]> </script> ! <div id="#{menu.element}-LGDG" style="width:975px"> ! <table id="#{menu.element}-LG_header"> <thead> <tr> *************** *** 46,50 **** </thead> </table> ! <table id="#{menu.element}LG" > <tbody> <tr><td width="175px">-</td><td width="250px">-</td><td width="150px">-</td><td width="200px">-</td><td width="150px">-</td></tr> --- 47,51 ---- </thead> </table> ! <table id="#{menu.element}-LG" > <tbody> <tr><td width="175px">-</td><td width="250px">-</td><td width="150px">-</td><td width="200px">-</td><td width="150px">-</td></tr> *************** *** 69,76 **** </c:if> <h:form id="assGen" onsubmit="return ajaxSubmit2(this);"> ! <h:commandButton id="assGenAction" action="#{menu.createAssessment}" value="Create Assessment"/> </h:form> <h:messages errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </div> </ui:composition> </body> --- 70,84 ---- </c:if> <h:form id="assGen" onsubmit="return ajaxSubmit2(this);"> ! <h:commandButton id="assGenAction" action="#{menu.createAssessment}" value="New GCS"/> </h:form> <h:messages errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </div> + <c:if test="#{menu.menuDataItem != null}"> + <script language="JavaScript" type="text/javascript"> + // <![CDATA[ + showPane( '#{menu.menuDataItem.path}' ); + // ]]> + </script> + </c:if> </ui:composition> </body> --- NEW FILE: obsSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="obssum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="MM/dd" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No observations" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: procSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="procsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="yyyy" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No procedures" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: dxSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="dxsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="yyyy" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No diagnoses" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: dxhx.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>Past Appointments</title> </head> <body> <ui:composition><p>Diagnostic History goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: ins.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>Past Appointments</title> </head> <body> <ui:composition><p>Insurance and claims go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: images.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>Past Appointments</title> </head> <body> <ui:composition><p>Images go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: selfMon.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>Past Appointments</title> </head> <body> <ui:composition><p>Self-monitoring Results go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: allergySummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="allergysum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="yyyy" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No allergies" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: apptSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="apptsum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="yyyy" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No appointments" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> --- NEW FILE: pendingOrders.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>Past Appointments</title> </head> <body> <ui:composition><p>Pending Orders go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: physio.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>Past Appointments</title> </head> <body> <ui:composition><p>Physiology Results go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: reminders.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>Past Appointments</title> </head> <body> <ui:composition><p>Reminders go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> Index: bar1.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/bar1.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bar1.xhtml 19 Nov 2006 20:04:02 -0000 1.3 --- bar1.xhtml 29 Nov 2006 01:35:33 -0000 1.4 *************** *** 13,22 **** <ul> <c:forEach var="item" items="#{menu.thisMenu.sortedChildren}"> ! <c:if test="#{item.role=='tab' and item.visible=='true'}"> <li id="#{param.element}:#{item.node}:sel"> <a href="javascript:showPane('#{param.element}:#{item.node}');"> #{item.text}</a> </li> </c:if> ! <c:if test="#{item.role=='placeholder'}"> <li id="#{param.element}:#{item.node}:sel" style="display:none"></li> </c:if> --- 13,22 ---- <ul> <c:forEach var="item" items="#{menu.thisMenu.sortedChildren}"> ! <c:if test="#{item.role=='tab' and item.visible=='true' and item.sequence gt 0}"> <li id="#{param.element}:#{item.node}:sel"> <a href="javascript:showPane('#{param.element}:#{item.node}');"> #{item.text}</a> </li> </c:if> ! <c:if test="#{item.role=='placeholder' and item.sequence gt 0 }"> <li id="#{param.element}:#{item.node}:sel" style="display:none"></li> </c:if> --- NEW FILE: dx.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>Past Appointments</title> </head> <body> <ui:composition><p>Diagnoses go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: pxhx.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>Past Appointments</title> </head> <body> <ui:composition><p>Procedure History goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> Index: providers.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/providers.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** providers.xhtml 15 Nov 2006 07:03:11 -0000 1.4 --- providers.xhtml 29 Nov 2006 01:35:33 -0000 1.5 *************** *** 10,14 **** <body> <ui:composition> ! <iframe src="../wizard/bccIntake.jsf" width="100%" height="680px" frameborder="off" marginwidth="4" marginheight="4"></iframe> </ui:composition> </body> --- 10,16 ---- <body> <ui:composition> ! <p> ! List of the patient's providers. #{param.element}, path #{menu.targetMenuPath.path}. ! </p> </ui:composition> </body> --- NEW FILE: psyhx.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>Past Appointments</title> </head> <body> <ui:composition><p>Psychiatry History goes here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: imm.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>Past Appointments</title> </head> <body> <ui:composition><p>Immunizations go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: otcm.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>Past Appointments</title> </head> <body> <ui:composition><p>Over the counter medications go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: access.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>Past Appointments</title> </head> <body> <ui:composition><p>Access grants to others go here 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** protocols.xhtml 15 Nov 2006 07:03:11 -0000 1.3 --- protocols.xhtml 29 Nov 2006 01:35:33 -0000 1.4 *************** *** 6,15 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Providers</title> </head> <body> <ui:composition> ! <iframe src="../wizard/gcs.jsf" width="100%" height="680px" frameborder="off" marginwidth="4" marginheight="4"></iframe> ! </ui:composition> </body> --- 6,14 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <title>Protocols</title> </head> <body> <ui:composition> ! Protocols the patient is on. </ui:composition> </body> --- NEW FILE: reminderSummary.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>List of problems for this patient</title> </head> <body> <ui:composition> <h:dataTable id="remindersum" value="#{menu.menuData}" var="md" cellspacing="0" border="0" cellpadding="3" width="100%"> <f:facet name="header"> <h:outputLink value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="#{menu.thisMenu.text}"/> </h:outputLink> </f:facet> <h:column> <h:outputText value="#{md.date01}"> <f:convertDateTime type="date" pattern="yyyy" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <h:outputText value="#{md.string01}"/> </h:column> <h:column> <h:outputText value="#{md.string02}"/> </h:column> </h:dataTable> <h:outputLink rendered="#{menu.menuDataCount>6}" value="#" onclick="showPane('#{menu.drilldown}')"> <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> <h:outputText rendered="#{menu.menuDataCount==0}" value="No reminders" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> </html> Index: patients.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** patients.xhtml 7 Nov 2006 08:41:03 -0000 1.13 --- patients.xhtml 29 Nov 2006 01:35:33 -0000 1.14 *************** *** 27,31 **** patientGridEventFilter = new Form.Element.Observer( $("patientFilter"), 1, patientFilterChange ); $("patientFilter").focus(); ! patientGridz = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, --- 27,31 ---- patientGridEventFilter = new Form.Element.Observer( $("patientFilter"), 1, patientFilterChange ); $("patientFilter").focus(); ! patientGridz = new Rico.LiveGrid( '#{menu.element}-LG', 15, #{menu.menuDataCount}, 'menuData.ajax', {prefetchBuffer: true, *************** *** 46,51 **** Filter (last name): <input name="patientFilter" type="text" id="patientFilter" /> </form> ! <div id="#{menu.element}LGDG" style="width:680px"> ! <table id="#{menu.element}LG_header" > <thead> <tr> --- 46,51 ---- Filter (last name): <input name="patientFilter" type="text" id="patientFilter" /> </form> ! <div id="#{menu.element}-LGDG" style="width:680px"> ! <table id="#{menu.element}-LG_header" > <thead> <tr> *************** *** 57,61 **** </thead> </table> ! <table id="#{menu.element}LG" > <tbody> <tr><td align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr> --- 57,61 ---- </thead> </table> ! <table id="#{menu.element}-LG" > <tbody> <tr><td align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr> Index: activity.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/activity.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** activity.xhtml 6 Nov 2006 23:12:05 -0000 1.7 --- activity.xhtml 29 Nov 2006 01:35:33 -0000 1.8 *************** *** 10,17 **** <body> <ui:composition> - <h3>Outstanding Activity for #{top.accountTitle}</h3> <c:if test="#{menu.menuDataCount==0}"> <p> ! No current actions posted for this account. </p> <br/> --- 10,16 ---- <body> <ui:composition> <c:if test="#{menu.menuDataCount==0}"> <p> ! No current activity posted for this account. </p> <br/> *************** *** 20,26 **** <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', ! {prefetchBuffer: true, tableClass: 'dataGrid', largeBufferSize: 4.0, --- 19,25 ---- <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! newActivityZ = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 'menuData.ajax', ! {prefetchBuffer: false, tableClass: 'dataGrid', largeBufferSize: 4.0, *************** *** 31,37 **** sortDescendImg:'../images/sort_desc.gif'}); // ]]> </script> ! <div id="#{menu.element}LGDG" style="width:750px"> <table id="#{menu.element}LG_header"> --- 30,42 ---- sortDescendImg:'../images/sort_desc.gif'}); + newActivityZ.setSupressColumnRange( 0, 2); + newActivityZ.addSortSupressColumn( 'for', 0, 2); + newActivityZ.addSortSupressColumn( 'date', 0, 2); + newActivityZ.addSortSupressColumn( 'action', 2, 3); + newActivityZ.requestContentRefresh(0); + // ]]> </script> ! <div id="#{menu.element}LGDG" style="width:850px"> <table id="#{menu.element}LG_header"> Index: assessment.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/assessment.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assessment.xhtml 15 Nov 2006 07:03:11 -0000 1.1 --- assessment.xhtml 29 Nov 2006 01:35:33 -0000 1.2 *************** *** 10,15 **** <body> <ui:composition> ! <iframe src="../wizard/gcs.jsf" width="100%" height="680px" frameborder="off" marginwidth="4" marginheight="4"></iframe> ! </ui:composition> </body> --- 10,14 ---- <body> <ui:composition> ! <ui:include src="../wizard/gcs.xhtml" /> </ui:composition> </body> Index: login.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/login.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** login.xhtml 3 Sep 2006 07:06:15 -0000 1.7 --- login.xhtml 29 Nov 2006 01:35:33 -0000 1.8 *************** *** 38,50 **** </div> <div style="padding:10px;margin:5px;width:600px;clear:both"> <h3>Important Privacy Notice</h3> <p>You are logging into a demo database. While Tolven makes every effort to protect data, this installation has not been certified as secure. Do not enter real patient ! medical data or any secrets. For example, consider using a simple password such as your first ! name, not your regular password. (We've kept the password and account requirements ! simple for the demo). </p> ! <p>You may want to generate some ! artificial patient data. To do so, click the checkbox on the Select Account page ! will be the first page you see after you login to this page.</p> <p>This application is still under development. You should expect changes frequently and without warning. Some pages don't work at all, yet. --- 38,53 ---- </div> <div style="padding:10px;margin:5px;width:600px;clear:both"> + <h3>November 28, 2006</h3> + <p>Significant changes require that you create a new account which you can + do right after you login by selecting the link at the bottom of the Select Account page. + Previous accounts may work with some errors. </p> <h3>Important Privacy Notice</h3> <p>You are logging into a demo database. While Tolven makes every effort to protect data, this installation has not been certified as secure. Do not enter real patient ! medical data or any secrets. </p> ! <h3>New Users</h3> ! <p>After creating your login, you may want to generate some artificial patient data. ! To do so, click the checkbox on the Create Account page which you can access after logging in.</p> ! <hr/> <p>This application is still under development. You should expect changes frequently and without warning. Some pages don't work at all, yet. --- NEW FILE: rx.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>Past Appointments</title> </head> <body> <ui:composition><p>Pending rescriptions go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> Index: summary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/summary.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** summary.xhtml 8 Aug 2006 18:14:52 -0000 1.3 --- summary.xhtml 29 Nov 2006 01:35:33 -0000 1.4 *************** *** 14,24 **** getRemoteContent( "#{param.element}:probsum", "#{param.element}:probsum" ); getRemoteContent( "#{param.element}:medsum", "#{param.element}:medsum" ); ! getRemoteContent( "#{param.element}:funStatsum", "#{param.element}:funStatsum" ); ! getRemoteContent( "#{param.element}:labsum", "#{param.element}:labsum" ); ! getRemoteContent( "#{param.element}:radsum", "#{param.element}:radsum" ); ! getRemoteContent( "#{param.element}:selfsum", "#{param.element}:selfsum" ); ! getRemoteContent( "#{param.element}:mhxsum", "#{param.element}:mhxsum" ); ! getRemoteContent( "#{param.element}:fhxsum", "#{param.element}:fhxsum" ); ! getRemoteContent( "#{param.element}:immsum", "#{param.element}:immsum" ); // ]]> </script> --- 14,24 ---- getRemoteContent( "#{param.element}:probsum", "#{param.element}:probsum" ); getRemoteContent( "#{param.element}:medsum", "#{param.element}:medsum" ); ! getRemoteContent( "#{param.element}:dxsum", "#{param.element}:dxsum" ); ! getRemoteContent( "#{param.element}:allergysum", "#{param.element}:allergysum" ); ! getRemoteContent( "#{param.element}:apptsum", "#{param.element}:apptsum" ); ! getRemoteContent( "#{param.element}:obssum", "#{param.element}:obssum" ); ! getRemoteContent( "#{param.element}:remindersum", "#{param.element}:remindersum" ); ! getRemoteContent( "#{param.element}:procsum", "#{param.element}:procsum" ); ! getRemoteContent( "#{param.element}:resultsum", "#{param.element}:resultsum" ); // ]]> </script> *************** *** 26,32 **** <table cellspacing="0" cellpadding="2" border="0" width="100%"> <tbody> ! <tr valign="top"><td><div id="#{param.element}:probsum" /></td><td><div id="#{param.element}:labsum" /></td><td><div id="#{param.element}:mhxsum" /></td></tr> ! <tr valign="top"><td><div id="#{param.element}:medsum" /></td><td><div id="#{param.element}:radsum" /></td><td><div id="#{param.element}:fhxsum" /></td></tr> ! <tr valign="top"><td><div id="#{param.element}:funStatsum" /></td><td><div id="#{param.element}:selfsum" /></td><td><div id="#{param.element}:immsum" /></td></tr> </tbody> </table> --- 26,32 ---- <table cellspacing="0" cellpadding="2" border="0" width="100%"> <tbody> ! <tr valign="top"><td width="30%"><div id="#{param.element}:probsum" /></td><td width="30%"><div id="#{param.element}:resultsum" /></td><td width="30%"><div id="#{param.element}:remindersum" /></td></tr> ! <tr valign="top"><td width="30%"><div id="#{param.element}:medsum" /></td><td width="30%"><div id="#{param.element}:allergysum" /></td><td width="30%"><div id="#{param.element}:dxsum" /></td></tr> ! <tr valign="top"><td width="30%"><div id="#{param.element}:apptsum" /></td><td width="30%"><div id="#{param.element}:obssum" /></td><td width="30%"><div id="#{param.element}:procsum" /></td></tr> </tbody> </table> |
|
From: John C. <jc...@us...> - 2006-11-29 01:35:35
|
Update of /cvsroot/tolven/tolvenWEB/web/styles In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29680/web/styles Modified Files: echr.css wizard.css ephr.css Log Message: Add new wizard and new Patient menu structure Index: wizard.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/wizard.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wizard.css 15 Nov 2006 07:03:11 -0000 1.4 --- wizard.css 29 Nov 2006 01:35:33 -0000 1.5 *************** *** 29,33 **** } .infobar .name { ! FONT-SIZE: 1.25em; font-weight: bold } --- 29,40 ---- } .infobar .name { ! FONT-SIZE: 1.00em; text-align: left ! } ! ! .infobar .infotitle { ! FONT-SIZE: 1.00em; text-align: center ! } ! .infobar .author { ! FONT-SIZE: 1.00em; text-align: right } *************** *** 112,121 **** } - TD { - VERTICAL-ALIGN: middle - } - .alignright { - TEXT-ALIGN: right - } P { PADDING-BOTTOM: 0.5em; PADDING-TOP: 0.5em --- 119,122 ---- Index: echr.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/echr.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** echr.css 15 Nov 2006 07:03:11 -0000 1.4 --- echr.css 29 Nov 2006 01:35:33 -0000 1.5 *************** *** 36,40 **** } .info { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: #6699cc; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BORDER-BOTTOM: #e5b27f 1px dotted } .allergies { --- 36,41 ---- } .info { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: #6699cc; PADDING-BOTTOM: 0px; ! MARGIN: 0px; PADDING-TOP: 0px } .allergies { *************** *** 283,286 **** --- 284,336 ---- BACKGROUND: url(../images/bkgd_nav2_active.gif) no-repeat center bottom; COLOR: #191919 } + + .wip { + COLOR: #000000; + FONT-FAMILY: 'Lucide Grande', Verdana, Arial, sans-serif; + PADDING-RIGHT: 0px; + DISPLAY: block; + PADDING-LEFT: 0px; + PADDING-BOTTOM: 0px; + MARGIN: 0px; + WIDTH: 100%; + PADDING-TOP: 0px; + height: 32px; + } + .wip ul { + MARGIN: 0px; + PADDING: 0px; + } + + .wip li { + DISPLAY: block; + FLOAT: left; + padding: 0px; + } + + .wip li a { + PADDING-RIGHT: 0.75em; DISPLAY: block; PADDING-LEFT: 0.75em; PADDING-BOTTOM: 8px; MARGIN: 0px; COLOR: #D9ECFF; PADDING-TOP: 7px; TEXT-DECORATION: none + } + .wip li a:hover { + PADDING-RIGHT: 0.75em; DISPLAY: block; PADDING-LEFT: 0.75em; BACKGROUND: #527ba4; PADDING-BOTTOM: 8px; MARGIN: 0px; COLOR: #ffffff; PADDING-TOP: 7px; TEXT-DECORATION: none + } + .wip li.active a:hover { + BACKGROUND: url(../images/phr_bkgd_nav1_active.gif) no-repeat center bottom; COLOR: #ffffff + } + .wip li.active a { + BACKGROUND: url(../images/phr_bkgd_nav1_active.gif) no-repeat center bottom; COLOR: #ffffff + } + + .wip li a img { + border: 0px; + PADDING-RIGHT: 0px; + PADDING-LEFT: 0px; + PADDING-BOTTOM: 0px; + MARGIN: 0px; + PADDING-TOP: 0px; + width: 12px; + height: 12px; + float:none; + } + .pane { clear:both; Index: ephr.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/ephr.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ephr.css 15 Nov 2006 07:03:11 -0000 1.4 --- ephr.css 29 Nov 2006 01:35:33 -0000 1.5 *************** *** 37,41 **** .info { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: #CC6600; PADDING-BOTTOM: 0px; MARGIN: 0px; ! PADDING-TOP: 0px; BORDER-BOTTOM: #E5B27F 1px dotted } .allergies { --- 37,41 ---- .info { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND: #CC6600; PADDING-BOTTOM: 0px; MARGIN: 0px; ! PADDING-TOP: 0px } .allergies { |
|
From: John C. <jc...@us...> - 2006-11-29 01:35:35
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29680/web/scripts Modified Files: tolvenwiz.js tolven6.js Log Message: Add new wizard and new Patient menu structure Index: tolvenwiz.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolvenwiz.js,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tolvenwiz.js 15 Nov 2006 07:03:11 -0000 1.3 --- tolvenwiz.js 29 Nov 2006 01:35:33 -0000 1.4 *************** *** 1,4 **** - currentStep = 0; - lastStep = 0; choiceList = new Object(); choiceList.cancers = new Array( --- 1,2 ---- *************** *** 4422,4480 **** "Zoologist" ); ! function makeHeading( stepNumber, title ) { ! return '<span style="display:none" id="step' + stepNumber + ':head">Step ' + stepNumber + '- <strong>' + title + '</strong></span>'; } ! function makeIcon( stepNumber, title ) { ! return '<li><a title="' + title + '" id="step' + stepNumber + ':sel" class="inactive" href="#" onclick="showStep(' + stepNumber + ' );">' + stepNumber + '</a></li>'; } // Setup steps ! function setupWizSteps(firstStep) { ! var steps = document.getElementsByClassName( "step" ); ! lastStep = steps.length; var stepHeadings = ""; var stepIcons = ""; for ( var s=0; s < steps.length; s++) { ! steps[s].id = 'step' + (s+1); Element.hide(steps[s]); ! stepHeadings = stepHeadings + makeHeading( s+1, steps[s].title ); ! stepIcons = stepIcons + makeIcon( s+1, steps[s].title ); } ! $('stepHeadings').innerHTML = stepHeadings; ! $('stepIcons').innerHTML = stepIcons; ! showStep(firstStep); } // Hide the current step and show the new step ! function showStep( stepNumber ) { if (stepNumber==currentStep) return; ! if (stepNumber==lastStep) $('nextButton').disabled=true; ! else $('nextButton').disabled=false; ! if (stepNumber==1) $('prevButton').disabled=true; ! else $('prevButton').disabled=false; ! if (currentStep > 0) { ! Element.hide('step'+currentStep+':head', 'step'+currentStep); ! $('step'+currentStep+':sel').className='inactive'; } if (stepNumber > 0) { ! Element.show('step'+stepNumber+':head', 'step'+stepNumber); ! $('step'+stepNumber+':sel').className='active'; } ! currentStep=stepNumber; } // Next step ! function nextStep( ) { if (currentStep>=lastStep) return; ! showStep( currentStep+1); ! self.scrollTo(0, 0); } // Previous step ! function prevStep( ) { if (currentStep<=1) return; ! showStep( currentStep-1); ! self.scrollTo(0, 0); } --- 4420,4488 ---- "Zoologist" ); ! function makeHeading( prefix, stepNumber, title ) { ! return '<span style="display:none" id="' + prefix + 'step' + stepNumber + ':head">Step ' + stepNumber + '- <strong>' + title + '</strong></span>'; } ! function makeIcon( prefix, stepNumber, title ) { ! return '<li><a title="' + title + '" id="' + prefix + 'step' + stepNumber + ':sel" class="inactive" href="#" onclick="showStep(\'' + prefix + '\', ' + stepNumber + ' );">' + stepNumber + '</a></li>'; } // Setup steps ! function setupWizSteps(prefix, firstStep) { ! $(prefix).setAttribute("currentStep", 0); ! $(prefix).setAttribute("help", ""); ! var steps = document.getElementsByClassName( "step" , prefix); ! $(prefix).setAttribute("lastStep", steps.length); var stepHeadings = ""; var stepIcons = ""; for ( var s=0; s < steps.length; s++) { ! steps[s].id = prefix+ 'step' + (s+1); Element.hide(steps[s]); ! stepHeadings = stepHeadings + makeHeading( prefix, s+1, steps[s].title ); ! stepIcons = stepIcons + makeIcon( prefix, s+1, steps[s].title ); } ! $(prefix+'stepHeadings').innerHTML = stepHeadings; ! $(prefix+'stepIcons').innerHTML = stepIcons; ! showStep(prefix, firstStep); } // Hide the current step and show the new step ! function showStep( prefix, stepNumber ) { ! var root = $(prefix); ! var currentStep = 1*root.getAttribute('currentStep'); ! var lastStep = 1*root.getAttribute('lastStep'); if (stepNumber==currentStep) return; ! if (stepNumber==lastStep) $(prefix+'nextButton').disabled=true; ! else $(prefix+'nextButton').disabled=false; ! if (stepNumber==1) $(prefix+'prevButton').disabled=true; ! else $(prefix+'prevButton').disabled=false; ! if (currentStep > 0) { ! Element.hide(prefix+'step'+currentStep+':head', prefix+'step'+currentStep); ! $(prefix+'step'+currentStep+':sel').className='inactive'; } if (stepNumber > 0) { ! Element.show(prefix+'step'+stepNumber+':head', prefix+'step'+stepNumber); ! $(prefix+'step'+stepNumber+':sel').className='active'; } ! root.setAttribute('currentStep', stepNumber); } // Next step ! function nextStep( prefix ) { ! var root = $(prefix); ! var currentStep = 1*root.getAttribute('currentStep'); ! var lastStep = 1*root.getAttribute('lastStep'); if (currentStep>=lastStep) return; ! showStep( prefix, currentStep+1); ! // self.scrollTo(0, 0); } // Previous step ! function prevStep( prefix ) { ! var root = $(prefix); ! var currentStep = 1*root.getAttribute('currentStep'); if (currentStep<=1) return; ! showStep( prefix, currentStep-1); ! // self.scrollTo(0, 0); } *************** *** 4506,4516 **** // Toggle help on the current step or selected fieldset/question ! function toggleHelp(fieldset) { if (fieldset!=null) { ! Element.toggle( fieldset + "Help" ); return; } ! if (currentStep!=0 && $('help'+currentStep) !=null) { ! Element.toggle( 'help'+currentStep ); } } --- 4514,4544 ---- // Toggle help on the current step or selected fieldset/question ! function toggleHelp(prefix, fieldset) { ! var root = $(prefix); if (fieldset!=null) { ! var help1 = root.getAttribute("help"); ! var help2 = $(prefix + fieldset + "Help"); ! if (help2==null) { ! root.setAttribute("help", ''); ! } else { ! root.setAttribute("help", help2.id); ! if (help1!='') { ! Element.hide( help1 ); ! if (help1==help2.id) { ! root.setAttribute("help", ''); ! return; ! } ! } ! } ! // alert( prefix + fieldset + " offsetTop=" + $(prefix + fieldset).offsetTop); ! // help.style.position = 'absolute'; ! // help2.style.top = $(prefix + fieldset).offsetTop + "px"; ! // help2.style.left = help2.offsetLeft + "px"; ! Element.show( help2 ); return; } ! var currentStep = 1*root.getAttribute('currentStep'); ! if (currentStep!=0 && $(prefix + 'help'+currentStep) !=null) { ! Element.toggle( prefix + 'help'+currentStep ); } } Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tolven6.js 15 Nov 2006 07:03:11 -0000 1.9 --- tolven6.js 29 Nov 2006 01:35:33 -0000 1.10 *************** *** 116,120 **** } ! // Add a dynamic menu item (just level 1 for now) function requestMenuItem( id ) { // Only do this if the leaf node has an object id (eg echr:patient-123) --- 116,120 ---- } ! // Add a dynamic menu item function requestMenuItem( id ) { // Only do this if the leaf node has an object id (eg echr:patient-123) *************** *** 188,191 **** --- 188,211 ---- } + // If visibleSubPage has been removed, we'll need to find another candidate + // In any case, recurse to the lowest level VSP. + function fixVisibleSubPage( id ) { + var content = $(id); + var vsp = content.getAttribute("visibleSubPage"); + if (vsp == null) return content; + if (vsp == '') return content; + if ($(vsp)!=null) return fixVisibleSubPage( vsp ); + // VSP no good, find another: Get the menu items + var lis = content.getElementsByTagName('li'); + for (var x = 0; x < lis.length; x++) { + if (lis[x].style!=null && lis[x].style.display!='none') { + var id2 = removeLast(lis[x].id); // Remove :sel + content.setAttribute( "visibleSubPage", id2); + return fixVisibleSubPage( id2 ); + } + } + return null; + } + function showPane( paneId ) { var pane = $(paneId); *************** *** 194,201 **** pane = addRemoteContent( paneId, paneId ); } ! var targetItem = pane; ! while ( targetItem.getAttribute("visibleSubPage") != null) { ! targetItem = $(targetItem.getAttribute("visibleSubPage")); ! } if (targetItem.id==visiblePage) return; hideContent(); --- 214,222 ---- pane = addRemoteContent( paneId, paneId ); } ! var targetItem = fixVisibleSubPage( pane ); ! // while ( targetItem.getAttribute("visibleSubPage") != null && targetItem.getAttribute("visibleSubPage")!='') { ! // targetItem = $(targetItem.getAttribute("visibleSubPage")); ! // if (targetItem==null) alert( "Bingo: Null targetItem on " + paneId ); ! // } if (targetItem.id==visiblePage) return; hideContent(); *************** *** 331,340 **** // Get the menu items var lis = content.getElementsByTagName('li'); ! if (lis.length > 0) { ! var id = removeLast(lis[0].id); ! // alert( "newContentArrived: " + contentId + " visibleSubPage: " + id ); ! visiblePage = id; ! content.setAttribute( "visibleSubPage", id); ! addRemoteContent( id, id ); } } --- 352,364 ---- // Get the menu items var lis = content.getElementsByTagName('li'); ! for (var x = 0; x < lis.length; x++) { ! if (lis[x].style!=null && lis[x].style.display!='none') { ! var id = removeLast(lis[x].id); ! // alert( "newContentArrived: " + contentId + " visibleSubPage: " + id ); ! visiblePage = id; ! content.setAttribute( "visibleSubPage", id); ! addRemoteContent( id, id ); ! break; ! } } } *************** *** 391,413 **** // We now need to find something to show other than what we're removing var n = displayableSibling( id ); - var np = removeLast( n.id ); visiblePage = "xx"; ! showPane( np ); // Now do the delete var idcomp = id + ":"; var e = document.body.getElementsByTagName('*'); for (var x=0; x < e.length;x++) { if (idcomp==e[x].id.substr( 0, idcomp.length )) { ! Element.remove( e[x] ); } } ! // Do a second pass making sure we got everything. ! var f = document.body.getElementsByTagName('*'); ! for (var x=0; x < f.length;x++) { ! if (idcomp==f[x].id.substr( 0, idcomp.length )) { ! Element.remove( f[x] ); ! } } Element.remove( id ); } --- 415,444 ---- // We now need to find something to show other than what we're removing var n = displayableSibling( id ); visiblePage = "xx"; ! var np; ! if (n!=null) { ! np = removeLast( n.id ); ! // alert( "Close 1 showing: " + np ); ! } else { ! np = removeLast( id ); ! // alert( "Close 2 showing: " + np ); ! } // Now do the delete var idcomp = id + ":"; + var removeList = new Array(); var e = document.body.getElementsByTagName('*'); for (var x=0; x < e.length;x++) { if (idcomp==e[x].id.substr( 0, idcomp.length )) { ! // alert( "Count: " + e.length + " Close pass one: " + e[x].id ); ! removeList.push( e[x] ); } } ! for (var y=0; y < removeList.length; y++) { ! var element = removeList[y]; ! if (element!=null) element.parentNode.removeChild(element); } Element.remove( id ); + + showPane( np ); } |
|
From: John C. <jc...@us...> - 2006-11-29 01:35:35
|
Update of /cvsroot/tolven/tolvenWEB/web/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29680/web/templates Modified Files: portalTemplate.xhtml Log Message: Add new wizard and new Patient menu structure Index: portalTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/portalTemplate.xhtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** portalTemplate.xhtml 6 Nov 2006 23:12:05 -0000 1.13 --- portalTemplate.xhtml 29 Nov 2006 01:35:33 -0000 1.14 *************** *** 12,15 **** --- 12,18 ---- href="#{facesContext.externalContext.request.contextPath}/styles/#{skin}.css" type="text/css" rel="stylesheet" /> + <link + href="#{facesContext.externalContext.request.contextPath}/styles/wizard.css" + type="text/css" rel="stylesheet" /> <script language="JavaScript" type="text/javascript" src="#{facesContext.externalContext.request.contextPath}/scripts/prototype.js"></script> *************** *** 18,21 **** --- 21,26 ---- <script language="JavaScript" type="text/javascript" src="#{facesContext.externalContext.request.contextPath}/scripts/tolven6.js"></script> + <script language="JavaScript" type="text/javascript" + src="#{facesContext.externalContext.request.contextPath}/scripts/tolvenwiz.js"></script> <script language="JavaScript" type="text/javascript"> // <![CDATA[ |
|
From: John C. <jc...@us...> - 2006-11-29 01:35:34
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29680/web/wizard Modified Files: gcs.xhtml bccIntake.xhtml wizTemplate.xhtml Log Message: Add new wizard and new Patient menu structure Index: gcs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/gcs.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gcs.xhtml 15 Nov 2006 07:03:11 -0000 1.1 --- gcs.xhtml 29 Nov 2006 01:35:32 -0000 1.2 *************** *** 15,37 **** <ui:param name="title" value="Glasgow Coma Scale"/> <ui:param name="author" value="Tolven"/> ! <ui:param name="subject" value="Cynthia Howard"/> <ui:define name="steps"> <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! function computeGCS( field ) { $(field.name + 'Val').value = field.value; ! if ($F('gcsEVal')=='' || $F('gcsVVal')=='' || $F('gcsMVal')=='') { ! $('gcsInterpret').value = '<incomplete>'; ! $('gcsScore').value = ''; return; } ! var score = (1 * $F('gcsMVal')) + ! (1 * $F('gcsVVal')) + ! (1 * $F('gcsEVal')); ! $('gcsScore').value = "GCS " + score + " = E" + $F('gcsEVal') + " V" + $F('gcsVVal') + " M" + $F('gcsMVal') + " at " + $F('gcsTVal'); ! if (score < 8) $('gcsInterpret').value = "Severe"; ! else if (score < 13) $('gcsInterpret').value = "Moderate"; ! else if (score < 15) $('gcsInterpret').value = "Minor"; ! else $('gcsInterpret').value = "Fully awake"; } // ]]> --- 15,38 ---- <ui:param name="title" value="Glasgow Coma Scale"/> <ui:param name="author" value="Tolven"/> ! <ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/> <ui:define name="steps"> <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! #{menu.elementLabel}computeGCS = function ( field ) { ! // alert("computeGCS" ); $(field.name + 'Val').value = field.value; ! if ($F('#{menu.element}-gcsEVal')=='' || $F('#{menu.element}-gcsVVal')=='' || $F('#{menu.element}-gcsMVal')=='') { ! $('#{menu.element}-gcsInterpret').value = '<incomplete>'; ! $('#{menu.element}-gcsScore').value = ''; return; } ! var score = (1 * $F('#{menu.element}-gcsMVal')) + ! (1 * $F('#{menu.element}-gcsVVal')) + ! (1 * $F('#{menu.element}-gcsEVal')); ! $('#{menu.element}-gcsScore').value = "GCS " + score + " = E" + $F('#{menu.element}-gcsEVal') + " V" + $F('#{menu.element}-gcsVVal') + " M" + $F('#{menu.element}-gcsMVal') + " at " + $F('#{menu.element}-gcsTVal'); ! if (score < 8) $('#{menu.element}-gcsInterpret').value = "Severe"; ! else if (score < 13) $('#{menu.element}-gcsInterpret').value = "Moderate"; ! else if (score < 15) $('#{menu.element}-gcsInterpret').value = "Minor"; ! else $('#{menu.element}-gcsInterpret').value = "Fully awake"; } // ]]> *************** *** 48,99 **** <div class="step" title="Glasgow Coma Scale" > <div class="pagesm"> ! <fieldset id="time"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> ! <legend>Assessment Time (T) </legend> ! <input id="gcsT" name="gcsT" readonly="true" type="text" value="" size="30"/><br /> ! <a href="javascript:addHours('gcsT',-1);computeGCS($('gcsT'));">-1h</a> ! <a href="javascript:addMinutes('gcsT',-5);computeGCS($('gcsT'));">-5m</a> ! <a href="javascript:setNow('gcsT');computeGCS($('gcsT'));">now</a> ! <a href="javascript:addMinutes('gcsT', 5);computeGCS($('gcsT'));">+5m</a> ! <a href="javascript:addHours('gcsT', 1);computeGCS($('gcsT'));">+1h</a> <br/> </fieldset> ! <fieldset id="eye"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('eye');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best eye response (E) </legend> ! <label><input name="gcsE" type="radio" value="4" onchange="computeGCS(this);"/>Eyes opening spontaneously</label><br /> ! <label><input name="gcsE" type="radio" value="3" onchange="computeGCS(this);"/>Eye opening to speech</label><br /> ! <label><input name="gcsE" type="radio" value="2" onchange="computeGCS(this);"/>Eye opening to pain</label><br /> ! <label><input name="gcsE" type="radio" value="1" onchange="computeGCS(this);"/>No eye opening</label><br /> ! <label><input name="gcsE" type="radio" value="" checked="checked" onchange="computeGCS(this);"/>Not assessed</label><br /> </fieldset> ! <fieldset id="verbal"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('verbal');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best verbal response (V) </legend> ! <label><input name="gcsV" type="radio" value="5" onchange="computeGCS(this);"/>Oriented</label><br /> ! <label><input name="gcsV" type="radio" value="4" onchange="computeGCS(this);"/>Confused</label><br /> ! <label><input name="gcsV" type="radio" value="3" onchange="computeGCS(this);"/>Inappropriate words</label><br /> ! <label><input name="gcsV" type="radio" value="2" onchange="computeGCS(this);"/>Incomprehensible sounds</label><br /> ! <label><input name="gcsV" type="radio" value="1" onchange="computeGCS(this);"/>None</label><br /> ! <label><input name="gcsV" type="radio" value="" checked="checked" onchange="computeGCS(this);"/>Not assessed</label><br /> </fieldset> ! <fieldset id="motor"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('motor');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best motor response (M) </legend> ! <label><input name="gcsM" type="radio" value="6" onchange="computeGCS(this);"/>Obeys commands</label><br /> ! <label><input name="gcsM" type="radio" value="5" onchange="computeGCS(this);" />Localizes to pain</label><br /> ! <label><input name="gcsM" type="radio" value="4" onchange="computeGCS(this);" />Withdraws from pain</label><br /> ! <label><input name="gcsM" type="radio" value="3" onchange="computeGCS(this);" />Flexion to pain</label><br /> ! <label><input name="gcsM" type="radio" value="2" onchange="computeGCS(this);" />Extension to pain</label><br /> ! <label><input name="gcsM" type="radio" value="1" onchange="computeGCS(this);" />No motor response</label><br /> ! <label><input name="gcsM" type="radio" value="" checked="checked" onchange="computeGCS(this);"/>Not assessed</label><br /> </fieldset> </div> ! <div class="help" id="timeHelp" style="display:none"> <h1>Assessment Time</h1> <p>The time when the assessment was done, accurate to 5 minutes.</p> <p>Use the +/- controls to adjust the assessment time. Now resets the time to now.</p> </div> ! <div class="help" id="eyeHelp" style="display:none"> <h1>Eye Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> --- 49,100 ---- <div class="step" title="Glasgow Coma Scale" > <div class="pagesm"> ! <fieldset id="#{menu.element}-time"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> ! <legend>Assessment Time (T)</legend> ! <input id="#{menu.element}-gcsT" name="#{menu.element}-gcsT" readonly="true" type="text" value="" size="30"/><br /> ! <a href="javascript:addHours('#{menu.element}-gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.element}-gcsT'));">-1h</a> ! <a href="javascript:addMinutes('#{menu.element}-gcsT',-5);#{menu.elementLabel}computeGCS($('#{menu.element}-gcsT'));">-5m</a> ! <a href="javascript:setNow('#{menu.element}-gcsT');#{menu.elementLabel}computeGCS($('#{menu.element}-gcsT'));">now</a> ! <a href="javascript:addMinutes('#{menu.element}-gcsT', 5);#{menu.elementLabel}computeGCS($('#{menu.element}-gcsT'));">+5m</a> ! <a href="javascript:addHours('#{menu.element}-gcsT', 1);#{menu.elementLabel}computeGCS($('#{menu.element}-gcsT'));">+1h</a> <br/> </fieldset> ! <fieldset id="#{menu.element}-eye"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','eye');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best eye response (E) </legend> ! <label><input name="#{menu.element}-gcsE" type="radio" value="4" onchange="#{menu.elementLabel}computeGCS(this);"/>Eyes opening spontaneously</label><br /> ! <label><input name="#{menu.element}-gcsE" type="radio" value="3" onchange="#{menu.elementLabel}computeGCS(this);"/>Eye opening to speech</label><br /> ! <label><input name="#{menu.element}-gcsE" type="radio" value="2" onchange="#{menu.elementLabel}computeGCS(this);"/>Eye opening to pain</label><br /> ! <label><input name="#{menu.element}-gcsE" type="radio" value="1" onchange="#{menu.elementLabel}computeGCS(this);"/>No eye opening</label><br /> ! <label><input name="#{menu.element}-gcsE" type="radio" value="" checked="checked" onchange="#{menu.elementLabel}computeGCS(this);"/>Not assessed</label><br /> </fieldset> ! <fieldset id="#{menu.element}-verbal"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','verbal');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best verbal response (V) </legend> ! <label><input name="#{menu.element}-gcsV" type="radio" value="5" onchange="#{menu.elementLabel}computeGCS(this);"/>Oriented</label><br /> ! <label><input name="#{menu.element}-gcsV" type="radio" value="4" onchange="#{menu.elementLabel}computeGCS(this);"/>Confused</label><br /> ! <label><input name="#{menu.element}-gcsV" type="radio" value="3" onchange="#{menu.elementLabel}computeGCS(this);"/>Inappropriate words</label><br /> ! <label><input name="#{menu.element}-gcsV" type="radio" value="2" onchange="#{menu.elementLabel}computeGCS(this);"/>Incomprehensible sounds</label><br /> ! <label><input name="#{menu.element}-gcsV" type="radio" value="1" onchange="#{menu.elementLabel}computeGCS(this);"/>None</label><br /> ! <label><input name="#{menu.element}-gcsV" type="radio" value="" checked="checked" onchange="#{menu.elementLabel}computeGCS(this);"/>Not assessed</label><br /> </fieldset> ! <fieldset id="#{menu.element}-motor"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','motor');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Best motor response (M) </legend> ! <label><input name="#{menu.element}-gcsM" type="radio" value="6" onchange="#{menu.elementLabel}computeGCS(this);"/>Obeys commands</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="5" onchange="#{menu.elementLabel}computeGCS(this);" />Localizes to pain</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="4" onchange="#{menu.elementLabel}computeGCS(this);" />Withdraws from pain</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="3" onchange="#{menu.elementLabel}computeGCS(this);" />Flexion to pain</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="2" onchange="#{menu.elementLabel}computeGCS(this);" />Extension to pain</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="1" onchange="#{menu.elementLabel}computeGCS(this);" />No motor response</label><br /> ! <label><input name="#{menu.element}-gcsM" type="radio" value="" checked="checked" onchange="#{menu.elementLabel}computeGCS(this);"/>Not assessed</label><br /> </fieldset> </div> ! <div class="help" id="#{menu.element}-timeHelp" style="display:none"> <h1>Assessment Time</h1> <p>The time when the assessment was done, accurate to 5 minutes.</p> <p>Use the +/- controls to adjust the assessment time. Now resets the time to now.</p> </div> ! <div class="help" id="#{menu.element}-eyeHelp" style="display:none"> <h1>Eye Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> *************** *** 101,105 **** supraorbital and sternal pressure/rub.</p> </div> ! <div class="help" id="verbalHelp" style="display:none"> <h1>Verbal Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> --- 102,106 ---- supraorbital and sternal pressure/rub.</p> </div> ! <div class="help" id="#{menu.element}-verbalHelp" style="display:none"> <h1>Verbal Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> *************** *** 107,111 **** supraorbital and sternal pressure/rub.</p> </div> ! <div class="help" id="motorHelp" style="display:none"> <h1>Motor Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> --- 108,112 ---- supraorbital and sternal pressure/rub.</p> </div> ! <div class="help" id="#{menu.element}-motorHelp" style="display:none"> <h1>Motor Response</h1> <p>Do not confuse "Eye opening to speech" with an awaking of a sleeping person which would score 4, not 3.</p> *************** *** 116,142 **** <div class="step" title="Finish"> <div class="pagesm"> ! <fieldset id="Score"> <legend>Score </legend> ! <label><input id="gcsTVal" name="gcsTVal" readonly="true" type="text" size="30"/> Time</label><br /> ! <label><input id="gcsEVal" name="gcsEVal" readonly="true" type="text" style="text-align:right" size="4"/> Eye Score</label><br /> ! <label><input id="gcsVVal" name="gcsVVal" readonly="true" type="text" style="text-align:right" size="4"/> Verbal Score</label><br /> ! <label><input id="gcsMVal" name="gcsMVal" readonly="true" type="text" style="text-align:right" size="4"/> Motor Score</label><br /> ! <label><input id="gcsScore" name="gcsScore" readonly="true" type="text" size="60"/> Total Score </label><br /> </fieldset> ! <fieldset id="interpretation"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('interpretation');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Interpretation </legend> ! <label><input id="gcsInterpret" name="gcsInterpret" type="text" readonly="true" /> Computed</label><br /> </fieldset> ! <fieldset id="submission"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('submission');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Submission </legend> ! <label><input id="author" name="author" type="text" readonly="true" value="#{top.tp.givenName} #{top.tp.sn}"/> Author</label><br /> ! <label><input id="time" name="time" type="text" size="30" readonly="true" value="#{top.serverTime}"/> Submission Time</label><br /> <input type="submit" value="Submit" disabled="true" /> ! <div id="rslt" style="width:100%; height:3em; background-color:#FFFFDD;"/> </fieldset> </div> ! <div class="help" id="interpretationHelp" style="display:none"> <h1>Interpretation</h1> <p>Generally, comas are classified as:</p> --- 117,143 ---- <div class="step" title="Finish"> <div class="pagesm"> ! <fieldset id="#{menu.element}-Score"> <legend>Score </legend> ! <label><input id="#{menu.element}-gcsTVal" name="#{menu.element}-gcsTVal" readonly="true" type="text" size="30"/> Time</label><br /> ! <label><input id="#{menu.element}-gcsEVal" name="#{menu.element}-gcsEVal" readonly="true" type="text" style="text-align:right" size="4"/> Eye Score</label><br /> ! <label><input id="#{menu.element}-gcsVVal" name="#{menu.element}-gcsVVal" readonly="true" type="text" style="text-align:right" size="4"/> Verbal Score</label><br /> ! <label><input id="#{menu.element}-gcsMVal" name="#{menu.element}-gcsMVal" readonly="true" type="text" style="text-align:right" size="4"/> Motor Score</label><br /> ! <label><input id="#{menu.element}-gcsScore" name="#{menu.element}-gcsScore" readonly="true" type="text" size="60"/> Total Score </label><br /> </fieldset> ! <fieldset id="#{menu.element}-interpretation"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','interpretation');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Interpretation </legend> ! <label><input id="#{menu.element}-gcsInterpret" name="#{menu.element}-gcsInterpret" type="text" readonly="true" /> Computed</label><br /> </fieldset> ! <fieldset id="#{menu.element}-submission"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.element}-','submission');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Submission </legend> ! <label><input id="#{menu.element}-author" name="#{menu.element}-author" type="text" readonly="true" value="#{top.tp.givenName} #{top.tp.sn}"/> Author</label><br /> ! <label><input id="#{menu.element}-time" name="#{menu.element}-time" type="text" size="30" readonly="true" value="#{top.serverTime}"/> Submission Time</label><br /> <input type="submit" value="Submit" disabled="true" /> ! <div id="#{menu.element}-rslt" style="width:100%; height:3em; background-color:#FFFFDD;"/> </fieldset> </div> ! <div class="help" id="#{menu.element}-interpretationHelp" style="display:none"> <h1>Interpretation</h1> <p>Generally, comas are classified as:</p> *************** *** 150,154 **** </div> ! <div class="help" id="submissionHelp" style="display:none"> <h1>Submission</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. --- 151,155 ---- </div> ! <div class="help" id="#{menu.element}-submissionHelp" style="display:none"> <h1>Submission</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. Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wizTemplate.xhtml 15 Nov 2006 07:03:11 -0000 1.2 --- wizTemplate.xhtml 29 Nov 2006 01:35:32 -0000 1.3 *************** *** 25,57 **** </head> <body> <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! window.onload=function() { ! setupWizSteps(1); ! ! } // ]]> </script> ! <div class="wizard"> <form onsubmit="return false;"> ! <div class="titlebar" style="display:none"> ! <table width="100%"> ! <tbody> ! <tr> ! <td>#{title}</td> ! <td><div class="alignright"><a href="#"><img src="../images/btn_closewindow.jpg"/></a></div></td> ! </tr> ! </tbody> ! </table> ! </div> ! <div class="infobar" style="display:none"> <table width="100%"> <tbody> <tr> ! <td class="name"> ! For: #{subject} ! </td> ! <td class="alignright">Template provided by #{author}</td> </tr> </tbody> --- 25,46 ---- </head> <body> + <ui:composition> <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! $('#{menu.element}-').setAttribute( 'currentStep', 0 ); ! $('#{menu.element}-').setAttribute( 'lastStep', 0 ); ! setupWizSteps('#{menu.element}-', 1); // ]]> </script> ! <div class="wizard" id="#{menu.element}-"> <form onsubmit="return false;"> ! <div class="infobar" > <table width="100%"> <tbody> <tr> ! <td width="30%" class="name">#{subject}</td> ! <td width="34%" class="infotitle">#{title}</td> ! <td width="30%" class="author">Template provided by #{author}</td> </tr> </tbody> *************** *** 63,73 **** <tbody> <tr> ! <td width="300px" id="stepHeadings"/> <td align="center"> ! <ul id="stepIcons"/> </td> <td width="50px"> <div align="right" title="Toggle Help"> ! <a href="#" onclick="toggleHelp();"> <img src="../images/img_help.jpg" border="0" /> </a> --- 52,62 ---- <tbody> <tr> ! <td width="300px" id="#{menu.element}-stepHeadings"/> <td align="center"> ! <ul id="#{menu.element}-stepIcons"/> </td> <td width="50px"> <div align="right" title="Toggle Help"> ! <a href="#" onclick="toggleHelp('#{menu.element}-');"> <img src="../images/img_help.jpg" border="0" /> </a> *************** *** 89,96 **** <table width="100%"> <tr> ! <td align="center"> ! <input id="stopButton" type="submit" value="Stop" style="display:none"/> ! <input id="prevButton" type="submit" value="Previous" onclick="prevStep( );"/> ! <input id="nextButton" type="submit" value="Next" onclick="nextStep( );"/> </td> </tr> --- 78,85 ---- <table width="100%"> <tr> ! <td align="center" > ! <input id="#{menu.element}-stopButton" type="submit" value="Stop" style="display:none"/> ! <input id="#{menu.element}-prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.element}-' );self.scrollTo(0, 0);"/> ! <input id="#{menu.element}-nextButton" type="submit" value="Next" onclick="nextStep('#{menu.element}-' );self.scrollTo(0, 0);"/> </td> </tr> *************** *** 99,102 **** --- 88,92 ---- </form> </div> + </ui:composition> </body> </html> \ No newline at end of file Index: bccIntake.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/bccIntake.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bccIntake.xhtml 15 Nov 2006 07:03:11 -0000 1.3 --- bccIntake.xhtml 29 Nov 2006 01:35:32 -0000 1.4 *************** *** 39,45 **** <div class="step" title="About Me" > <div class="pagesm"> ! <fieldset id="identity"> <legend>Identity </legend> ! <div class="value" align="right" style="margin-top:5px; padding-top:5px; float:right"><a href="javascript:toggleEditOn('identity');">Edit</a></div> <label><span class="title">First Name:</span> <span class="value">Cynthia</span> <span class="edit" style="display:none"><input type="text" name="firstName" value="Cynthia"/></span></label><br/> <label><span class="title">Middle Name:</span> <span class="value">B</span><span class="edit" style="display:none"><input type="text" name="middleName" value="B"/></span></label><br/> --- 39,45 ---- <div class="step" title="About Me" > <div class="pagesm"> ! <fieldset id="#{menu.element}-identity"> <legend>Identity </legend> ! <div class="value" align="right" style="margin-top:5px; padding-top:5px; float:right"><a href="javascript:toggleEditOn('#{menu.element}-identity');">Edit</a></div> <label><span class="title">First Name:</span> <span class="value">Cynthia</span> <span class="edit" style="display:none"><input type="text" name="firstName" value="Cynthia"/></span></label><br/> <label><span class="title">Middle Name:</span> <span class="value">B</span><span class="edit" style="display:none"><input type="text" name="middleName" value="B"/></span></label><br/> *************** *** 54,62 **** </div> <div class="edit" align="right" style="margin-top:3px;display:none"> ! <a href="javascript:toggleEditOff('identity');">Finished Editing</a> </div> </fieldset> ! <fieldset id="q42" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q42');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q42');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Race/Ethnicity</legend> <p>How would you best describe your racial/ethnic background? --- 54,62 ---- </div> <div class="edit" align="right" style="margin-top:3px;display:none"> ! <a href="javascript:toggleEditOff('#{menu.element}-identity');">Finished Editing</a> </div> </fieldset> ! <fieldset id="#{menu.element}-q42" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q42');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q42');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Race/Ethnicity</legend> <p>How would you best describe your racial/ethnic background? *************** *** 93,97 **** <tr> <td><label><input name="Chinese" type="checkbox" value="8" />Chinese</label></td> ! <td><label><input id="other" name="Other" type="checkbox" value="18" onclick="toggleDetail( this );"/>Other</label><input style="display:none" name="otherDetail" id="otherDetail" type="text" size="20" /></td> </tr> <tr> --- 93,97 ---- <tr> <td><label><input name="Chinese" type="checkbox" value="8" />Chinese</label></td> ! <td><label><input id="#{menu.element}-other" name="Other" type="checkbox" value="18" onclick="toggleDetail( this );"/>Other</label><input style="display:none" name="otherDetail" id="#{menu.element}-otherDetail" type="text" size="20" /></td> </tr> <tr> *************** *** 106,111 **** </table> </fieldset> ! <fieldset id="q43" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q43');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Jewish Descent</legend> <p>Are you of Ashkenazi Jewish Descent?</p> --- 106,111 ---- </table> </fieldset> ! <fieldset id="#{menu.element}-q43" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q43');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Jewish Descent</legend> <p>Are you of Ashkenazi Jewish Descent?</p> *************** *** 114,131 **** <label><input name="jewish" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="q44" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q44');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Relationship</legend> <p>What is your current relationship status?</p> ! <label><input name="relationship" type="radio" value="single" onclick="Element.hide('relOtherDetail');"/>Single</label><br /> ! <label><input name="relationship" type="radio" value="married" onclick="Element.hide('relOtherDetail');"/>Married</label><br /> ! <label><input name="relationship" type="radio" value="partnered" onclick="Element.hide('relOtherDetail');"/>Partnered</label><br /> ! <label><input name="relationship" type="radio" value="Divorced" onclick="Element.hide('relOtherDetail');"/>Divorced</label><br /> ! <label><input name="relationship" type="radio" value="widowed" onclick="Element.hide('relOtherDetail');"/>Widowed</label><br /> ! <label><input id="relOther" name="relationship" type="radio" value="other" onclick="Element.show('relOtherDetail');"/>Other</label> ! <input style="display:none" name="relOtherDetail" id="relOtherDetail" type="text" size="20" /><br /> </fieldset> ! <fieldset id="q45" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q45');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Responsibilities</legend> <p>Are you are the primary caretaker for anyone living in your home?</p> --- 114,131 ---- <label><input name="jewish" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="#{menu.element}-q44" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q44');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Relationship</legend> <p>What is your current relationship status?</p> ! <label><input name="relationship" type="radio" value="single" onclick="Element.hide('#{menu.element}-relOtherDetail');"/>Single</label><br /> ! <label><input name="relationship" type="radio" value="married" onclick="Element.hide('#{menu.element}-relOtherDetail');"/>Married</label><br /> ! <label><input name="relationship" type="radio" value="partnered" onclick="Element.hide('#{menu.element}-relOtherDetail');"/>Partnered</label><br /> ! <label><input name="relationship" type="radio" value="Divorced" onclick="Element.hide('#{menu.element}-relOtherDetail');"/>Divorced</label><br /> ! <label><input name="relationship" type="radio" value="widowed" onclick="Element.hide('#{menu.element}-relOtherDetail');"/>Widowed</label><br /> ! <label><input id="#{menu.element}-relOther" name="relationship" type="radio" value="other" onclick="Element.show('#{menu.element}-relOtherDetail');"/>Other</label> ! <input style="display:none" name="relOtherDetail" id="#{menu.element}-relOtherDetail" type="text" size="20" /><br /> </fieldset> ! <fieldset id="#{menu.element}-q45" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q45');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Responsibilities</legend> <p>Are you are the primary caretaker for anyone living in your home?</p> *************** *** 134,139 **** <label><input name="caretaker" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="q46" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q46');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Care</legend> <p>Are there people living in your home who could care for you, if necessary?</p> --- 134,139 ---- <label><input name="caretaker" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="#{menu.element}-q46" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q46');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Care</legend> <p>Are there people living in your home who could care for you, if necessary?</p> *************** *** 142,181 **** <label><input name="care" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="q47" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q47');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Work</legend> <p>What is your current occupation?</p> <table cellpadding="0" cellspacing="0" border="0"> <tr><td>Occupation: </td><td> ! <input type="text" id="occupation" name="occupation" choices="occupations" value="" size="40" autocomplete="off" onfocus="fieldChanged(this, this.value);" onblur="validate(this, this.value);" onkeyup="if (event.keyCode==40) $(this.id + 'List').focus();"/> </td></tr> ! <tr><td> </td><td id="occChoices"> ! <select id="occupationList" name="occupationList" size="10" onclick="selectionMade('occupation', this);" onkeypress="if (event.keyCode==13) selectionMade('occupation', this);" style="display:none"/> </td> </tr> </table> <p>What is your work status, either paid or unpaid?</p> ! <label><input name="workStatus" type="radio" value="fullTime" onclick="Element.show('workAtHome', 'caregiver');" />Full time (more than 32 hours a week)</label><br /> ! <label><input name="workStatus" type="radio" value="partTime" onclick="Element.show('workAtHome', 'caregiver');"/>Part time (32 hours or less per week)</label><br /> ! <label><input name="workStatus" type="radio" value="onLeave" onclick="Element.hide('workAtHome', 'caregiver');"/>On medical leave</label><br /> ! <label><input name="workStatus" type="radio" value="unemployed" onclick="Element.hide('workAtHome', 'caregiver');"/>Unemployed</label><br /> ! <label><input name="workStatus" type="radio" value="retired" onclick="Element.hide('workAtHome', 'caregiver');"/>Retired</label><br /> ! <label id="workAtHome" style="display:none"><input name="workAtHome" type="checkbox" value="workAtHome" />Do you work at home?</label><br /> ! <label id="caregiver" style="display:none"><input name="caregiver" type="checkbox" value="caregiver" />Are you a caregiver?</label><br /> </fieldset> ! <fieldset id="q48" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q48');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Education</legend> <p>What is the highest education level you have achieved?</p> ! <label><input name="education" type="radio" value="hs" onclick="Element.hide('eduOtherDetail');"/>Some high school</label><br /> ! <label><input name="education" type="radio" value="hsg" onclick="Element.hide('eduOtherDetail');"/>High school graduate or completed GED</label><br /> ! <label><input name="education" type="radio" value="c" onclick="Element.hide('eduOtherDetail');"/>Some college or technical school</label><br /> ! <label><input name="education" type="radio" value="cg" onclick="Element.hide('eduOtherDetail');"/>College</label><br /> ! <label><input name="education" type="radio" value="pg" onclick="Element.hide('eduOtherDetail');"/>Post college or graduate school</label><br /> ! <label><input name="education" type="radio" value="other" onclick="Element.show('eduOtherDetail');"/>Other </label> ! <input style="display:none" name="eduOtherDetail" id="eduOtherDetail" type="text" size="20" /><br /> </fieldset> </div> ! <div class="help" id="help2" style="display:none"> <h1>Help</h1> <p>Providing this information prior to your visit will avoid delays prior to --- 142,181 ---- <label><input name="care" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="#{menu.element}-q47" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q47');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Work</legend> <p>What is your current occupation?</p> <table cellpadding="0" cellspacing="0" border="0"> <tr><td>Occupation: </td><td> ! <input type="text" id="#{menu.element}-occupation" name="occupation" choices="occupations" value="" size="40" autocomplete="off" onfocus="fieldChanged(this, this.value);" onblur="validate(this, this.value);" onkeyup="if (event.keyCode==40) $(this.id + 'List').focus();"/> </td></tr> ! <tr><td> </td><td id="#{menu.element}-occChoices"> ! <select id="#{menu.element}-occupationList" name="occupationList" size="10" onclick="selectionMade('occupation', this);" onkeypress="if (event.keyCode==13) selectionMade('occupation', this);" style="display:none"/> </td> </tr> </table> <p>What is your work status, either paid or unpaid?</p> ! <label><input name="workStatus" type="radio" value="fullTime" onclick="Element.show('#{menu.element}-workAtHome', '#{menu.element}-caregiver');" />Full time (more than 32 hours a week)</label><br /> ! <label><input name="workStatus" type="radio" value="partTime" onclick="Element.show('#{menu.element}-workAtHome', '#{menu.element}-caregiver');"/>Part time (32 hours or less per week)</label><br /> ! <label><input name="workStatus" type="radio" value="onLeave" onclick="Element.hide('#{menu.element}-workAtHome', '#{menu.element}-caregiver');"/>On medical leave</label><br /> ! <label><input name="workStatus" type="radio" value="unemployed" onclick="Element.hide('#{menu.element}-workAtHome', '#{menu.element}-caregiver');"/>Unemployed</label><br /> ! <label><input name="workStatus" type="radio" value="retired" onclick="Element.hide('#{menu.element}-workAtHome', '#{menu.element}-caregiver');"/>Retired</label><br /> ! <label id="#{menu.element}-workAtHome" style="display:none"><input name="workAtHome" type="checkbox" value="workAtHome" />Do you work at home?</label><br /> ! <label id="#{menu.element}-caregiver" style="display:none"><input name="caregiver" type="checkbox" value="caregiver" />Are you a caregiver?</label><br /> </fieldset> ! <fieldset id="#{menu.element}-q48" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q48');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Education</legend> <p>What is the highest education level you have achieved?</p> ! <label><input name="education" type="radio" value="hs" onclick="Element.hide('#{menu.element}-eduOtherDetail');"/>Some high school</label><br /> ! <label><input name="education" type="radio" value="hsg" onclick="Element.hide('#{menu.element}-eduOtherDetail');"/>High school graduate or completed GED</label><br /> ! <label><input name="education" type="radio" value="c" onclick="Element.hide('#{menu.element}-eduOtherDetail');"/>Some college or technical school</label><br /> ! <label><input name="education" type="radio" value="cg" onclick="Element.hide('#{menu.element}-eduOtherDetail');"/>College</label><br /> ! <label><input name="education" type="radio" value="pg" onclick="Element.hide('#{menu.element}-eduOtherDetail');"/>Post college or graduate school</label><br /> ! <label><input name="education" type="radio" value="other" onclick="Element.show('#{menu.element}-eduOtherDetail');"/>Other </label> ! <input style="display:none" name="eduOtherDetail" id="#{menu.element}-eduOtherDetail" type="text" size="20" /><br /> </fieldset> </div> ! <div class="help" id="#{menu.element}-help2" style="display:none"> <h1>Help</h1> <p>Providing this information prior to your visit will avoid delays prior to *************** *** 191,234 **** <div class="step" title="Why I am here today"> <div class="pagesm"> ! <fieldset id="q51" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q51');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Reason for Visit</legend> <p>What is the reason for today's visit (please choose the one that best applies)?</p> ! <label><input name="visitReason" type="radio" value="hrc" onclick="Element.hide('visitReasonDetail');"/>High risk consultation</label><br /> ! <label><input name="visitReason" type="radio" value="ebl" onclick="Element.hide('visitReasonDetail');"/>Evaluation of breast lump</label><br /> ! <label><input name="visitReason" type="radio" value="amr" onclick="Element.hide('visitReasonDetail');"/>Abnormal mammogram result</label><br /> ! <label><input name="visitReason" type="radio" value="cbc" onclick="Element.hide('visitReasonDetail');"/>Consultation for breast cancer diagnosis or ongoing breast cancer treatment</label><br /> ! <label><input name="visitReason" type="radio" value="se" onclick="Element.hide('visitReasonDetail');"/>Surgical evaluation for new breast cancer diagnosis</label><br /> ! <label><input name="visitReason" type="radio" value="oe" onclick="Element.hide('visitReasonDetail');"/>Oncology evaluation for new breast cancer diagnosis</label><br /> ! <label><input name="visitReason" type="radio" value="other" onclick="Element.show('visitReasonDetail');"/>Other </label> ! <input style="display:none" name="visitReasonDetail" id="visitReasonDetail" type="text" size="40" /><br /> </fieldset> ! <fieldset id="q52" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q52');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>History of Breast Cancer</legend> <p>Have you ever had breast cancer?</p> ! <label><input name="bchx" type="radio" value="no" onclick="Element.show('bceval');"/>No</label><br /> ! <label><input name="bchx" type="radio" value="yes" onclick="Element.hide('bceval');Element.show('bcDetail' );" />Yes</label><br /> ! <div id="bceval" style="display:none;margin-left:20px"> <p>Have you ever been evaluated for a breast lump or had other breast-related procedures?</p> ! <label><input name="bcpx" type="radio" value="no" onclick="Element.hide('bcDetail');"/>No</label><br /> ! <label><input name="bcpx" type="radio" value="yes" onclick="Element.show('bcDetail');" />Yes</label><br /> </div> </fieldset> ! <div id="bcDetail" style="display:none"> ! <fieldset id="q53" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q53');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Breast-Related Diagnostic Procedures</legend> <p>Please indicate which of the following breast procedures you have had and the outcome.</p> ! <label><input id="fnab" name="fnab" type="checkbox" value="fnab" onclick="toggleDetail( this );"/>Fine Needle Aspiration Biopsy</label><br /> ! <div id="fnabDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y)</span> <input name="fnabDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt" type="checkbox" value="left" />Left <input name="fnabRt" type="checkbox" value="right" />Right</label><br/> ! <div id="fnabDetail2x"><a href="javascript:Element.hide('fnabDetail2x');Element.show('fnabDetail2');">Another Fine Needle Aspiration Biopsy</a></div> ! <div id="fnabDetail2" style="display:none"> <label><span class="title">Date (m/y):</span> <input name="fnabDate2" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt2" type="checkbox" value="left" />Left <input name="fnabRt2" type="checkbox" value="right" />Right</label><br/> ! <div id="fnabDetail3x"><a href="javascript:Element.hide('fnabDetail3x');Element.show('fnabDetail3');">Another Fine Needle Aspiration Biopsy</a></div> ! <div id="fnabDetail3" style="display:none"> <label><span class="title">Date (m/y):</span> <input name="fnabDate3" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt3" type="checkbox" value="left" />Left <input name="fnabRt3" type="checkbox" value="right" />Right</label><br/> --- 191,234 ---- <div class="step" title="Why I am here today"> <div class="pagesm"> ! <fieldset id="#{menu.element}-q51" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q51');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Reason for Visit</legend> <p>What is the reason for today's visit (please choose the one that best applies)?</p> ! <label><input name="visitReason" type="radio" value="hrc" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>High risk consultation</label><br /> ! <label><input name="visitReason" type="radio" value="ebl" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>Evaluation of breast lump</label><br /> ! <label><input name="visitReason" type="radio" value="amr" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>Abnormal mammogram result</label><br /> ! <label><input name="visitReason" type="radio" value="cbc" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>Consultation for breast cancer diagnosis or ongoing breast cancer treatment</label><br /> ! <label><input name="visitReason" type="radio" value="se" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>Surgical evaluation for new breast cancer diagnosis</label><br /> ! <label><input name="visitReason" type="radio" value="oe" onclick="Element.hide('#{menu.element}-visitReasonDetail');"/>Oncology evaluation for new breast cancer diagnosis</label><br /> ! <label><input name="visitReason" type="radio" value="other" onclick="Element.show('#{menu.element}-visitReasonDetail');"/>Other </label> ! <input style="display:none" name="visitReasonDetail" id="#{menu.element}-visitReasonDetail" type="text" size="40" /><br /> </fieldset> ! <fieldset id="#{menu.element}-q52" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q52');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>History of Breast Cancer</legend> <p>Have you ever had breast cancer?</p> ! <label><input name="bchx" type="radio" value="no" onclick="Element.show('#{menu.element}-bceval');"/>No</label><br /> ! <label><input name="bchx" type="radio" value="yes" onclick="Element.hide('#{menu.element}-bceval');Element.show('#{menu.element}-bcDetail' );" />Yes</label><br /> ! <div id="#{menu.element}-bceval" style="display:none;margin-left:20px"> <p>Have you ever been evaluated for a breast lump or had other breast-related procedures?</p> ! <label><input name="bcpx" type="radio" value="no" onclick="Element.hide('#{menu.element}-bcDetail');"/>No</label><br /> ! <label><input name="bcpx" type="radio" value="yes" onclick="Element.show('#{menu.element}-bcDetail');" />Yes</label><br /> </div> </fieldset> ! <div id="#{menu.element}-bcDetail" style="display:none"> ! <fieldset id="#{menu.element}-q53" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q53');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Breast-Related Diagnostic Procedures</legend> <p>Please indicate which of the following breast procedures you have had and the outcome.</p> ! <label><input id="#{menu.element}-fnab" name="fnab" type="checkbox" value="fnab" onclick="toggleDetail( this );"/>Fine Needle Aspiration Biopsy</label><br /> ! <div id="#{menu.element}-fnabDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y)</span> <input name="fnabDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt" type="checkbox" value="left" />Left <input name="fnabRt" type="checkbox" value="right" />Right</label><br/> ! <div id="#{menu.element}-fnabDetail2x"><a href="javascript:Element.hide('#{menu.element}-fnabDetail2x');Element.show('#{menu.element}-fnabDetail2');">Another Fine Needle Aspiration Biopsy</a></div> ! <div id="#{menu.element}-fnabDetail2" style="display:none"> <label><span class="title">Date (m/y):</span> <input name="fnabDate2" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt2" type="checkbox" value="left" />Left <input name="fnabRt2" type="checkbox" value="right" />Right</label><br/> ! <div id="#{menu.element}-fnabDetail3x"><a href="javascript:Element.hide('#{menu.element}-fnabDetail3x');Element.show('#{menu.element}-fnabDetail3');">Another Fine Needle Aspiration Biopsy</a></div> ! <div id="#{menu.element}-fnabDetail3" style="display:none"> <label><span class="title">Date (m/y):</span> <input name="fnabDate3" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="fnabLt3" type="checkbox" value="left" />Left <input name="fnabRt3" type="checkbox" value="right" />Right</label><br/> *************** *** 236,252 **** </div> </div><br/> ! <label><input id="cb" name="cb" type="checkbox" value="cb" onclick="toggleDetail( this );"/>Core Biopsy</label><br /> ! <div id="cbDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="cbDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="cbLt" type="checkbox" value="left" />Left <input name="cbRt" type="checkbox" value="right" />Right</label> </div><br/> ! <label><input id="sb" name="sb" type="checkbox" value="sb" onclick="toggleDetail( this );"/>Excisional/Surgical Biopsy</label><br /> ! <div id="sbDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="sbDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="sbLt" type="checkbox" value="left" />Left <input name="sbRt" type="checkbox" value="right" />Right</label> </div> </fieldset> ! <fieldset id="q55" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q55');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Hormone Status</legend> <p>ER Positive?</p> --- 236,252 ---- </div> </div><br/> ! <label><input id="#{menu.element}-cb" name="cb" type="checkbox" value="cb" onclick="toggleDetail( this );"/>Core Biopsy</label><br /> ! <div id="#{menu.element}-cbDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="cbDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="cbLt" type="checkbox" value="left" />Left <input name="cbRt" type="checkbox" value="right" />Right</label> </div><br/> ! <label><input id="#{menu.element}-sb" name="sb" type="checkbox" value="sb" onclick="toggleDetail( this );"/>Excisional/Surgical Biopsy</label><br /> ! <div id="#{menu.element}-sbDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="sbDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="sbLt" type="checkbox" value="left" />Left <input name="sbRt" type="checkbox" value="right" />Right</label> </div> </fieldset> ! <fieldset id="#{menu.element}-q55" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q55');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Hormone Status</legend> <p>ER Positive?</p> *************** *** 263,316 **** <label><input name="her2" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="q56" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q56');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Breast-related Therapy and Procedures</legend> ! <label><input id="lump" name="lump" type="checkbox" value="lump" onclick="toggleDetail( this );"/>Lumpectomy</label><br /> ! <div id="lumpDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="lumpDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="lumpLt" type="checkbox" value="left" />Left <input name="lumpRt" type="checkbox" value="right" />Right</label> </div><br/> ! <label><input id="mast" name="mast" type="checkbox" value="mast" onclick="toggleDetail( this );"/>Mastectomy</label><br /> ! <div id="mastDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="mastDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="mastLt" type="checkbox" value="left" />Left <input name="mastRt" type="checkbox" value="right" />Right</label> </div><br/> ! <label><input id="rad" name="rad" type="checkbox" value="rad" onclick="toggleDetail( this );"/>Radiation</label><br /> ! <div id="radDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="radDate" type="text" size="6" /></label><br/> <label><span class="title">Side:</span><input name="radLt" type="checkbox" value="left" />Left <input name="radRt" type="checkbox" value="right" />Right</label> </div><br/> ! <label><input id="chemo" name="chemo" type="checkbox" value="chemo" onclick="toggleDetail( this );"/>Chemotherapy</label><br /> ! <div id="chemoDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="chemoDate" type="text" size="6" /></label><br/> <label><span class="title">Weeks:</span> <input name="chemoWeeks" type="text" size="4" /></label> </div><br/> ! <label><input id="hor" name="hor" type="checkbox" value="hor" onclick="toggleDetail( this );"/>Hormonal (Tamoxifen, Erimadex, Femara)</label><br /> ! <div id="horDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="horDate" type="text" size="6" /></label><br/> <label><span class="title">Weeks: </span><input name="chemoWeeks" type="text" size="4" /></label> </div><br/> ! <label><input id="herc" name="herc" type="checkbox" value="herc" onclick="toggleDetail( this );"/>Herceptin</label><br /> ! <div id="hercDetail" style="display:none;margin-left:20px"> <label><span class="title">Starting (m/y):</span> <input name="hercStartDate" type="text" size="6" /></label><br/> <label><span class="title">Ending (m/y):</span> <input name="hercEndDate" type="text" size="6" /></label> </div><br/> ! <label><input id="recon" name="recon" type="checkbox" value="recon" onclick="toggleDetail( this );"/>Breast Reconstruction</label><br /> ! <div id="reconDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="reconDate" type="text" size="6" /></label> </div><br/> ! <label><input id="impl" name="impl" type="checkbox" value="impl" onclick="toggleDetail( this );"/>Breast Implants</label><br /> ! <div id="implDetail" style="display:none;margin-left:20px"> <label><span class="title">Date (m/y):</span> <input name="implDate" type="text" size="6" /></label> </div><br/> </fieldset> </div> ! <fieldset id="q57" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('q57');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Breast Pain</legend> <p>Do you have breast pain?</p> ! <label><input name="bpain" type="radio" value="no" onclick="Element.hide('bpainDetail');"/>No</label><br /> ! <label><input name="bpain" type="radio" value="yes" onclick="Element.show('bpainDetail');" />Yes</label><br /> ! <div id="bpainDetail" style="display:none"> <p>Which side?</p> <label><input name="bpLt" type="checkbox" value="left" />Left</label> --- 263,316 ---- <label><input name="her2" type="radio" value="I don't know" />I don't know</label> </fieldset> ! <fieldset id="#{menu.element}-q56" class="plain"> ! <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="I want to discuss" href="javascript:toggleAttention('#{menu.element}-q56');"><img src="../images/img_discuss_t.jpg" border="0" /></a><a title="More information" href="javascript:toggleHelp('#{menu.element}-','q43');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Breast-related Therapy and Procedures</legend> ! <label><input id="#{menu.element}-lump" name="lump" type="checkbox" value="lump" onclick="toggleDetail( this );"/>Lumpectomy... [truncated message content] |
|
From: John C. <jc...@us...> - 2006-11-29 01:34:22
|
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29226/web/private Modified Files: createAccount.xhtml Log Message: Fix typos Index: createAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/createAccount.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** createAccount.xhtml 15 Nov 2006 07:03:11 -0000 1.3 --- createAccount.xhtml 29 Nov 2006 01:34:20 -0000 1.4 *************** *** 28,32 **** </h:selectOneMenu> <h:selectBooleanCheckbox value="#{reg.genDemoData}" /> ! <h:outputText value="Add demo to the account you create*"/> </h:panelGrid> <p>* If checked, a small family for a personal account or about 50 new patients will be created in a clinical account. </p> --- 28,32 ---- </h:selectOneMenu> <h:selectBooleanCheckbox value="#{reg.genDemoData}" /> ! <h:outputText value="Add demo data to the account you create*"/> </h:panelGrid> <p>* If checked, a small family for a personal account or about 50 new patients will be created in a clinical account. </p> |
|
From: John C. <jc...@us...> - 2006-11-29 01:32:52
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28430/src/org/tolven/ajax Modified Files: AjaxServlet.java Log Message: Just cleanup Index: AjaxServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AjaxServlet.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AjaxServlet.java 14 Oct 2006 23:08:04 -0000 1.15 --- AjaxServlet.java 29 Nov 2006 01:32:50 -0000 1.16 *************** *** 24,33 **** import java.util.LinkedList; import java.util.List; - import java.util.Map; import java.util.TimeZone; - import org.jboss.logging.*; - - import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; --- 24,29 ---- *************** *** 41,44 **** --- 37,41 ---- import javax.transaction.UserTransaction; + import org.jboss.logging.Logger; import org.tolven.app.MenuLocal; import org.tolven.app.bean.MenuPath; *************** *** 47,53 **** import org.tolven.app.entity.MenuData; import org.tolven.app.entity.MenuStructure; - import org.tolven.core.entity.Sponsorship; import org.tolven.doc.DocumentLocal; - import org.tolven.doc.entity.DocBase; import org.tolven.doc.entity.DocImage; import org.tolven.doc.entity.DocXML; --- 44,48 ---- *************** *** 74,83 **** // @EJB - private LoadMrconsoLocal mrconsoLoader; - // @EJB - private LoadAbbreviation abbrevLoader; - // @EJB - private LoadSAB sourceLoader; - // @EJB private ConceptDAO conceptDAO; --- 69,72 ---- *************** *** 141,147 **** InitialContext ctx = new InitialContext(); // J2EE 1.5 has not yet defined exact XML <ejb-ref> syntax for EJB3 - abbrevLoader = (LoadAbbreviation) ctx.lookup("tolven/LoadAbbreviationBean/local"); - sourceLoader = (LoadSAB) ctx.lookup("tolven/LoadSABBean/local"); - mrconsoLoader = (LoadMrconsoLocal) ctx.lookup("tolven/LoadMrconsoBean/local"); conceptDAO = (ConceptDAO) ctx.lookup("tolven/ConceptDAOBean/local"); personDAO = (PersonGenerator) ctx.lookup("tolven/PersonGeneratorDAO/local"); --- 130,133 ---- *************** *** 317,321 **** writer.write( "<tr>" ); writer.write( "<td> " + p.getId() + "</td>"); ! writer.write( "<td> <a href=\"#\" onclick=\"showPane(containerId(this)+':detail-" + p.getId()+ "')\">"+ p.getFamilyName() + "</a></td>"); writer.write( "</tr>\n"); } --- 303,307 ---- writer.write( "<tr>" ); writer.write( "<td> " + p.getId() + "</td>"); ! writer.write( "<td> <a href=\"javascript:showPane(containerId(this)+':detail-" + p.getId()+ "')\">"+ p.getFamilyName() + "</a></td>"); writer.write( "</tr>\n"); } *************** *** 334,338 **** writer.write( "<tr>" ); writer.write( "<td> " + p.getId() + "</td>"); ! writer.write( "<td> <a href=\"#\" onclick=\"showPane(containerId(this)+':detail-" + p.getId()+ "')\">"+ p.getFamilyName() + "</a></td>"); writer.write( "</tr>\n"); } --- 320,324 ---- writer.write( "<tr>" ); writer.write( "<td> " + p.getId() + "</td>"); ! writer.write( "<td> <a href=\"javascript:showPane(containerId(this)+':detail-" + p.getId()+ "')\">"+ p.getFamilyName() + "</a></td>"); writer.write( "</tr>\n"); } *************** *** 436,463 **** } - if (uri.endsWith("lcLoad.ajax")) { - String id = req.getParameter( "id"); - mrconsoLoader.load(Long.parseLong(id)); - } - - if (uri.endsWith("loaderControl.ajax")) { - List<LoaderControl> rows = mrconsoLoader.findLoaderControls(pageSize, offset ); - int line = 0; - for (LoaderControl lc : rows) { - line++; - writer.write( "<tr>" ); - writer.write( "<td style=\"width:30px\"> " + (offset+line) + "</td>"); - writer.write( "<td style=\"width:60px\"> " + lc.getEntity() + "</td>"); - writer.write( "<td style=\"width:50px\"> " + lc.getOffset() + "</td>"); - writer.write( "<td style=\"width:50px\"> " + lc.getBatchSize() + "</td>"); - writer.write( "<td style=\"width:60px\"> " + lc.getStatus() + "</td>"); - if ("READY".equals( lc.getStatus())) { - writer.write( "<td style=\"width:40px\"> <a href=\"#\" onclick=\"lcLoad('" + lc.getId() + "')\">Load</a></td>"); - } else { - writer.write( "<td style=\"width:40px\">-</td>"); - } - writer.write( "</tr>\n"); - } - } writer.write( "</rows>\n"); writer.write( "</response>\n"); --- 422,425 ---- |
|
From: John C. <jc...@us...> - 2006-11-29 01:31:24
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28000/src/org/tolven/app/bean Modified Files: MenuBean.java Log Message: Rework assessment and add new Patient content Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** MenuBean.java 17 Nov 2006 03:17:35 -0000 1.37 --- MenuBean.java 29 Nov 2006 01:31:21 -0000 1.38 *************** *** 266,270 **** em.persist( new MSColumn( activity, 1, "Date", "date01", "d MMM yyyy") ); em.persist( new MSColumn( activity, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( activity, 3, "Action", "parent02", "string02") ); em.persist( new MSColumn( activity, 4, "RequestedBy", "string03", null) ); em.persist( new MSColumn( activity, 5, "Priority", "long01", null) ); --- 266,270 ---- em.persist( new MSColumn( activity, 1, "Date", "date01", "d MMM yyyy") ); em.persist( new MSColumn( activity, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( activity, 3, "Action", "string02", null) ); em.persist( new MSColumn( activity, 4, "RequestedBy", "string03", null) ); em.persist( new MSColumn( activity, 5, "Priority", "long01", null) ); *************** *** 359,368 **** root.getAccount(), activity, "activity.xhtml", null, 2, "all", "All Activity", "true", null, "tab" ); em.persist( all ); ! em.persist( new MSColumn( activity, 1, "Date", "date01", "d MMM yyyy") ); ! em.persist( new MSColumn( activity, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( activity, 3, "Action", "parent02", "string02") ); ! em.persist( new MSColumn( activity, 4, "RequestedBy", "string03", null) ); ! em.persist( new MSColumn( activity, 5, "Priority", "long01", null) ); ! em.persist( new MSColumn( activity, 6, "Due", "date02", "d MMM yyyy") ); // Results MenuStructure results = new MenuStructure( --- 359,368 ---- root.getAccount(), activity, "activity.xhtml", null, 2, "all", "All Activity", "true", null, "tab" ); em.persist( all ); ! em.persist( new MSColumn( all, 1, "Date", "date01", "d MMM yyyy") ); ! em.persist( new MSColumn( all, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( all, 3, "Action", "string02", null) ); ! em.persist( new MSColumn( all, 4, "RequestedBy", "string03", null) ); ! em.persist( new MSColumn( all, 5, "Priority", "long01", null) ); ! em.persist( new MSColumn( all, 6, "Due", "date02", "d MMM yyyy") ); // Results MenuStructure results = new MenuStructure( *************** *** 426,430 **** em.persist( new MSColumn( chrData, 1, "Date", "date01", "d MMM yyyy") ); em.persist( new MSColumn( chrData, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( chrData, 3, "Action", "parent02", "string02") ); em.persist( new MSColumn( chrData, 4, "RequestedBy", "string03", null) ); em.persist( new MSColumn( chrData, 5, "Priority", "long01", null) ); --- 426,430 ---- em.persist( new MSColumn( chrData, 1, "Date", "date01", "d MMM yyyy") ); em.persist( new MSColumn( chrData, 2, "For", "parent01", "string01") ); ! em.persist( new MSColumn( chrData, 3, "Action", "string02", null) ); em.persist( new MSColumn( chrData, 4, "RequestedBy", "string03", null) ); em.persist( new MSColumn( chrData, 5, "Priority", "long01", null) ); *************** *** 487,569 **** em.persist( patient ); ! MenuStructure overview = new MenuStructure( ! account, patient, "bar2.xhtml", null, 1, "overview", "Overview", "true", null, "tab" ); ! em.persist( overview ); MenuStructure summary = new MenuStructure( ! account, overview, "summary.xhtml", null, 1, "summary", "Summary", "true", null, "tab" ); em.persist( summary ); // PORTLETS MenuStructure probSummary = new MenuStructure( ! account, summary, "problemSummary.xhtml", null, 1, "probsum", "Problems", "true", root.getPath() + ":patient:problems", "portlet" ); em.persist( probSummary ); MenuStructure medSummary = new MenuStructure( ! account, summary, "medsummary.xhtml", null, 2, "medsum", "Active Medications", "true", root.getPath() + ":patient:meds", "portlet" ); em.persist( medSummary ); MenuStructure funStatSummary = new MenuStructure( ! account, summary, "funStatSummary.xhtml", null, 3, "funStatsum", "Functional Status", "true", root.getPath() + ":patient:funStat", "portlet" ); em.persist( funStatSummary ); ! MenuStructure labSummary = new MenuStructure( ! account, summary, "labSummary.xhtml", null, 4, "labsum", "Lab Results", "true", root.getPath() + ":patient:results:lab", "portlet" ); ! em.persist( labSummary ); ! em.persist( new MSColumn( labSummary, 1, "Date", "date01", "yyyy") ); ! em.persist( new MSColumn( labSummary, 2, "Test", "string01", null) ); ! em.persist( new MSColumn( labSummary, 3, "Result", "string02", null) ); ! ! MenuStructure radSummary = new MenuStructure( ! account, summary, "radSummary.xhtml", null, 5, "radsum", "Radiology Results", "true", root.getPath() + ":patient:results:rad", "portlet" ); ! em.persist( radSummary ); ! em.persist( new MSColumn( radSummary, 1, "Date", "date01", "yyyy") ); ! em.persist( new MSColumn( radSummary, 2, "Test", "string01", null) ); ! ! MenuStructure selfSummary = new MenuStructure( ! account, summary, "selfSummary.xhtml", null, 6, "selfsum", "Self-Monitoring", "true", root.getPath() + ":patient:results:self", "portlet" ); ! em.persist( selfSummary ); ! MenuStructure medhxfSummary = new MenuStructure( ! account, summary, "medhxfSummary.xhtml", null, 7, "mhxsum", "Medical History", "true", root.getPath() + ":patient:medhx", "portlet" ); ! em.persist( medhxfSummary ); ! MenuStructure famhxSummary = new MenuStructure( ! account, summary, "famhxSummary.xhtml", null, 8, "fhxsum", "Family History", "true", root.getPath() + ":patient:fam", "portlet" ); ! em.persist( famhxSummary ); ! MenuStructure immSummary = new MenuStructure( ! account, summary, "immSummary.xhtml", null, 9, "immsum", "Immunizations", "true", root.getPath() + ":patient:imm", "portlet" ); ! 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" ); ! em.persist( todo ); ! ! MenuStructure appointments = new MenuStructure( ! account, overview, "appointments.xhtml", null, 4, "appts", "Appointments", "true", null, "tab" ); ! em.persist( appointments ); ! ! MenuStructure pastappts = new MenuStructure( ! account, overview, "pastAppointments.xhtml", null, 5, "pastappts", "Past Appointments", "true", null, "tab" ); ! em.persist( pastappts ); ! MenuStructure problems = new MenuStructure( ! account, patient, "problems.xhtml", null, 2, "problems", "Problems", "true", null, "tab" ); ! em.persist( problems ); ! em.persist( new MSColumn( problems, 1, "Problem", "string01", null) ); ! em.persist( new MSColumn( problems, 2, "Onset", "date01", "MMM-dd-yyyy") ); ! em.persist( new MSColumn( problems, 3, "Status", "string02", null) ); ! MenuStructure patResults = new MenuStructure( ! account, patient, "bar2.xhtml", null, 3, "results", "Test Results", "true", null, "tab" ); em.persist( patResults ); MenuStructure labAll = new MenuStructure( ! account, patResults, "lab.xhtml", null, 10, "lab", "Lab", "true", null, "tab" ); em.persist( labAll ); em.persist( new MSColumn( labAll, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); --- 487,557 ---- em.persist( patient ); ! MenuStructure assessment = new MenuStructure( ! account, patient, "assessment.xhtml", "assLink.xhtml", -1, "assessment", "Assessment", "false", "assessment", "placeholder" ); ! em.persist( assessment ); ! MenuStructure summary = new MenuStructure( ! account, patient, "summary.xhtml", null, 1, "summary", "Overview", "true", null, "tab" ); em.persist( summary ); // PORTLETS MenuStructure probSummary = new MenuStructure( ! account, summary, "problemSummary.xhtml", null, 1, "probsum", "Problems", "true", root.getPath() + ":patient:hx:problems", "portlet" ); em.persist( probSummary ); MenuStructure medSummary = new MenuStructure( ! account, summary, "medsummary.xhtml", null, 2, "medsum", "Active Medications", "true", root.getPath() + ":patient:med:meds", "portlet" ); em.persist( medSummary ); MenuStructure funStatSummary = new MenuStructure( ! account, summary, "allergySummary.xhtml", null, 3, "allergysum", "Allergies", "true", root.getPath() + ":patient:doc:allergies", "portlet" ); em.persist( funStatSummary ); ! MenuStructure resultsSummary = new MenuStructure( ! account, summary, "resultSummary.xhtml", null, 4, "resultsum", "New Results", "true", root.getPath() + ":patient:results:new", "portlet" ); ! em.persist( resultsSummary ); ! em.persist( new MSColumn( resultsSummary, 1, "Date", "date01", "yyyy") ); ! em.persist( new MSColumn( resultsSummary, 2, "Test", "string01", null) ); ! MenuStructure apptSummary = new MenuStructure( ! account, summary, "apptSummary.xhtml", null, 5, "apptsum", "Appointments", "true", root.getPath() + ":patient:pers:appts", "portlet" ); ! em.persist( apptSummary ); ! MenuStructure dxSummary = new MenuStructure( ! account, summary, "dxSummary.xhtml", null, 6, "dxsum", "Working Diagnoses", "true", root.getPath() + ":patient:doc:dx", "portlet" ); ! em.persist( dxSummary ); ! MenuStructure obsSummary = new MenuStructure( ! account, summary, "obsSummary.xhtml", null, 7, "obssum", "Observations", "true", root.getPath() + ":patient:doc:obs", "portlet" ); ! em.persist( obsSummary ); ! MenuStructure reminderSummary = new MenuStructure( ! account, summary, "reminderSummary.xhtml", null, 8, "remindersum", "Reminders", "true", root.getPath() + ":patient:pers:reminders", "portlet" ); ! em.persist( reminderSummary ); ! MenuStructure procSummary = new MenuStructure( ! account, summary, "procSummary.xhtml", null, 9, "procsum", "Procedures", "true", root.getPath() + ":patient:hx:pxhx", "portlet" ); ! em.persist( procSummary ); ! // ********************** Results MenuStructure patResults = new MenuStructure( ! account, patient, "bar2.xhtml", null, 2, "results", "Results", "true", null, "tab" ); em.persist( patResults ); + MenuStructure newResults = new MenuStructure( + account, patResults, "newResults.xhtml", null, 20, "new", "New results", "true", null, "tab" ); + em.persist( newResults ); + em.persist( new MSColumn( newResults, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); + em.persist( new MSColumn( newResults, 2, "Test", "string01", null) ); + em.persist( new MSColumn( newResults, 3, "Interpretation", "string04", null) ); + em.persist( new MSColumn( newResults, 4, "Source", "parent02", null) ); + + MenuStructure pendingOrders = new MenuStructure( + account, patResults, "pendingOrders.xhtml", null, 30, "orders", "Pending Orders", "true", null, "tab" ); + em.persist( pendingOrders ); + MenuStructure labAll = new MenuStructure( ! account, patResults, "lab.xhtml", null, 40, "lab", "Lab", "true", null, "tab" ); em.persist( labAll ); em.persist( new MSColumn( labAll, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); *************** *** 576,584 **** MenuStructure lipids = new MenuStructure( ! account, patResults, "graphLipids.xhtml", null, 15, "lipids", "Lipids", "true", null, "tab" ); em.persist( lipids ); MenuStructure rad = new MenuStructure( ! account, patResults, "rad.xhtml", null, 20, "rad", "Radiology", "true", null, "tab" ); em.persist( rad ); em.persist( new MSColumn( rad, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); --- 564,580 ---- MenuStructure lipids = new MenuStructure( ! account, patResults, "graphLipids.xhtml", null, 999, "lipids", "Lipids", "true", null, "tab" ); em.persist( lipids ); + + MenuStructure pathology = new MenuStructure( + account, patResults, "pathology.xhtml", null, 50, "pathology", "Pathology", "true", null, "tab" ); + em.persist( pathology ); + MenuStructure selfMon = new MenuStructure( + account, patResults, "selfMon.xhtml", null, 60, "self", "Self Monitoring", "true", null, "tab" ); + em.persist( selfMon ); + MenuStructure rad = new MenuStructure( ! account, patResults, "rad.xhtml", null, 70, "rad", "Radiology", "true", null, "tab" ); em.persist( rad ); em.persist( new MSColumn( rad, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); *************** *** 588,650 **** em.persist( new MSColumn( rad, 5, "Source", "parent02", null) ); ! MenuStructure other = new MenuStructure( ! account, patResults, "other.xhtml", null, 30, "other", "Other", "true", null, "tab" ); ! em.persist( other ); ! MenuStructure selfMed = new MenuStructure( ! account, patResults, "selfMed.xhtml", null, 40, "selfMed", "Self Medicating", "true", null, "tab" ); ! em.persist( selfMed ); ! MenuStructure medications = new MenuStructure( ! account, patient, "medications.xhtml", null, 4, "meds", "Medications", "true", null, "tab" ); ! em.persist( medications ); ! ! MenuStructure allergies = new MenuStructure( ! account, patient, "allergies.xhtml", null, 5, "allergies", "Allergies", "true", null, "tab" ); ! em.persist( allergies ); ! ! MenuStructure medhx = new MenuStructure( ! account, patient, "medhx.xhtml", null, 5, "medhx", "Medical History", "true", null, "tab" ); ! em.persist( medhx ); - MenuStructure asessments = new MenuStructure( - account, patient, "bar2.xhtml", null, 6, "assessments", "Assessments", "true", null, "tab" ); - em.persist( asessments ); MenuStructure assAll = new MenuStructure( ! account, asessments, "assAll.xhtml", null, 1, "all", "All", "true", null, "tab" ); em.persist( assAll ); ! em.persist( new MSColumn( assAll, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); ! em.persist( new MSColumn( assAll, 2, "Assessment", "reference", "string01") ); ! em.persist( new MSColumn( assAll, 3, "Status", "string02", null) ); ! em.persist( new MSColumn( assAll, 3, "Interpretation", "string03", null) ); ! em.persist( new MSColumn( assAll, 4, "Source", "parent02", null) ); ! MenuStructure newAss = new MenuStructure( ! account, asessments, "newAss.xhtml", null, 2, "new", "New", "true", null, "tab" ); ! em.persist( newAss ); ! em.persist( new MSColumn( newAss, 1, "Assessment", "reference", "string01") ); ! em.persist( new MSColumn( newAss, 2, "Status", "string02", null) ); - MenuStructure assessment = new MenuStructure( - account, asessments, "assessment.xhtml", "assLink.xhtml", 2, "assessment", "Assessment", "false", "assessment", "placeholder" ); - em.persist( assessment ); ! MenuStructure protocols = new MenuStructure( ! account, patient, "protocols.xhtml", null, 7, "protocols", "Protocols", "true", null, "tab" ); ! em.persist( protocols ); ! MenuStructure personal = new MenuStructure( ! account, patient, "personal.xhtml", null, 8, "personal", "Personal Info", "true", root.getPath() + ":patient", "tab" ); ! em.persist( personal ); ! MenuStructure providers = new MenuStructure( ! account, patient, "providers.xhtml", null, 9, "providers", "Providers", "true", null, "tab" ); ! em.persist( providers ); MenuStructure xml = new MenuStructure( account, patient, "xml.xhtml", null, 9, "xml", "XML (demo)", "true", root.getPath() + ":patient", "tab" ); em.persist( xml ); - - } --- 584,738 ---- em.persist( new MSColumn( rad, 5, "Source", "parent02", null) ); ! MenuStructure physio = new MenuStructure( ! account, patResults, "physio.xhtml", null, 80, "physio", "Physio", "true", null, "tab" ); ! em.persist( physio ); ! MenuStructure images = new MenuStructure( ! account, patResults, "images.xhtml", null, 90, "images", "Images", "true", null, "tab" ); ! em.persist( images ); ! // ********************** Documentation ! MenuStructure doc = new MenuStructure( ! account, patient, "bar2.xhtml", null, 3, "doc", "Documentation", "true", null, "tab" ); ! em.persist( doc ); ! MenuStructure ques = new MenuStructure( ! account, doc, "questionaires.xhtml", null, 2, "ques", "Questionnaires", "true", null, "tab" ); ! em.persist( ques ); MenuStructure assAll = new MenuStructure( ! account, doc, "assAll.xhtml", null, 3, "ass", "Clinical Assessments", "true", null, "tab" ); em.persist( assAll ); ! em.persist( new MSColumn( assAll, 1, "Date", "date01", "MMM-dd-yyyy hh:mm") ); ! em.persist( new MSColumn( assAll, 2, "Assessment", "reference", "string01") ); ! em.persist( new MSColumn( assAll, 3, "Status", "string02", null) ); ! em.persist( new MSColumn( assAll, 3, "Interpretation", "string03", null) ); ! em.persist( new MSColumn( assAll, 4, "Source", "parent02", null) ); ! // MenuStructure newAss = new MenuStructure( ! // account, asessments, "newAss.xhtml", null, 2, "new", "New", "true", null, "tab" ); ! // em.persist( newAss ); ! // em.persist( new MSColumn( newAss, 1, "Assessment", "reference", "string01") ); ! // em.persist( new MSColumn( newAss, 2, "Status", "string02", null) ); ! // MenuStructure newGCS = new MenuStructure( ! // account, newAss, "../wizard/gcs.xhtml", null, 1, "gcs", "Glasgow Coma Scale", "true", null, "tab" ); ! // em.persist( newGCS ); ! // MenuStructure newBCC = new MenuStructure( ! // account, newAss, "../wizard/bccIntake.xhtml", null, 1, "bcc", "BCC Intake", "true", null, "tab" ); ! // em.persist( newBCC ); ! ! MenuStructure obs = new MenuStructure( ! account, doc, "obs.xhtml", null, 4, "obs", "Observations", "true", null, "tab" ); ! em.persist( obs ); ! ! MenuStructure allergies = new MenuStructure( ! account, doc, "allergies.xhtml", null, 5, "allergies", "Allergies", "true", null, "tab" ); ! em.persist( allergies ); ! ! MenuStructure protocols = new MenuStructure( ! account, doc, "protocols.xhtml", null, 6, "protocols", "Protocols", "true", null, "tab" ); ! em.persist( protocols ); ! ! MenuStructure goals = new MenuStructure( ! account, doc, "goals.xhtml", null, 7, "goals", "Goals", "true", null, "tab" ); ! em.persist( goals ); ! ! MenuStructure dx = new MenuStructure( ! account, doc, "dx.xhtml", null, 8, "dx", "Working Diagnoses", "true", null, "tab" ); ! em.persist( dx ); ! // ********************** History ! MenuStructure hx = new MenuStructure( ! account, patient, "bar2.xhtml", null, 4, "hx", "History", "true", null, "tab" ); ! em.persist( hx ); ! MenuStructure famhx = new MenuStructure( ! account, hx, "famhx.xhtml", null, 2, "famhx", "Family", "true", null, "tab" ); ! em.persist( famhx ); + MenuStructure medhx = new MenuStructure( + account, hx, "medhx.xhtml", null, 3, "medhx", "Medical", "true", null, "tab" ); + em.persist( medhx ); + + MenuStructure dxhx = new MenuStructure( + account, hx, "dxhx.xhtml", null, 4, "dxhx", "Diagnoses", "true", null, "tab" ); + em.persist( dxhx ); ! MenuStructure problems = new MenuStructure( ! account, hx, "problems.xhtml", null, 5, "problems", "Problems", "true", null, "tab" ); ! em.persist( problems ); ! em.persist( new MSColumn( problems, 1, "Problem", "string01", null) ); ! em.persist( new MSColumn( problems, 2, "Onset", "date01", "MMM-dd-yyyy") ); ! em.persist( new MSColumn( problems, 3, "Status", "string02", null) ); ! MenuStructure pxhx = new MenuStructure( ! account, hx, "pxhx.xhtml", null, 6, "pxhx", "Procedures", "true", null, "tab" ); ! em.persist( pxhx ); ! MenuStructure psyhx = new MenuStructure( ! account, hx, "psyhx.xhtml", null, 7, "psyhx", "Psychiatry", "true", null, "tab" ); ! em.persist( psyhx ); ! // ********************** Medication ! MenuStructure med = new MenuStructure( ! account, patient, "bar2.xhtml", null, 5, "med", "Medication", "true", null, "tab" ); ! em.persist( med ); ! ! MenuStructure medications = new MenuStructure( ! account, med, "medications.xhtml", null, 2, "meds", "Medications", "true", null, "tab" ); ! em.persist( medications ); + MenuStructure rx = new MenuStructure( + account, med, "rx.xhtml", null, 3, "rx", "Prescriptions", "true", null, "tab" ); + em.persist( rx ); + + MenuStructure otcm = new MenuStructure( + account, med, "otcm.xhtml", null, 4, "otcm", "OTCM", "true", null, "tab" ); + em.persist( otcm ); + + MenuStructure imm = new MenuStructure( + account, med, "imm.xhtml", null, 4, "imm", "Immunizations", "true", null, "tab" ); + em.persist( imm ); + + // ********************** Personal + MenuStructure pers = new MenuStructure( + account, patient, "bar2.xhtml", null, 6, "pers", "Personal", "true", null, "tab" ); + em.persist( pers ); + + MenuStructure demog = new MenuStructure( + account, pers, "personal.xhtml", null, 2, "demog", "Demographics", "true", root.getPath() + ":patient", "tab" ); + em.persist( demog ); + + MenuStructure providers = new MenuStructure( + account, pers, "providers.xhtml", null, 3, "providers", "Providers", "true", null, "tab" ); + em.persist( providers ); + + MenuStructure ins = new MenuStructure( + account, pers, "ins.xhtml", null, 4, "ins", "Insurance", "true", null, "tab" ); + em.persist( ins ); + + MenuStructure access = new MenuStructure( + account, pers, "access.xhtml", null, 5, "access", "Access", "true", null, "tab" ); + em.persist( access ); + + MenuStructure nok = new MenuStructure( + account, pers, "nok.xhtml", null, 6, "nok", "Next of Kin", "true", null, "tab" ); + em.persist( nok ); + + MenuStructure fun = new MenuStructure( + account, pers, "fun.xhtml", null, 7, "fun", "Functional Status", "true", null, "tab" ); + em.persist( fun ); + + MenuStructure appointments = new MenuStructure( + account, pers, "appointments.xhtml", null, 9, "appts", "Appointments", "true", null, "tab" ); + em.persist( appointments ); + + MenuStructure reminders = new MenuStructure( + account, pers, "reminders.xhtml", null, 10, "reminders", "Reminders", "true", null, "tab" ); + em.persist( reminders ); + + MenuStructure hmaint = new MenuStructure( + account, pers, "hmaint.xhtml", null, 11, "hmaint", "Health Maint", "true", null, "tab" ); + em.persist( hmaint ); + MenuStructure xml = new MenuStructure( account, patient, "xml.xhtml", null, 9, "xml", "XML (demo)", "true", root.getPath() + ":patient", "tab" ); em.persist( xml ); } *************** *** 713,717 **** account, null, "tabs.xhtml", null, 1, "echr", null, "true", null, "tab" ); em.persist( root ); ! addNewActivityTab( root ); addPatientsTab( root ); addPatientTab( root ); --- 801,805 ---- account, null, "tabs.xhtml", null, 1, "echr", null, "true", null, "tab" ); em.persist( root ); ! addActivityTab( root ); addPatientsTab( root ); addPatientTab( root ); |
|
From: John C. <jc...@us...> - 2006-11-29 01:31:24
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28000/src/org/tolven/gen/bean Modified Files: GenMedical.java LabTestScenario.java BatteryScenario.java Log Message: Rework assessment and add new Patient content Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenMedical.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GenMedical.java 15 Nov 2006 07:00:11 -0000 1.14 --- GenMedical.java 29 Nov 2006 01:31:21 -0000 1.15 *************** *** 50,72 **** MenuStructure msLabResultSum; MenuStructure msRadResult; MenuStructure msRadResultSum; ! ! public PatientMD( MenuLocal menu, MenuData patient ) { this.patient = patient; MenuStructure ms = patient.getMenuStructure(); if ("echr".equals(patient.getAccount().getAccountType().getKnownType())) { msDisease = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":patients:disease"); ! msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":activity"); } if ("ephr".equals(patient.getAccount().getAccountType().getKnownType())) { msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":activity:all"); } ! msProblem = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "problems"); ! msProblemSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "overview:summary:probsum"); ! msMhx = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "overview:summary:mhxsum"); msLabResult = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "results:lab"); ! msLabResultSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "overview:summary:labsum"); msRadResult = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "results:rad"); ! msRadResultSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "overview:summary:radsum"); } } --- 50,80 ---- MenuStructure msLabResultSum; MenuStructure msRadResult; + MenuStructure msNewResult; MenuStructure msRadResultSum; ! DocCCR docCCR; ! private ActorType patientActor; ! public PatientMD( MenuLocal menu, MenuData patient ) throws JAXBException, CCRException { this.patient = patient; MenuStructure ms = patient.getMenuStructure(); if ("echr".equals(patient.getAccount().getAccountType().getKnownType())) { msDisease = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":patients:disease"); ! msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":activity:all"); } if ("ephr".equals(patient.getAccount().getAccountType().getKnownType())) { msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getAccountType().getKnownType() + ":activity:all"); } ! msProblem = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "hx:problems"); ! msProblemSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "summary:probsum"); ! msMhx = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "hx:medhx"); msLabResult = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "results:lab"); ! msLabResultSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "summary:resultsum"); msRadResult = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "results:rad"); ! msRadResultSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "summary:resultsum"); ! msNewResult = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "results:new"); ! docCCR = (DocCCR) patient.getDocument(); ! patientActor = docCCR.getPatientActor(); ! } ! public ActorType getPatientActor() { ! return patientActor; } } *************** *** 78,82 **** private MenuLocal menu; private int startYear; - private ActorType ccrPat; private boolean female; private boolean male; --- 86,89 ---- *************** *** 84,88 **** protected RandomData rng = new RandomDataImpl(); - /** * Construct a new medical data generator for a specific patient. --- 91,94 ---- *************** *** 101,114 **** } this.now = now; - DocCCR docCCR = null; // We arbitrarily use the PHR patient ccd since we're just reading patient actor information - if (mdPHR!=null) { - System.out.println( "Using mdPHR"); - docCCR = (DocCCR) mdPHR.getDocument(); - } else { - System.out.println( "Using mdCHR"); - docCCR = (DocCCR) mdCHR.getDocument(); - } - ccrPat = docCCR.getPatientActor(); // Figure out gender right away initGender(); --- 107,111 ---- *************** *** 123,127 **** */ public int getAgeInYears( ) throws ParseException { ! Person person = ccrPat.getPerson(); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getAgeInYears(now); --- 120,126 ---- */ public int getAgeInYears( ) throws ParseException { ! Person person = null; ! if (mdCHR!=null) person = mdCHR.getPatientActor().getPerson(); ! if (mdPHR!=null) person = mdPHR.getPatientActor().getPerson(); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getAgeInYears(now); *************** *** 140,147 **** /** * If we cannot determine gender, then we assume they are neither male nor female. * */ ! public void initGender() { ! Person person = ccrPat.getPerson(); if (person==null) return; if( person.getGender()==null) return; --- 139,150 ---- /** * If we cannot determine gender, then we assume they are neither male nor female. + * @throws CCRException + * @throws JAXBException * */ ! public void initGender() throws JAXBException, CCRException { ! Person person = null; ! if (mdCHR!=null) person = mdCHR.getPatientActor().getPerson(); ! if (mdPHR!=null) person = mdPHR.getPatientActor().getPerson(); if (person==null) return; if( person.getGender()==null) return; *************** *** 158,162 **** */ public Date getDOB( ) throws ParseException { ! Person person = ccrPat.getPerson(); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getDateValue(); --- 161,167 ---- */ public Date getDOB( ) throws ParseException { ! Person person = null; ! if (mdCHR!=null) person = mdCHR.getPatientActor().getPerson(); ! if (mdPHR!=null) person = mdPHR.getPatientActor().getPerson(); if (person!=null && person.getDateOfBirth()!=null) { return person.getDateOfBirth().getDateValue(); *************** *** 166,170 **** public String getFamilyName( ) { ! Person person = ccrPat.getPerson(); if (person==null) return ""; return person.getName().getCurrentName().getFamilyString(); --- 171,177 ---- public String getFamilyName( ) { ! Person person = null; ! if (mdCHR!=null) person = mdCHR.getPatientActor().getPerson(); ! if (mdPHR!=null) person = mdPHR.getPatientActor().getPerson(); if (person==null) return ""; return person.getName().getCurrentName().getFamilyString(); *************** *** 299,312 **** menu.persistMenuData( md); - // Summary entry referencing the result - MenuData mds = new MenuData(); - mds.setMenuStructure( pmd.msLabResultSum ); - mds.setReference(md); - mds.setParent01(pmd.patient); - mds.setDate01( test.getEffectiveTime() ); - mds.setString01(test.getTestName()); - mds.setString02(test.getStringValue() + " " + test.getUnits()); - menu.persistMenuData( mds); - // If it's new in the last couple days, add to new activity. GregorianCalendar recent = new GregorianCalendar(); --- 306,309 ---- *************** *** 315,322 **** // System.out.println( "Effective: " + test.getEffectiveTime() + " Now-Ndays " + recent.getTime()); if (test.getEffectiveTime().after(recent.getTime())) { // New Activity referencing the result just created MenuData mda = new MenuData(); mda.setMenuStructure( pmd.msActivity ); ! mds.setReference(md); mda.setDate01( test.getEffectiveTime() ); mda.setParent01(pmd.patient); --- 312,321 ---- // System.out.println( "Effective: " + test.getEffectiveTime() + " Now-Ndays " + recent.getTime()); if (test.getEffectiveTime().after(recent.getTime())) { + System.out.println( "New Activity: " + test.getEffectiveTime() + " Name: " + pmd.patient.getString02()); + // New Activity referencing the result just created MenuData mda = new MenuData(); mda.setMenuStructure( pmd.msActivity ); ! mda.setReference(md); mda.setDate01( test.getEffectiveTime() ); mda.setParent01(pmd.patient); *************** *** 324,327 **** --- 323,344 ---- mda.setString02(battery + " Result"); menu.persistMenuData( mda); + // Summary entry referencing the result + MenuData mds = new MenuData(); + mds.setMenuStructure( pmd.msLabResultSum ); + mds.setReference(md); + mds.setParent01(pmd.patient); + mds.setDate01( test.getEffectiveTime() ); + mds.setString01(test.getTestName()); + mds.setString02(test.getStringValue() + " " + test.getUnits()); + menu.persistMenuData( mds); + // Summary entry referencing the result + MenuData mdn = new MenuData(); + mdn.setMenuStructure( pmd.msNewResult ); + mdn.setReference(md); + mdn.setParent01(pmd.patient); + mdn.setDate01( test.getEffectiveTime() ); + mdn.setString01(test.getTestName()); + mdn.setString02(test.getStringValue() + " " + test.getUnits()); + menu.persistMenuData( mdn); } } *************** *** 350,364 **** menu.persistMenuData( md); - // Summary entry referencing the result - MenuData mds = new MenuData(); - mds.setMenuStructure( pmd.msRadResultSum ); - mds.setReference(md); - mds.setParent01(pmd.patient); - mds.setDate01( effective ); - mds.setString01(test); - mds.setString02(result); - mds.setString03(interpretation); - menu.persistMenuData( mds); - // If it's new in the last couple days, add to new activity. GregorianCalendar recent = new GregorianCalendar(); --- 367,370 ---- *************** *** 369,373 **** MenuData mda = new MenuData(); mda.setMenuStructure( pmd.msActivity ); ! mds.setReference(md); mda.setDate01( effective ); mda.setParent01(pmd.patient); --- 375,379 ---- MenuData mda = new MenuData(); mda.setMenuStructure( pmd.msActivity ); ! mda.setReference(md); mda.setDate01( effective ); mda.setParent01(pmd.patient); *************** *** 375,378 **** --- 381,405 ---- mda.setString02(test); menu.persistMenuData( mda); + // Summary entry referencing the result + MenuData mds = new MenuData(); + mds.setMenuStructure( pmd.msRadResultSum ); + mds.setReference(md); + mds.setParent01(pmd.patient); + mds.setDate01( effective ); + mds.setString01(test); + mds.setString02(result); + mds.setString03(interpretation); + menu.persistMenuData( mds); + // Summary entry referencing the result + MenuData mdn = new MenuData(); + mdn.setMenuStructure( pmd.msNewResult ); + mdn.setReference(md); + mdn.setParent01(pmd.patient); + mdn.setDate01( effective ); + mdn.setString01(test); + mdn.setString02(result); + mdn.setString03(interpretation); + menu.persistMenuData( mdn); + } } Index: LabTestScenario.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/LabTestScenario.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LabTestScenario.java 29 Aug 2006 21:10:32 -0000 1.3 --- LabTestScenario.java 29 Nov 2006 01:31:21 -0000 1.4 *************** *** 40,44 **** public boolean apply(GenMedical patient, Date startTime, Date endTime, RandomData rng ) { LabTest labTest = generateTest(startTime, rng ); ! patient.generateLabResult( test, labTest, 30 ); return true; } --- 40,44 ---- public boolean apply(GenMedical patient, Date startTime, Date endTime, RandomData rng ) { LabTest labTest = generateTest(startTime, rng ); ! patient.generateLabResult( test, labTest, 60 ); return true; } Index: BatteryScenario.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/BatteryScenario.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BatteryScenario.java 29 Aug 2006 21:10:32 -0000 1.1 --- BatteryScenario.java 29 Nov 2006 01:31:21 -0000 1.2 *************** *** 31,35 **** public boolean apply(GenMedical patient, Date startTime, Date endTime, RandomData rng ) { boolean rslt = false; ! int showNewActivity = 30; for ( Scenario s : getScenarios()) { LabTest test = ((LabTestScenario)s).generateTest(startTime, rng ); --- 31,35 ---- public boolean apply(GenMedical patient, Date startTime, Date endTime, RandomData rng ) { boolean rslt = false; ! int showNewActivity = 60; for ( Scenario s : getScenarios()) { LabTest test = ((LabTestScenario)s).generateTest(startTime, rng ); |
|
From: John C. <jc...@us...> - 2006-11-28 22:10:23
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7819/web/WEB-INF Modified Files: faces-config.xml Log Message: Return to current account when returning from customize Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** faces-config.xml 15 Nov 2006 07:03:11 -0000 1.27 --- faces-config.xml 28 Nov 2006 22:10:21 -0000 1.28 *************** *** 136,145 **** <from-action>#{menu.updateMenus}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> <redirect/> </navigation-case> --- 136,145 ---- <from-action>#{menu.updateMenus}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> |
|
From: Joseph I. <jos...@us...> - 2006-11-28 07:25:03
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20966/src/org/tolven/security/bean Modified Files: TolvenKBEPrivateKey.java Log Message: Changed from using the doc constants Index: TolvenKBEPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenKBEPrivateKey.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TolvenKBEPrivateKey.java 28 Nov 2006 07:14:34 -0000 1.3 --- TolvenKBEPrivateKey.java 28 Nov 2006 07:25:00 -0000 1.4 *************** *** 22,26 **** import java.security.PrivateKey; import java.security.PublicKey; - import java.security.SecureRandom; import java.security.spec.PKCS8EncodedKeySpec; import javax.crypto.Cipher; --- 22,25 ---- *************** *** 50,54 **** protected static final String ACCOUNT_PRIVATE_KEY_LENGTH_PROP = "tolven.security.account.keyLength"; ! protected static final String ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP = "tolven.security.doc.kbeKeyAlgorithm"; protected static final String ACCOUNT_USER_KBE_KEY_LENGTH = "tolven.security.accountUser.kbeKeyLength"; --- 49,53 ---- protected static final String ACCOUNT_PRIVATE_KEY_LENGTH_PROP = "tolven.security.account.keyLength"; ! protected static final String ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP = "tolven.security.accountUser.kbeKeyAlgorithm"; protected static final String ACCOUNT_USER_KBE_KEY_LENGTH = "tolven.security.accountUser.kbeKeyLength"; |
|
From: Joseph I. <jos...@us...> - 2006-11-28 07:14:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16650/src/org/tolven/security/bean Modified Files: TolvenKBEPrivateKey.java TolvenEncryptedPrivateKey.java TolvenPBEPrivateKey.java Log Message: Wired in most of the tolven properties parameters, which configure keys. Index: TolvenKBEPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenKBEPrivateKey.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TolvenKBEPrivateKey.java 27 Nov 2006 08:26:01 -0000 1.2 --- TolvenKBEPrivateKey.java 28 Nov 2006 07:14:34 -0000 1.3 *************** *** 22,25 **** --- 22,26 ---- import java.security.PrivateKey; import java.security.PublicKey; + import java.security.SecureRandom; import java.security.spec.PKCS8EncodedKeySpec; import javax.crypto.Cipher; *************** *** 43,46 **** --- 44,57 ---- Serializable { + private final String NOT_INITIALIZED = "TolvenKBEPrivateKey not initialized"; + + protected static final String ACCOUNT_PRIVATE_KEY_ALGORITHM_PROP = "tolven.security.account.privateKeyAlgorithm"; + + protected static final String ACCOUNT_PRIVATE_KEY_LENGTH_PROP = "tolven.security.account.keyLength"; + + protected static final String ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP = "tolven.security.doc.kbeKeyAlgorithm"; + + protected static final String ACCOUNT_USER_KBE_KEY_LENGTH = "tolven.security.accountUser.kbeKeyLength"; + @Embedded private TolvenEncryptedSecretKey encryptedSecretKey; *************** *** 60,63 **** --- 71,93 ---- /** * Create a PrivateKey, encrypt it with a randomly generated SecretKey and + * encrypt the SecretKey with a PublicKey. Use the system-specific + * privateKeyAlgorithm and kbeKeyAlgorithm + * + * @param anEncryptionKey + * @return + * @throws GeneralSecurityException + * @throws IOException + */ + public PublicKey init(PublicKey anEncryptionKey) + throws GeneralSecurityException, IOException { + String privateKeyAlgorithm = System + .getProperty(ACCOUNT_PRIVATE_KEY_ALGORITHM_PROP); + String kbeKeyAlgorithm = System + .getProperty(ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP); + return init(privateKeyAlgorithm, kbeKeyAlgorithm, anEncryptionKey); + } + + /** + * Create a PrivateKey, encrypt it with a randomly generated SecretKey and * encrypt the SecretKey with a PublicKey * *************** *** 68,79 **** * @throws GeneralSecurityException */ ! public PublicKey init(String aPrivateKeyAlgorithm, ! String secretKeyAlgorithm, PublicKey anEncryptionKey) ! throws GeneralSecurityException, IOException { KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); KeyPair keyPair = keyPairGenerator.genKeyPair(); ! SecretKey secretKey = KeyGenerator.getInstance(secretKeyAlgorithm) ! .generateKey(); Cipher cipher = Cipher.getInstance(secretKey.getAlgorithm()); cipher.init(Cipher.ENCRYPT_MODE, secretKey); --- 98,114 ---- * @throws GeneralSecurityException */ ! public PublicKey init(String aPrivateKeyAlgorithm, String kbeKeyAlgorithm, ! PublicKey anEncryptionKey) throws GeneralSecurityException, ! IOException { ! setKeySize(Integer.parseInt(System ! .getProperty(ACCOUNT_PRIVATE_KEY_LENGTH_PROP))); KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); + keyPairGenerator.initialize(getKeySize()); KeyPair keyPair = keyPairGenerator.genKeyPair(); ! KeyGenerator keyGenerator = KeyGenerator.getInstance(kbeKeyAlgorithm); ! keyGenerator.init(Integer.parseInt(System ! .getProperty(ACCOUNT_USER_KBE_KEY_LENGTH))); ! SecretKey secretKey = keyGenerator.generateKey(); Cipher cipher = Cipher.getInstance(secretKey.getAlgorithm()); cipher.init(Cipher.ENCRYPT_MODE, secretKey); *************** *** 106,109 **** --- 141,146 ---- public PrivateKey getPrivateKey(PrivateKey aDecryptionKey) throws GeneralSecurityException, IOException { + if (encryptedSecretKey == null) + throw new IllegalStateException(NOT_INITIALIZED); SecretKey secretKey = encryptedSecretKey.getSecretKey(aDecryptionKey); Cipher cipher = Cipher.getInstance(secretKey.getAlgorithm()); Index: TolvenPBEPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenPBEPrivateKey.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TolvenPBEPrivateKey.java 27 Nov 2006 08:26:02 -0000 1.4 --- TolvenPBEPrivateKey.java 28 Nov 2006 07:14:34 -0000 1.5 *************** *** 47,55 **** Serializable { protected static final String PBE_KEY_ALGORITHM_PROP = "tolven.security.user.pbeKeyAlgorithm"; ! protected static final String PASSWORD_SALT_LENGTH_PROP = "tolven.security.user.passwordSaltLength"; ! protected static final String PASSWORD_ITERATION_COUNT_PROP = "tolven.security.user.passwordIterationCount"; @Column(name = "pbe_key_algorithm", length = 100) --- 47,61 ---- Serializable { + private final String NOT_INITIALIZED = "TolvenPBEPrivateKey not initialized"; + + protected static final String USER_PRIVATE_KEY_ALGORITHM_PROP = "tolven.security.user.privateKeyAlgorithm"; + + protected static final String USER_PRIVATE_KEY_LENGTH_PROP = "tolven.security.user.privateKeyLength"; + protected static final String PBE_KEY_ALGORITHM_PROP = "tolven.security.user.pbeKeyAlgorithm"; ! protected static final String USER_PASSWORD_SALT_LENGTH_PROP = "tolven.security.user.passwordSaltLength"; ! protected static final String USER_PASSWORD_ITERATION_COUNT_PROP = "tolven.security.user.passwordIterationCount"; @Column(name = "pbe_key_algorithm", length = 100) *************** *** 91,100 **** IOException { String privateKeyAlgorithm = System ! .getProperty(PRIVATE_KEY_ALGORITHM_PROP); String pbeKeyAlgorithm = System.getProperty(PBE_KEY_ALGORITHM_PROP); byte[] salt = rng.generateSeed(Integer.parseInt(System ! .getProperty(PASSWORD_SALT_LENGTH_PROP))); int iterationCount = Integer.parseInt(System ! .getProperty(PASSWORD_ITERATION_COUNT_PROP)); return init(privateKeyAlgorithm, pbeKeyAlgorithm, aPassword, salt, iterationCount); --- 97,106 ---- IOException { String privateKeyAlgorithm = System ! .getProperty(USER_PRIVATE_KEY_ALGORITHM_PROP); String pbeKeyAlgorithm = System.getProperty(PBE_KEY_ALGORITHM_PROP); byte[] salt = rng.generateSeed(Integer.parseInt(System ! .getProperty(USER_PASSWORD_SALT_LENGTH_PROP))); int iterationCount = Integer.parseInt(System ! .getProperty(USER_PASSWORD_ITERATION_COUNT_PROP)); return init(privateKeyAlgorithm, pbeKeyAlgorithm, aPassword, salt, iterationCount); *************** *** 115,120 **** char[] aPassword, byte[] salt, int iterationCount) throws GeneralSecurityException, IOException { ! setKeySize(Integer ! .parseInt(System.getProperty(PRIVATE_KEY_LENGTH_PROP))); KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); --- 121,126 ---- char[] aPassword, byte[] salt, int iterationCount) throws GeneralSecurityException, IOException { ! setKeySize(Integer.parseInt(System ! .getProperty(USER_PRIVATE_KEY_LENGTH_PROP))); KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); *************** *** 148,151 **** --- 154,160 ---- public PrivateKey getPrivateKey(char[] aPassword) throws GeneralSecurityException, IOException { + if (getEncodedEncryptedPrivateKeyInfo() == null + || pbeKeyAlgorithm == null || salt == null) + throw new IllegalStateException(NOT_INITIALIZED); EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo( getEncodedEncryptedPrivateKeyInfo()); Index: TolvenEncryptedPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenEncryptedPrivateKey.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TolvenEncryptedPrivateKey.java 27 Nov 2006 08:26:02 -0000 1.4 --- TolvenEncryptedPrivateKey.java 28 Nov 2006 07:14:34 -0000 1.5 *************** *** 25,32 **** public abstract class TolvenEncryptedPrivateKey { - protected static final String PRIVATE_KEY_ALGORITHM_PROP = "tolven.security.user.privateKeyAlgorithm"; - - protected static final String PRIVATE_KEY_LENGTH_PROP = "tolven.security.user.privateKeyLength"; - @Lob @Basic(fetch = FetchType.LAZY) --- 25,28 ---- |
|
From: Joseph I. <jos...@us...> - 2006-11-28 07:14:33
|
Update of /cvsroot/tolven/tolven/installer/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16636/installer/template Modified Files: tolven.template Log Message: Wired in most of the tolven properties parameters, which configure keys. Index: tolven.template =================================================================== RCS file: /cvsroot/tolven/tolven/installer/template/tolven.template,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tolven.template 26 Nov 2006 09:07:38 -0000 1.4 --- tolven.template 28 Nov 2006 07:14:31 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- tolven.ldap.rootDN=$LDAP_ROOTDN + # The user's public key tolven.security.user.privateKeyLength=1024 # bits tolven.security.user.privateKeyAlgorithm=RSA *************** *** 32,39 **** # Protect Account private key (encrypted with user private key) tolven.security.accountUser.kbeKeyAlgorithm=DESede # or AES ! tolven.security.accountUser.secureRandomSeedLength=16 # bytes # Encrypt document with KBE key (which is encrypted/wrapped with AccountPrivateKey) tolven.security.doc.kbeKeyAlgorithm=DESede # or AES ! tolven.security.doc.secureRandomSeedLength=16 # bytes # Sign document with this algorithm (sign with user private key, verify with user public key) tolven.security.doc.signatureAlgorithm=SHA1withRSA \ No newline at end of file --- 33,40 ---- # Protect Account private key (encrypted with user private key) tolven.security.accountUser.kbeKeyAlgorithm=DESede # or AES ! tolven.security.accountUser.kbeKeyLength=112 # bits # Encrypt document with KBE key (which is encrypted/wrapped with AccountPrivateKey) tolven.security.doc.kbeKeyAlgorithm=DESede # or AES ! tolven.security.doc.kbeKeyLength=112 # bits # Sign document with this algorithm (sign with user private key, verify with user public key) tolven.security.doc.signatureAlgorithm=SHA1withRSA \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-11-28 07:14:33
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16636/template Modified Files: tolven.template Log Message: Wired in most of the tolven properties parameters, which configure keys. Index: tolven.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/tolven.template,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tolven.template 26 Nov 2006 09:07:38 -0000 1.7 --- tolven.template 28 Nov 2006 07:14:31 -0000 1.8 *************** *** 33,40 **** # Protect Account private key (encrypted with user private key) tolven.security.accountUser.kbeKeyAlgorithm=DESede # or AES ! tolven.security.accountUser.secureRandomSeedLength=16 # bytes # Encrypt document with KBE key (which is encrypted/wrapped with AccountPrivateKey) tolven.security.doc.kbeKeyAlgorithm=DESede # or AES ! tolven.security.doc.secureRandomSeedLength=16 # bytes # Sign document with this algorithm (sign with user private key, verify with user public key) tolven.security.doc.signatureAlgorithm=SHA1withRSA --- 33,40 ---- # Protect Account private key (encrypted with user private key) tolven.security.accountUser.kbeKeyAlgorithm=DESede # or AES ! tolven.security.accountUser.kbeKeyLength=112 # bits # Encrypt document with KBE key (which is encrypted/wrapped with AccountPrivateKey) tolven.security.doc.kbeKeyAlgorithm=DESede # or AES ! tolven.security.doc.kbeKeyLength=112 # bits # Sign document with this algorithm (sign with user private key, verify with user public key) tolven.security.doc.signatureAlgorithm=SHA1withRSA |
|
From: Joseph I. <jos...@us...> - 2006-11-27 08:26:05
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1138/src/org/tolven/core/entity Modified Files: TolvenUser.java Log Message: Added persistence code for Tolven encryption keys. Prepared TolvenUser for a TolvenPBEPrivateKey, but have commented it out for now. Index: TolvenUser.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/TolvenUser.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TolvenUser.java 14 Oct 2006 20:13:35 -0000 1.7 --- TolvenUser.java 27 Nov 2006 08:26:02 -0000 1.8 *************** *** 20,23 **** --- 20,25 ---- import org.tolven.doc.entity.DocBase; + //TODO: Uncomment when encryption is released + //import org.tolven.security.bean.TolvenPBEPrivateKey; /** *************** *** 83,86 **** --- 85,92 ---- private DocBase likeness; + // TODO: Uncomment when encryption is released + // @Embedded + // private TolvenPBEPrivateKey privateKey; + transient private Date oldLastLogin; *************** *** 203,206 **** --- 209,223 ---- this.sponsorship = sponsorship; } + + // TODO: Uncomment when encryption is released + /* + public TolvenPBEPrivateKey getPrivateKey() { + return privateKey; + } + + public void setPrivateKey(TolvenPBEPrivateKey privateKey) { + this.privateKey = privateKey; + } + */ |
|
From: Joseph I. <jos...@us...> - 2006-11-27 08:26:04
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1138/src/org/tolven/security/bean Modified Files: TolvenKBEPrivateKey.java TolvenEncryptedSecretKey.java TolvenEncryptedPrivateKey.java TolvenPBEPrivateKey.java Log Message: Added persistence code for Tolven encryption keys. Prepared TolvenUser for a TolvenPBEPrivateKey, but have commented it out for now. Index: TolvenEncryptedSecretKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenEncryptedSecretKey.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TolvenEncryptedSecretKey.java 26 Nov 2006 09:07:35 -0000 1.1 --- TolvenEncryptedSecretKey.java 27 Nov 2006 08:26:02 -0000 1.2 *************** *** 14,17 **** --- 14,18 ---- package org.tolven.security.bean; + import java.io.Serializable; import java.security.GeneralSecurityException; import java.security.PrivateKey; *************** *** 19,22 **** --- 20,24 ---- import javax.crypto.Cipher; import javax.crypto.SecretKey; + import javax.persistence.*; /** *************** *** 28,37 **** * */ ! public class TolvenEncryptedSecretKey { private final String NOT_INITIALIZED = "TolvenEncryptedSecretKey not initialized"; private byte[] encryptedKey; private String algorithm; --- 30,42 ---- * */ ! @Embeddable ! public class TolvenEncryptedSecretKey implements Serializable { private final String NOT_INITIALIZED = "TolvenEncryptedSecretKey not initialized"; + @Column(name = "encrypted_secret_key") private byte[] encryptedKey; + @Column(name = "secret_key_algorithm") private String algorithm; Index: TolvenKBEPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenKBEPrivateKey.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TolvenKBEPrivateKey.java 26 Nov 2006 09:07:35 -0000 1.1 --- TolvenKBEPrivateKey.java 27 Nov 2006 08:26:01 -0000 1.2 *************** *** 14,17 **** --- 14,19 ---- package org.tolven.security.bean; + import java.io.IOException; + import java.io.Serializable; import java.security.GeneralSecurityException; import java.security.KeyFactory; *************** *** 25,28 **** --- 27,31 ---- import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; + import javax.persistence.*; /** *************** *** 36,41 **** * */ ! public class TolvenKBEPrivateKey extends TolvenEncryptedPrivateKey { private TolvenEncryptedSecretKey encryptedSecretKey; --- 39,47 ---- * */ ! @Embeddable ! public class TolvenKBEPrivateKey extends TolvenEncryptedPrivateKey implements ! Serializable { + @Embedded private TolvenEncryptedSecretKey encryptedSecretKey; *************** *** 64,68 **** public PublicKey init(String aPrivateKeyAlgorithm, String secretKeyAlgorithm, PublicKey anEncryptionKey) ! throws GeneralSecurityException { KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); --- 70,74 ---- public PublicKey init(String aPrivateKeyAlgorithm, String secretKeyAlgorithm, PublicKey anEncryptionKey) ! throws GeneralSecurityException, IOException { KeyPairGenerator keyPairGenerator = KeyPairGenerator .getInstance(aPrivateKeyAlgorithm); *************** *** 74,79 **** byte[] encryptedPrivateKey = cipher.doFinal(keyPair.getPrivate() .getEncoded()); ! setEncryptedPrivateKeyInfo(new EncryptedPrivateKeyInfo( ! aPrivateKeyAlgorithm, encryptedPrivateKey)); encryptedSecretKey = TolvenEncryptedSecretKey.getInstance(); encryptedSecretKey.init(secretKey, anEncryptionKey); --- 80,86 ---- byte[] encryptedPrivateKey = cipher.doFinal(keyPair.getPrivate() .getEncoded()); ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo( ! aPrivateKeyAlgorithm, encryptedPrivateKey); ! setEncodedEncryptedPrivateKeyInfo(encryptedPrivateKeyInfo.getEncoded()); encryptedSecretKey = TolvenEncryptedSecretKey.getInstance(); encryptedSecretKey.init(secretKey, anEncryptionKey); *************** *** 98,106 **** */ public PrivateKey getPrivateKey(PrivateKey aDecryptionKey) ! throws GeneralSecurityException { SecretKey secretKey = encryptedSecretKey.getSecretKey(aDecryptionKey); Cipher cipher = Cipher.getInstance(secretKey.getAlgorithm()); cipher.init(Cipher.DECRYPT_MODE, secretKey); ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = getEncryptedPrivateKeyInfo(); byte[] decryptedPrivateKey = cipher.doFinal(encryptedPrivateKeyInfo .getEncryptedData()); --- 105,114 ---- */ public PrivateKey getPrivateKey(PrivateKey aDecryptionKey) ! throws GeneralSecurityException, IOException { SecretKey secretKey = encryptedSecretKey.getSecretKey(aDecryptionKey); Cipher cipher = Cipher.getInstance(secretKey.getAlgorithm()); cipher.init(Cipher.DECRYPT_MODE, secretKey); ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo( ! getEncodedEncryptedPrivateKeyInfo()); byte[] decryptedPrivateKey = cipher.doFinal(encryptedPrivateKeyInfo .getEncryptedData()); Index: TolvenPBEPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenPBEPrivateKey.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TolvenPBEPrivateKey.java 27 Nov 2006 04:57:52 -0000 1.3 --- TolvenPBEPrivateKey.java 27 Nov 2006 08:26:02 -0000 1.4 *************** *** 14,17 **** --- 14,19 ---- package org.tolven.security.bean; + import java.io.IOException; + import java.io.Serializable; import java.security.GeneralSecurityException; import java.security.KeyFactory; *************** *** 29,32 **** --- 31,35 ---- import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; + import javax.persistence.*; /** *************** *** 40,44 **** * */ ! public class TolvenPBEPrivateKey extends TolvenEncryptedPrivateKey { protected static final String PBE_KEY_ALGORITHM_PROP = "tolven.security.user.pbeKeyAlgorithm"; --- 43,49 ---- * */ ! @Embeddable ! public class TolvenPBEPrivateKey extends TolvenEncryptedPrivateKey implements ! Serializable { protected static final String PBE_KEY_ALGORITHM_PROP = "tolven.security.user.pbeKeyAlgorithm"; *************** *** 48,55 **** --- 53,65 ---- protected static final String PASSWORD_ITERATION_COUNT_PROP = "tolven.security.user.passwordIterationCount"; + @Column(name = "pbe_key_algorithm", length = 100) private String pbeKeyAlgorithm; + @Lob + @Basic(fetch = FetchType.LAZY) + @Column(name = "pbe_key_salt") private byte[] salt; + @Column(name = "pbe_key_iteration_count") private int iterationCount; *************** *** 78,82 **** * @throws GeneralSecurityException */ ! public PublicKey init(char[] aPassword) throws GeneralSecurityException { String privateKeyAlgorithm = System .getProperty(PRIVATE_KEY_ALGORITHM_PROP); --- 88,93 ---- * @throws GeneralSecurityException */ ! public PublicKey init(char[] aPassword) throws GeneralSecurityException, ! IOException { String privateKeyAlgorithm = System .getProperty(PRIVATE_KEY_ALGORITHM_PROP); *************** *** 103,107 **** public PublicKey init(String aPrivateKeyAlgorithm, String aPBEKeyAlgorithm, char[] aPassword, byte[] salt, int iterationCount) ! throws GeneralSecurityException { setKeySize(Integer .parseInt(System.getProperty(PRIVATE_KEY_LENGTH_PROP))); --- 114,118 ---- public PublicKey init(String aPrivateKeyAlgorithm, String aPBEKeyAlgorithm, char[] aPassword, byte[] salt, int iterationCount) ! throws GeneralSecurityException, IOException { setKeySize(Integer .parseInt(System.getProperty(PRIVATE_KEY_LENGTH_PROP))); *************** *** 119,124 **** byte[] encryptedPrivateKey = cipher.doFinal(keyPair.getPrivate() .getEncoded()); ! setEncryptedPrivateKeyInfo(new EncryptedPrivateKeyInfo( ! aPrivateKeyAlgorithm, encryptedPrivateKey)); this.pbeKeyAlgorithm = aPBEKeyAlgorithm; this.salt = salt; --- 130,136 ---- byte[] encryptedPrivateKey = cipher.doFinal(keyPair.getPrivate() .getEncoded()); ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo( ! aPrivateKeyAlgorithm, encryptedPrivateKey); ! setEncodedEncryptedPrivateKeyInfo(encryptedPrivateKeyInfo.getEncoded()); this.pbeKeyAlgorithm = aPBEKeyAlgorithm; this.salt = salt; *************** *** 135,140 **** */ public PrivateKey getPrivateKey(char[] aPassword) ! throws GeneralSecurityException { ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = getEncryptedPrivateKeyInfo(); PBEKeySpec pbeKeySpec = new PBEKeySpec(aPassword); SecretKey secretKey = SecretKeyFactory.getInstance(pbeKeyAlgorithm) --- 147,153 ---- */ public PrivateKey getPrivateKey(char[] aPassword) ! throws GeneralSecurityException, IOException { ! EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo( ! getEncodedEncryptedPrivateKeyInfo()); PBEKeySpec pbeKeySpec = new PBEKeySpec(aPassword); SecretKey secretKey = SecretKeyFactory.getInstance(pbeKeyAlgorithm) *************** *** 146,150 **** PKCS8EncodedKeySpec privateKeySpec = encryptedPrivateKeyInfo .getKeySpec(cipher); ! return KeyFactory.getInstance(getPrivateKeyAlgorithm()) .generatePrivate(privateKeySpec); } --- 159,163 ---- PKCS8EncodedKeySpec privateKeySpec = encryptedPrivateKeyInfo .getKeySpec(cipher); ! return KeyFactory.getInstance(encryptedPrivateKeyInfo.getAlgName()) .generatePrivate(privateKeySpec); } Index: TolvenEncryptedPrivateKey.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/TolvenEncryptedPrivateKey.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TolvenEncryptedPrivateKey.java 27 Nov 2006 04:57:52 -0000 1.3 --- TolvenEncryptedPrivateKey.java 27 Nov 2006 08:26:02 -0000 1.4 *************** *** 14,18 **** package org.tolven.security.bean; ! import javax.crypto.EncryptedPrivateKeyInfo; /** --- 14,18 ---- package org.tolven.security.bean; ! import javax.persistence.*; /** *************** *** 22,25 **** --- 22,26 ---- * */ + @MappedSuperclass public abstract class TolvenEncryptedPrivateKey { *************** *** 28,33 **** protected static final String PRIVATE_KEY_LENGTH_PROP = "tolven.security.user.privateKeyLength"; ! private EncryptedPrivateKeyInfo encryptedPrivateKeyInfo; private int keySize; --- 29,38 ---- protected static final String PRIVATE_KEY_LENGTH_PROP = "tolven.security.user.privateKeyLength"; ! @Lob ! @Basic(fetch = FetchType.LAZY) ! @Column(name = "encoded_encrypted_private_key_info") ! private byte[] encodedEncryptedPrivateKeyInfo; + @Column(name = "private_key_size") private int keySize; *************** *** 37,42 **** * @return */ ! protected EncryptedPrivateKeyInfo getEncryptedPrivateKeyInfo() { ! return encryptedPrivateKeyInfo; } --- 42,47 ---- * @return */ ! protected byte[] getEncodedEncryptedPrivateKeyInfo() { ! return encodedEncryptedPrivateKeyInfo; } *************** *** 46,61 **** * @param anEncryptedPrivateKeyInfo */ ! protected void setEncryptedPrivateKeyInfo( ! EncryptedPrivateKeyInfo anEncryptedPrivateKeyInfo) { ! encryptedPrivateKeyInfo = anEncryptedPrivateKeyInfo; ! } ! ! /** ! * Return the PrivateKey algorithm ! * ! * @return ! */ ! public String getPrivateKeyAlgorithm() { ! return encryptedPrivateKeyInfo.getAlgName(); } --- 51,57 ---- * @param anEncryptedPrivateKeyInfo */ ! protected void setEncodedEncryptedPrivateKeyInfo( ! byte[] anEncodedEncryptedPrivateKeyInfo) { ! encodedEncryptedPrivateKeyInfo = anEncodedEncryptedPrivateKeyInfo; } |
3 messages has been excluded from this view by a project administrator.
