tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/entity MDContext.java, NONE, 1.1

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

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

Added Files:
	MDContext.java 
Log Message:
Update PHR menus and add a family generator when creating a PHR account

--- NEW FILE: MDContext.java ---
package org.tolven.app.entity;
/**
 * <p>When a Menu Data item is opened in a context, a persistent record of that context is made.
 * For example, when a user opens a patient, that patient is added to this context.
 * When the user closes the patient, the context is removed (MAYBE). </p>
 * <p>Context is always specific to a user but it may be possible for one user to "see" the
 * context of another user as long as those two users are in the same account.</p>
 * <p>A context object is only required when MenuStructure notes that a placeholder is 
 * in use. In effect, a placeholder node in MenuStructute says that this is where instances of 
 * that particular type of object are placed. But Context is not concerned where in the MenuStructure
 * objects are displayed, only that zero or more instances are active.</p>
 * <p>At the top level, as with all aspects of application data, is account. And from a 
 * security perspective, account is implied and enforced. There is no such thing as a
 * context that can refer to something in a different account. This restriction is enforced
 * in low-level code regardless of configuration. </p>
 * <p>As described above, context is per user. Technically, this means that the appropriate top-level
 * organizer for MDContext is AccountUser. This object is a combination of Account and TolvenUser. While
 * inter-Account references are not allowed, the TolvenUser half of the association can be crossed.
 * That feature will be described in the future.</p>
 * <p>Conceptually, each time a tab is added to a tab or a menu is added to a menu bar, an MDContext is created. 
 * Likewise, when the close button is pressed on a tab or a menu pane is closed or submitted, that corresponding
 * MDContext can be be deleted. In the eCHR and ePHR applications, the most common such behavior is Patient. 
 * In fact, any kind of object can be used. For example, in life sciences the top-level context might be Subject. 
 * In public health, the top-level might be Case.</p>
 * <p>Because MenuStructure is a tree structure, so too is the MenuContext. For example, say a patient from
 * a patient listis selected and opened. A context is created for the patient. Now, within that patient, 
 * a specific lab result is opened for display. Or a Glasgow Coma Scale assessment wizard (data entry) is initiated.
 * In either of these cases, the new menu pane is "in the context of" the patient (generically parent) context.
 * This is a critical aspect of MDContext's: What is going on with one patient should not affect what is
 * going on with another patient, especially when the user is switching between them.</p>
 * <p>MDContext behaves like a bookmark, not an access control list. Thus, while it is
 * important to organize contexts in a hierarchy, there are good reasons to provide a facile means of crossing
 * between contexts. Consider this example: Patients currently being seen in the Emergency Room are at varying
 * levels of acuity. A clinician may need to "stack" several patients and shuttle between them based on the work to
 * be done. Thus, it may be important to visit the contexts in an "inverted" way. So, rather than asking 
 * "What does this patient need?" the clinician may ask: "Which patients need blood work?" Or, 
 * "Which patients need meds?" Context inversion is simply another type of query. It does not require 
 * another set of contexts.</p>
 * <p>Technically, each value column in MDContext corresponds to a placeholder node in the MenuStructure hierarchy.
 * For example, the eCHR hierarchy has placeholders like this. </p>
 * <ol>
 * <li>patient</li>
 * <li>patient:labResult</li>
 * <li>patient:radResult</li>
 * <li>patient:radResult</li>
 * </ol>
 * </p>
 * 
 * @author John Churin
 *
 */
public class MDContext {

}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/voc/umls/entity VersionedSource.java, 1.1, 1.2 ConceptRelationship.java, 1.1, 1.2 ConceptRelationshipAttribute.java, 1.1, 1.2 AtomRelationship.java, 1.1, 1.2 ARelationshipType.java, 1.1, 1.2 AnAttributeName.java, 1.1, 1.2 ConceptHierarchy.java, 1.1, 1.2 Atom.java, 1.1, 1.2 Coocurrence.java, 1.1, 1.2 AtomCoocurrence.java, 1.1, 1.2 ConceptAttribute.java, 1.1, 1.2 ConceptSemanticType.java, 1.1, 1.2 RootSource.java, 1.1, 1.2 AStringType.java, 1.1, 1.2 NormalizedWordKey.java, 1.1, 1.2 SemanticType.java, 1.1, 1.2 ATermStatus.java, 1.1, 1.2 ACoocurrenceType.java, 1.1, 1.2 LoaderControl.java, 1.1, 1.2 AtomAttribute.java, 1.1, 1.2 ATermType.java, 1.1, 1.2 ALanguage.java, 1.1, 1.2 NormalizedWord.java, 1.1, 1.2 ASourceIdentifierType.java, 1.1, 1.2 Relationship.java, 1.1, 1.2 Source.java, 1.1, 1.2 AtomContext.java, 1.1, 1.2 Attribute.java, 1.1, 1.2 AnAdditionalRelationship.java, 1.1, 1.2

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

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17882/src/org/tolven/voc/umls/entity

Modified Files:
	VersionedSource.java ConceptRelationship.java 
	ConceptRelationshipAttribute.java AtomRelationship.java 
	ARelationshipType.java AnAttributeName.java 
	ConceptHierarchy.java Atom.java Coocurrence.java 
	AtomCoocurrence.java ConceptAttribute.java 
	ConceptSemanticType.java RootSource.java AStringType.java 
	NormalizedWordKey.java SemanticType.java ATermStatus.java 
	ACoocurrenceType.java LoaderControl.java AtomAttribute.java 
	ATermType.java ALanguage.java NormalizedWord.java 
	ASourceIdentifierType.java Relationship.java Source.java 
	AtomContext.java Attribute.java AnAdditionalRelationship.java 
Log Message:
Added comments cross-referencing object name to RRF.

Index: Relationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/Relationship.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Relationship.java	14 Jun 2006 01:50:50 -0000	1.1
--- Relationship.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 20,24 ****
  
  /**
!  * An abstract relationship. Subclasses are used for Atom and Concept relationships.
   */
  @MappedSuperclass
--- 20,31 ----
  
  /**
!  * An abstract relationship. Subclasses are used for Atom-atom and Concept-concept relationships.
!  * 2.7.1.3.9 Related Concepts (File = MRREL.RRF)
!  * <ol>
!  * <li>If stype1==AUI and srtpe2=AUI create an AtomRelationship subclass</li>  
!  * <li>If stype1==CUI and srtpe2=CUI create a ConceptRelationship subclass</li>  
!  * <li>Otherwise, do not create any object</li>
!  * </ol>
!  * Notice that this class has no natual key and so a surrogate key is used.
   */
  @MappedSuperclass

Index: ARelationshipType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ARelationshipType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ARelationshipType.java	14 Jun 2006 01:50:50 -0000	1.1
--- ARelationshipType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,20 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * Relationship Label (used in MRREL)
   */
  @Entity
  @Table(name = "ABBR_REL", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ARelationshipType implements Serializable {
  
--- 8,17 ----
  import javax.persistence.Table;
  
  /**
!  * A valid  Relationship Label abbreviation, UMLS TS, loaded from MRDOC.RRF when
!  * KEY = REL.
   */
  @Entity
  @Table(name = "ABBR_REL", schema="umls")
  public class ARelationshipType implements Serializable {
  

Index: ConceptRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ConceptRelationship.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConceptRelationship.java	14 Jun 2006 01:50:50 -0000	1.1
--- ConceptRelationship.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 12,21 ****
  import javax.persistence.Table;
  
! //import org.hibernate.annotations.Cache;
! //import org.hibernate.annotations.CacheConcurrencyStrategy;
! 
  @Entity
  @Table(name = "CONCEPT_REL_ATTR", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ConceptRelationship extends Relationship {
  	@ManyToOne
--- 12,23 ----
  import javax.persistence.Table;
  
! /**
!  * Relate one concept to another concept.
!  * @see Relationship
!  * @author John Churin
!  * 
!  */
  @Entity
  @Table(name = "CONCEPT_REL_ATTR", schema="umls")
  public class ConceptRelationship extends Relationship {
  	@ManyToOne

Index: AnAttributeName.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AnAttributeName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AnAttributeName.java	14 Jun 2006 01:50:50 -0000	1.1
--- AnAttributeName.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 7,14 ****
  
  import java.io.Serializable;
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
  
  import javax.persistence.Column;
--- 7,10 ----
***************
*** 17,31 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * An attribute name.
!  * 
   * @author John Churin
   */
  @Entity
  @Table(name = "ABBR_ATN", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class AnAttributeName implements Serializable {
  
--- 13,23 ----
  import javax.persistence.Table;
  
  /**
!  * A valid  AttributeName abbreviation, UMLS ATN, loaded from MRDOC.RRF when
!  * KEY = ATN.
   * @author John Churin
   */
  @Entity
  @Table(name = "ABBR_ATN", schema="umls")
  public class AnAttributeName implements Serializable {
  

Index: Coocurrence.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/Coocurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Coocurrence.java	14 Jun 2006 01:50:50 -0000	1.1
--- Coocurrence.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 17,20 ****
--- 17,22 ----
  /**
   * A co-occurence. We'll need a surrogate key since one isn't provided by UMLS.
+  * There is one one subclass, AtomCoocurrence.
+  * @see AtomCoocurrence 
   * 
   */

Index: ATermStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ATermStatus.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ATermStatus.java	14 Jun 2006 01:50:50 -0000	1.1
--- ATermStatus.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,20 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * A valid Term Status abbreviation, UMLS TS, loaded from MRDOC.
   */
  @Entity
  @Table(name = "ABBR_TS", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ATermStatus implements Serializable {
  
--- 8,17 ----
  import javax.persistence.Table;
  
  /**
!  * A valid Term Status abbreviation, UMLS TS, loaded from MRDOC.RRF when
!  * KEY = TS.
   */
  @Entity
  @Table(name = "ABBR_TS", schema="umls")
  public class ATermStatus implements Serializable {
  

Index: ASourceIdentifierType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ASourceIdentifierType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASourceIdentifierType.java	14 Jun 2006 01:50:50 -0000	1.1
--- ASourceIdentifierType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 11,24 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * Represents a sourceIdentifier as defined by UMLS.
!  * @author John Churin
   */
  @Entity
  @Table(name = "ABBR_STYPE", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ASourceIdentifierType  implements Serializable {
     /**
--- 11,20 ----
  import javax.persistence.Table;
  
  /**
!  * A valid Source Identifier (UMLS STYPE) abbreviation, loaded from MRDOC.RRF when
!  * KEY = STYPE.
   */
  @Entity
  @Table(name = "ABBR_STYPE", schema="umls")
  public class ASourceIdentifierType  implements Serializable {
     /**

Index: Source.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/Source.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Source.java	14 Jun 2006 01:50:50 -0000	1.1
--- Source.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 16,20 ****
   * All attributes of a versioned source descriptor are also included in a root source
   * descriptor.
!  * The root descriptors are those referenced by 
   */
  @MappedSuperclass
--- 16,24 ----
   * All attributes of a versioned source descriptor are also included in a root source
   * descriptor.
!  * 2.7.1.3.15 Source Information (File = MRSAB.RRF)
!  * 
!  * The input RRF contains one row per "versioned" source (VSAB). 
!  * Root Source Abbreviations are extracted from the same RRF selecting only those entries
!  * where CURVER = Y.
   */
  @MappedSuperclass

Index: AnAdditionalRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AnAdditionalRelationship.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AnAdditionalRelationship.java	14 Jun 2006 01:50:50 -0000	1.1
--- AnAdditionalRelationship.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,20 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * Additional Relationship Label, RELA used in MRREL, mapping, etc
   */
  @Entity
  @Table(name = "ABBR_RELA", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class AnAdditionalRelationship implements Serializable  {
  
--- 8,18 ----
  import javax.persistence.Table;
  
  /**
!  * A valid  Additional Relationship Label, UMLS RELA, loaded from MRDOC.RRF when
!  * KEY = RELA.
!  * @author John Churin
   */
  @Entity
  @Table(name = "ABBR_RELA", schema="umls")
  public class AnAdditionalRelationship implements Serializable  {
  

Index: ConceptRelationshipAttribute.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ConceptRelationshipAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConceptRelationshipAttribute.java	14 Jun 2006 01:50:50 -0000	1.1
--- ConceptRelationshipAttribute.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,17 ****
  import javax.persistence.Table;
  
! //import org.hibernate.annotations.Cache;
! //import org.hibernate.annotations.CacheConcurrencyStrategy;
! 
  @Entity
  @Table(name = "CONCEPT_REL_ATTR", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ConceptRelationshipAttribute extends Attribute implements Serializable {
  
--- 8,19 ----
  import javax.persistence.Table;
  
! /**
!  * Relate one concept to another concept.
!  * @see Relationship
!  * @author John Churin
!  * 
!  */
  @Entity
  @Table(name = "CONCEPT_REL_ATTR", schema="umls")
  public class ConceptRelationshipAttribute extends Attribute implements Serializable {
  

Index: RootSource.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/RootSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RootSource.java	14 Jun 2006 01:50:50 -0000	1.1
--- RootSource.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 12,21 ****
  import javax.persistence.Table;
  
! //import org.hibernate.annotations.Cache;
! //import org.hibernate.annotations.CacheConcurrencyStrategy;
! 
  @Entity
  @Table(name = "RSOURCE", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class RootSource extends Source implements Serializable {
  
--- 12,27 ----
  import javax.persistence.Table;
  
! /**
!  * This is a subclass of Source
!  * This table is derived from MRSAB.RRF by loading only unique source vocabulary roots.
!  * One root source will have many versions over time. Atoms are linked to the specific 
!  * version of a source and at the same time provides denormalized reference to the root source
!  * for when that is needed.
!  * @see Source
!  * @author John Churin
!  *
!  */
  @Entity
  @Table(name = "RSOURCE", schema="umls")
  public class RootSource extends Source implements Serializable {
  

Index: LoaderControl.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/LoaderControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LoaderControl.java	14 Jun 2006 01:50:50 -0000	1.1
--- LoaderControl.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 12,15 ****
--- 12,18 ----
  /**
   * Control file for loading UMLS content
+  * NOTE: This was a failed attempt to create a control file for 
+  * keeping track of loading segements of large RRF's.
+  * THIS FILE (and table) CAN BE IGNORED.
   * @author John Churin
   *

Index: ATermType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ATermType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ATermType.java	14 Jun 2006 01:50:50 -0000	1.1
--- ATermType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,16 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * A valid Term Type abbreviation, UMLS TTY, loaded from MRDOC.
   */
  @Entity
--- 8,14 ----
  import javax.persistence.Table;
  
  /**
!  * A valid Term Type abbreviation, UMLS TTY, loaded from MRDOC.RRF when
!  * KEY = TTY.
   */
  @Entity

Index: SemanticType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/SemanticType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SemanticType.java	14 Jun 2006 01:50:50 -0000	1.1
--- SemanticType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 15,18 ****
--- 15,20 ----
   * The file name is SRDEF (no extension) in the NET subdirectory of UMLS (next to META directory).
   * The first field in this file is a record type. We're only interested in STY rows.
+  * This file is defined in the UMLS SemanticNetwork, not an RRF.
+  * See SRDEF in Section 3, Semantic Network, of the UMLS documentation.
   * @author John Churin
   *
***************
*** 20,24 ****
  @Entity
  @Table(name = "NET_SRDEF", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class SemanticType  implements Serializable {
  
--- 22,25 ----

Index: NormalizedWordKey.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/NormalizedWordKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NormalizedWordKey.java	14 Jun 2006 01:50:50 -0000	1.1
--- NormalizedWordKey.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 9,13 ****
  import javax.persistence.ManyToOne;
  import javax.persistence.Transient;
! 
  @Embeddable
  public class NormalizedWordKey implements Serializable {
--- 9,17 ----
  import javax.persistence.ManyToOne;
  import javax.persistence.Transient;
! /**
!  * 
!  * @author John Churin
!  *
!  */
  @Embeddable
  public class NormalizedWordKey implements Serializable {

Index: ALanguage.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ALanguage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ALanguage.java	14 Jun 2006 01:50:50 -0000	1.1
--- ALanguage.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,20 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * Represents one language as specified by UMLS. Represented in many RRF tables as LAT.
   */
  @Entity
  @Table(name = "ABBR_LAT", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ALanguage implements Serializable {
  
--- 8,20 ----
  import javax.persistence.Table;
  
  /**
!  * A valid  Language type, UMLS LAT, loaded from MRDOC.RRF when
!  * KEY = LAT.
!  * Corresponds to LAT column in MRCONSO and other files.
!  * @author John Churin
   */
+ 
  @Entity
  @Table(name = "ABBR_LAT", schema="umls")
  public class ALanguage implements Serializable {
  

Index: AtomContext.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AtomContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AtomContext.java	14 Jun 2006 01:50:50 -0000	1.1
--- AtomContext.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
   * This object is owned by an atom. As with RRF files, this entry contains a 
   * compressed path of category within each category.
+  * 2.7.1.3.12 Contexts (File = MRCXT.RRF)
   */
  @Table(name = "ATOM_CTX", schema="umls")

Index: ConceptAttribute.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ConceptAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConceptAttribute.java	14 Jun 2006 01:50:50 -0000	1.1
--- ConceptAttribute.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,15 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
  /**
   * An attribute of a concept. Most of the work is done in the base class.
   * 
   * @author John Churin
--- 8,17 ----
  import javax.persistence.Table;
  
  /**
   * An attribute of a concept. Most of the work is done in the base class.
+  * ConceptAttribute is a child of Concept.
+  * A Concept may have zero, one, or more ConceptAttributes.
+  * This essentially provides a list of name-value pairs for a concept. 
+  * @see Attribute
   * 
   * @author John Churin
***************
*** 18,22 ****
  @Entity
  @Table(name = "CONCEPT_ATTR", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ConceptAttribute extends Attribute implements Serializable {
  
--- 20,23 ----

Index: AtomCoocurrence.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AtomCoocurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AtomCoocurrence.java	14 Jun 2006 01:50:50 -0000	1.1
--- AtomCoocurrence.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 20,25 ****
  /**
   * A Co-occurence for an Atom.
!  * As far as I can tell, there is no such thing as a real concept co-occurence.
!  * Also, we'll ignore the COT=LQ entries that don't relate one atom to another. 
   */
  @Entity
--- 20,26 ----
  /**
   * A Co-occurence for an Atom.
!  * Ignore the COT=LQ entries that don't relate one atom to another. In other words, ignore
!  * and record were either AUI1 or AUI2 are null. 
!  * 2.7.1.3.10 Co-occurring Concepts (File = MRCOC.RRF)
   */
  @Entity

Index: ACoocurrenceType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ACoocurrenceType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ACoocurrenceType.java	14 Jun 2006 01:50:50 -0000	1.1
--- ACoocurrenceType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 1,9 ****
   package org.tolven.voc.umls.entity;
  
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- 
  import javax.persistence.Column;
  import javax.persistence.Entity;
--- 1,4 ----
***************
*** 11,24 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * A type of coocurrence. 
!  *  @author John Churin
   */
  @Entity
  @Table(name = "ABBR_COT", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ACoocurrenceType  {
  
--- 6,17 ----
  import javax.persistence.Table;
  
  /**
!  * A valid type of coocurrence, UMLS COT, loaded from MRDOC.RRF when
!  * KEY = COT.
!  * Corresponds to COT column in MRCOC.RRF.
!  * @author John Churin
   */
  @Entity
  @Table(name = "ABBR_COT", schema="umls")
  public class ACoocurrenceType  {
  

Index: Attribute.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/Attribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Attribute.java	14 Jun 2006 01:50:50 -0000	1.1
--- Attribute.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 15,22 ****
   * facilitate correct foreign key associations. But this base class does most of
   * the work of these classes.
   * <p>From the single RRF MRSAT file, distribute rows as follows:
   * <pre>
   * ConceptAttribute: STYPE=CUI (metaui=null)
!  * RelationshipAttribute: STYPE=SRUI( metaui begins with R)
   * AtomAttribute: All other STYPE values ('AUI', 'SDUI', 'SAUI','SCUI', 'CODE')
   * </pre>
--- 15,23 ----
   * facilitate correct foreign key associations. But this base class does most of
   * the work of these classes.
+  * 2.7.1.3.5 Simple Concept and Atom Attributes (File = MRSAT.RRF)
   * <p>From the single RRF MRSAT file, distribute rows as follows:
   * <pre>
   * ConceptAttribute: STYPE=CUI (metaui=null)
!  * RelationshipAttribute: STYPE=SRUI( metaui begins with R) -- IGNORE THESE rows in RRF
   * AtomAttribute: All other STYPE values ('AUI', 'SDUI', 'SAUI','SCUI', 'CODE')
   * </pre>

Index: AtomRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AtomRelationship.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AtomRelationship.java	14 Jun 2006 01:50:50 -0000	1.1
--- AtomRelationship.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 17,27 ****
  import javax.persistence.Table;
  
! //import org.hibernate.annotations.Cache;
! //import org.hibernate.annotations.CacheConcurrencyStrategy;
! 
! 
  @Entity
  @Table(name = "ATOM_REL", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class AtomRelationship extends Relationship   {
  
--- 17,28 ----
  import javax.persistence.Table;
  
! /**
!  * Relate one atom to another atom.
!  * @see Relationship
!  * @author John Churin
!  * 
!  */
  @Entity
  @Table(name = "ATOM_REL", schema="umls")
  public class AtomRelationship extends Relationship   {
  

Index: AStringType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AStringType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AStringType.java	14 Jun 2006 01:50:50 -0000	1.1
--- AStringType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,21 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * A valid StringType (UMLS STT)
   */
  
  @Entity
  @Table(name = "ABBR_STT", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class AStringType implements Serializable {
  
--- 8,18 ----
  import javax.persistence.Table;
  
  /**
!  * A valid StringType (UMLS STT) abbreviation, loaded from MRDOC.RRF when
!  * KEY = STT.
   */
  
  @Entity
  @Table(name = "ABBR_STT", schema="umls")
  public class AStringType implements Serializable {
  

Index: Atom.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/Atom.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Atom.java	14 Jun 2006 01:50:50 -0000	1.1
--- Atom.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 24,27 ****
--- 24,29 ----
   * The union of concept, term, string, and code from source terminologies. A
   * concept has one or more atoms. The primary key is a AUI assigned by UMLS.
+  * 2.7.1.3.4 Concept Names and Sources (File = MRCONSO.RRF)
+  * There is one row in this table for each row in MRCONSO.RRF
   */
  @Entity

Index: NormalizedWord.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/NormalizedWord.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NormalizedWord.java	14 Jun 2006 01:50:50 -0000	1.1
--- NormalizedWord.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 15,19 ****
  /**
   * A link between words and concepts
!  * 
   * @author John Churin
   */
--- 15,21 ----
  /**
   * A link between words and concepts
!  * 2.7.1.3.21 Normalized Word Index (File = MRXNW_ENG.RRF)
!  * Notice that the key is compound and thus defined in a separate class (NormalizedWordKey).
!  * There are also normalized string indexes in UMLS which we do not load into Tolven.
   * @author John Churin
   */

Index: ConceptSemanticType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ConceptSemanticType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConceptSemanticType.java	14 Jun 2006 01:50:50 -0000	1.1
--- ConceptSemanticType.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 10,21 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
!  * Associate a concept with a {@link SemanticType}. When loading this table, we
!  * ignore Semantic Type tree number (STN) and Semantic Type(STY) because they
   * are already defined in SRDEF (SemanticType class). This is essentially a
   * many-to-many join table between concepts and semantic types.
   * 
   * @author John Churin
--- 10,19 ----
  import javax.persistence.Table;
  
  /**
!  * Associate a concept with zero or more {@link SemanticType}. When loading this table, we
!  * don't store explicitly because Semantic Type tree number (STN) and Semantic Type(STY)
   * are already defined in SRDEF (SemanticType class). This is essentially a
   * many-to-many join table between concepts and semantic types.
+  * 2.7.1.3.7 Semantic Types (File = MRSTY.RRF)
   * 
   * @author John Churin
***************
*** 23,27 ****
  @Entity
  @Table(name = "CONCEPT_STY", schema="umls")
- //@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ConceptSemanticType implements Serializable {
  
--- 21,24 ----

Index: VersionedSource.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/VersionedSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionedSource.java	14 Jun 2006 01:50:50 -0000	1.1
--- VersionedSource.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 10,19 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
  /**
   * A versioned source entity is owned by a root source entrty.
!  * the root entry corresponeds to the one loaded into the current version of UMLS.
   * @author John Churin
   *
--- 10,19 ----
  import javax.persistence.Table;
  
  /**
   * A versioned source entity is owned by a root source entrty.
!  * The root entry corresponds to the one loaded into the current version of UMLS.
!  * 
!  * The input RRF contains one row per "versioned" source (VSAB). 
!  * @see Source
   * @author John Churin
   *
***************
*** 21,25 ****
  @Entity
  @Table(name = "VSOURCE", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class VersionedSource extends Source implements Serializable {
  
--- 21,24 ----

Index: ConceptHierarchy.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/ConceptHierarchy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConceptHierarchy.java	14 Jun 2006 01:50:50 -0000	1.1
--- ConceptHierarchy.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 13,23 ****
  import javax.persistence.Table;
  import javax.persistence.Transient;
! 
! //import org.hibernate.annotations.Cache;
! //import org.hibernate.annotations.CacheConcurrencyStrategy;
! 
  @Entity
  @Table(name = "CONCEPT_HIER", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class ConceptHierarchy  implements Serializable{
  
--- 13,25 ----
  import javax.persistence.Table;
  import javax.persistence.Transient;
! /**
!  * 2.7.1.3.11 Computable Hierarchies (File = MRHIER.RRF)
!  * One row per hierarchy (classification) node. there may be zero one or more of these entries per Atom. 
!  * This entity depends on Concept and Atom. 
!  * @author John Churin
!  *
!  */
  @Entity
  @Table(name = "CONCEPT_HIER", schema="umls")
  public class ConceptHierarchy  implements Serializable{
  

Index: AtomAttribute.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/entity/AtomAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AtomAttribute.java	14 Jun 2006 01:50:50 -0000	1.1
--- AtomAttribute.java	10 Nov 2006 01:42:18 -0000	1.2
***************
*** 8,23 ****
  import javax.persistence.Table;
  
- //import org.hibernate.annotations.Cache;
- //import org.hibernate.annotations.CacheConcurrencyStrategy;
- 
- 
  /**
!  * An attribute of an atom. Most of the work is done in the base class.
!  *
   * @author John Churin
   */
  @Entity
  @Table(name = "ATOM_ATTR", schema="umls")
- //@Cache (usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
  public class AtomAttribute extends Attribute  implements Serializable  {
  
--- 8,22 ----
  import javax.persistence.Table;
  
  /**
!  * An attribute of an Atomt. Most of the work is done in the base class (Attribute).
!  * AtomAttribute is a child of Atom.
!  * An Atom may have zero, one, or more AtomAttributes.
!  * This essentially provides a list of name-value pairs for an Atom. 
!  * @see Attribute
   * @author John Churin
+  *
   */
  @Entity
  @Table(name = "ATOM_ATTR", schema="umls")
  public class AtomAttribute extends Attribute  implements Serializable  {
  

[Tolven-cvs-commit] tolven/template ant-build.template,1.48,1.49

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

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

Modified Files:
	ant-build.template 
Log Message:
Bug#: 1582995 - The LDAP Password is in plaintext. The password was removed and in the process, the rootDN which was located in tolven-ldap-service.xml was moved to login-config.xml. In this fix, the rootDN has now been made dynamic, so it can be changed during installation.

Index: ant-build.template
===================================================================
RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ant-build.template	2 Oct 2006 05:34:35 -0000	1.48
--- ant-build.template	8 Nov 2006 07:27:41 -0000	1.49
***************
*** 6,9 ****
--- 6,10 ----
  ldap.location.browsable=true
  ldap.host=localhost
+ ldap.rootDN=cn=Manager,dc=tolven,dc=com
  postgres.location=c:/postgreSQL/8.1/
  postgres.location.browsable=true

[Tolven-cvs-commit] tolven/security-config build.xml,1.57,1.58

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

Update of /cvsroot/tolven/tolven/security-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25690/security-config

Modified Files:
	build.xml 
Log Message:
Bug#: 1582995 - The LDAP Password is in plaintext. The password was removed and in the process, the rootDN which was located in tolven-ldap-service.xml was moved to login-config.xml. In this fix, the rootDN has now been made dynamic, so it can be changed during installation.

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** build.xml	24 Oct 2006 05:35:30 -0000	1.57
--- build.xml	8 Nov 2006 07:27:41 -0000	1.58
***************
*** 534,537 ****
--- 534,538 ----
  		<filter token="tolven-jdbc-url" value="${jdbc.url}"/>
  		<filter token="ldap-location" value="${ldap.location}"/>
+ 		<filter token="ldap-rootDN" value="${ldap.rootDN}"/>
  		<filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/>
  		<filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/>

[Tolven-cvs-commit] tolven/jboss-config login-config.xml, 1.10, 1.11

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

Update of /cvsroot/tolven/tolven/jboss-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25690/jboss-config

Modified Files:
	login-config.xml 
Log Message:
Bug#: 1582995 - The LDAP Password is in plaintext. The password was removed and in the process, the rootDN which was located in tolven-ldap-service.xml was moved to login-config.xml. In this fix, the rootDN has now been made dynamic, so it can be changed during installation.

Index: login-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/jboss-config/login-config.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** login-config.xml	4 Nov 2006 06:14:23 -0000	1.10
--- login-config.xml	8 Nov 2006 07:27:42 -0000	1.11
***************
*** 57,61 ****
           	<login-module code="org.jboss.resource.security.JaasSecurityDomainIdentityLoginModule"
           			flag = "required">
!              	<module-option name = "username">cn=Manager,dc=tolven,dc=com</module-option>
               	<module-option name = "password">@hashed-ldapserver-password@</module-option>
               	<module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
--- 57,61 ----
           	<login-module code="org.jboss.resource.security.JaasSecurityDomainIdentityLoginModule"
           			flag = "required">
!              	<module-option name = "username">@ldap-rootDN@</module-option>
               	<module-option name = "password">@hashed-ldapserver-password@</module-option>
               	<module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>

[Tolven-cvs-commit] tolven/installer/template ant-build.template, 1.2, 1.3

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

Update of /cvsroot/tolven/tolven/installer/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25690/installer/template

Modified Files:
	ant-build.template 
Log Message:
Bug#: 1582995 - The LDAP Password is in plaintext. The password was removed and in the process, the rootDN which was located in tolven-ldap-service.xml was moved to login-config.xml. In this fix, the rootDN has now been made dynamic, so it can be changed during installation.

Index: ant-build.template
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/template/ant-build.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ant-build.template	2 Oct 2006 06:52:38 -0000	1.2
--- ant-build.template	8 Nov 2006 07:27:42 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
  ldap.host=$LDAP_HOST
  ldap.port=$LDAP_PORT
+ ldap.rootDN=$LDAP_ROOTDN
  postgres.location=$DB_LOCATION
  postgres.location.browsable=$DB_HOST_BROWSABLE

[Tolven-cvs-commit] tolvenWEB/web/five/test docList.xhtml,1.2,1.3

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

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

Modified Files:
	docList.xhtml 
Log Message:
Visual Cleanup: line up scroller on data grid displays

Index: docList.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/docList.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** docList.xhtml	28 Sep 2006 19:12:08 -0000	1.2
--- docList.xhtml	7 Nov 2006 08:41:03 -0000	1.3
***************
*** 12,21 ****
  <script language="JavaScript" type="text/javascript">
  // <![CDATA[
! 	#{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 10, 100, 
! 				'xmlDocList.ajax', 
! 				{prefetchBuffer: true, 
! 				requestParameters: [{name: 'element', value: visiblePage}],
! 				sortAscendImg: '../images/sort_asc.gif', 
! 				sortDescendImg:'../images/sort_desc.gif'});  
  // ]]>
  </script>
--- 12,21 ----
  <script language="JavaScript" type="text/javascript">
  // <![CDATA[
! #{menu.elementLabel}DG = new Rico.LiveGrid( '#{menu.element}LG', 10, 100, 
!   'xmlDocList.ajax', 
!   {prefetchBuffer: true, 
!   requestParameters: [{name: 'element', value: visiblePage}],
!   sortAscendImg: '../images/sort_asc.gif', 
!   sortDescendImg:'../images/sort_desc.gif'});  
  // ]]>
  </script>

[Tolven-cvs-commit] tolvenWEB/web/five problems.xhtml, 1.4, 1.5 rad.xhtml, 1.2, 1.3 lab.xhtml, 1.7, 1.8 patActivity.xhtml, 1.1, 1.2 dispats.xhtml, 1.6, 1.7 patients.xhtml, 1.12, 1.13

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

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

Modified Files:
	problems.xhtml rad.xhtml lab.xhtml patActivity.xhtml 
	dispats.xhtml patients.xhtml 
Log Message:
Visual Cleanup: line up scroller on data grid displays

Index: rad.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/rad.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rad.xhtml	25 Aug 2006 15:00:37 -0000	1.2
--- rad.xhtml	7 Nov 2006 08:41:03 -0000	1.3
***************
*** 39,44 ****
  				Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" />
  			</form>
! 			<div style="border: 1px solid #E1E1E1;width:100%;">
! 				<table id="#{menu.element}LG_header" cellpadding="2" >
  				  <thead>
  					  <tr>
--- 39,44 ----
  				Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" />
  			</form>
! 			<div id="#{menu.element}LGDG" style="width:800px;">
! 				<table id="#{menu.element}LG_header" >
  				  <thead>
  					  <tr>
***************
*** 46,55 ****
  						  <th align="left" width="210px">Test</th>
  						  <th align="left" width="210px">Report</th>
! 						  <th align="left" width="75px">Interpretation</th>
  						  <th align="left" width="100px">Source</th>
  					  </tr>
  				  </thead>
  				</table> 
! 				<table id="#{menu.element}LG" cellpadding="2">
  				  <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>
--- 46,55 ----
  						  <th align="left" width="210px">Test</th>
  						  <th align="left" width="210px">Report</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="310px">-</td><td width="75px">-</td><td width="100px">-</td></tr>

Index: dispats.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/dispats.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dispats.xhtml	6 Nov 2006 23:12:05 -0000	1.6
--- dispats.xhtml	7 Nov 2006 08:41:03 -0000	1.7
***************
*** 12,16 ****
  <script language="JavaScript" type="text/javascript">
  // <![CDATA[
! 	dispatsGridz = new Rico.LiveGrid( 'dispatsGrid', 15, #{menu.menuDataCount}, 
  				'menuData.ajax', 
  				{prefetchBuffer: false, 
--- 12,16 ----
  <script language="JavaScript" type="text/javascript">
  // <![CDATA[
! 	dispatsGridz = new Rico.LiveGrid( '#{menu.element}LG', 15, #{menu.menuDataCount}, 
  				'menuData.ajax', 
  				{prefetchBuffer: false, 
***************
*** 34,38 ****
  
  	dispatsRequest = function( ) {
- //		alert( "dispats: " + prevdispatsFilterValue  + " disease: " + prevdiseaseFilterValue);
  		if (prevdispatsFilterValue.length==0 && prevdiseaseFilterValue.length==0) {
  			dispatsGridz.setRequestParams( {name: 'element', value: visiblePage} );
--- 34,37 ----
***************
*** 76,81 ****
  				Diagnosis Filter: <input name="diseaseFilter" type="text" id="diseaseFilter" />
  			</form>
! 			<div id="dispatsDG" style="width:780px">
! 				<table id="dispatsGrid_header" >
  				  <thead>
  					  <tr>
--- 75,80 ----
  				Diagnosis Filter: <input name="diseaseFilter" type="text" id="diseaseFilter" />
  			</form>
! 			<div id="#{menu.element}LGDG" style="width:780px">
! 				<table id="#{menu.element}LG_header" >
  				  <thead>
  					  <tr>
***************
*** 88,92 ****
  				  </thead>
  				</table> 
! 				<table id="dispatsGrid" >
  				  <tbody>
  					<tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="160px">-</td><td width="100px">-</td></tr>
--- 87,91 ----
  				  </thead>
  				</table> 
! 				<table id="#{menu.element}LG" >
  				  <tbody>
  					<tr><td width="200px">-</td><td width="90px">-</td><td align="center" width="60px">-</td><td width="160px">-</td><td width="100px">-</td></tr>

Index: problems.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/problems.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** problems.xhtml	25 Aug 2006 15:00:37 -0000	1.4
--- problems.xhtml	7 Nov 2006 08:41:03 -0000	1.5
***************
*** 41,45 ****
  				Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" />
  			</form>
! 			<div style="border: 1px solid #E1E1E1;width:600px">
  				<table id="#{menu.element}LG_header" >
  				  <thead>
--- 41,45 ----
  				Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" />
  			</form>
! 			<div style="width:600px">
  				<table id="#{menu.element}LG_header" >
  				  <thead>

Index: patActivity.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/patActivity.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** patActivity.xhtml	24 Aug 2006 07:53:59 -0000	1.1
--- patActivity.xhtml	7 Nov 2006 08:41:03 -0000	1.2
***************
*** 25,29 ****
  // ]]>
  </script>
! 	  <div id="#{menu.element}LGDG" style="border: 1px solid #E1E1E1;width:750px">
  
  		<table id="#{menu.element}LG_header">
--- 25,29 ----
  // ]]>
  </script>
! 	  <div id="#{menu.element}LGDG" style="width:750px">
  
  		<table id="#{menu.element}LG_header">

Index: patients.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** patients.xhtml	6 Nov 2006 23:12:05 -0000	1.12
--- patients.xhtml	7 Nov 2006 08:41:03 -0000	1.13
***************
*** 46,50 ****
  				Filter (last name): <input name="patientFilter" type="text" id="patientFilter" />
  			</form>
! 			<div id="#{menu.element}LGDG" style="width:510px">
  				<table id="#{menu.element}LG_header" >
  				  <thead>
--- 46,50 ----
  				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>
***************
*** 53,57 ****
  						  <th align="left" width="100px">DOB</th>
  						  <th align="left" width="90px">Age</th>
! 						  <th align="center" width="60px">Sex</th>
  					  </tr>
  				  </thead>
--- 53,57 ----
  						  <th align="left" width="100px">DOB</th>
  						  <th align="left" width="90px">Age</th>
! 						  <th align="center" width="80px">Sex</th>
  					  </tr>
  				  </thead>
***************
*** 59,78 ****
  				<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="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="60px">-</td></tr>
  				  </tbody>
  				</table>
--- 59,78 ----
  				<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>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
! 					<tr><td  align="left" width="200px">-</td><td width="100px">-</td><td width="90px">-</td><td align="center" width="80px">-</td></tr>
  				  </tbody>
  				</table>

Index: lab.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/lab.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** lab.xhtml	29 Aug 2006 21:10:36 -0000	1.7
--- lab.xhtml	7 Nov 2006 08:41:03 -0000	1.8
***************
*** 44,49 ****
  				Filter: <input name="#{menu.element}DGFilter" type="text" id="#{menu.element}DGFilter" />
  			</form>
! 			<div style="border: 1px solid #E1E1E1;width:100%;">
! 				<table id="#{menu.element}LG_header" cellpadding="2" >
  				  <thead>
  					  <tr>
--- 44,49 ----
  				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>
***************
*** 53,62 ****
  						  <th align="right" width="100px">Value</th>
  						  <th align="left" width="75px">Units</th>
! 						  <th align="left" width="75px">Interpretation</th>
  						  <th align="left" width="100px">Source</th>
  					  </tr>
  				  </thead>
  				</table> 
! 				<table id="#{menu.element}LG" cellpadding="2">
  				  <tbody>
  					<tr><td align="right" width="125px">-</td><td width="210px">-</td><td width="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="75px">-</td><td width="100px">-</td></tr>
--- 53,62 ----
  						  <th align="right" width="100px">Value</th>
  						  <th align="left" width="75px">Units</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="210px">-</td><td align="right" width="100px">-</td><td width="75px">-</td><td width="75px">-</td><td width="100px">-</td></tr>

[Tolven-cvs-commit] tolvenWEB/web/scripts rico.js,1.3,1.4

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

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

Modified Files:
	rico.js 
Log Message:
Visual Cleanup: line up scroller on data grid displays

Index: rico.js
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/rico.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rico.js	29 Aug 2006 07:40:52 -0000	1.3
--- rico.js	7 Nov 2006 08:41:03 -0000	1.4
***************
*** 1863,1867 ****
        scrollerStyle.borderRight = this.liveGrid.options.scrollerBorderRight;
        scrollerStyle.position    = "relative";
!       scrollerStyle.left        = this.isIE ? "-6px" : "-3px";
        scrollerStyle.width       = "19px";
        scrollerStyle.height      = visibleHeight + "px";
--- 1863,1867 ----
        scrollerStyle.borderRight = this.liveGrid.options.scrollerBorderRight;
        scrollerStyle.position    = "relative";
!       scrollerStyle.left        = this.isIE ? "-19px" : "-19px";
        scrollerStyle.width       = "19px";
        scrollerStyle.height      = visibleHeight + "px";

[Tolven-cvs-commit] tolvenWEB/web/scripts tolven6.js,1.7,1.8

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

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

Modified Files:
	tolven6.js 
Log Message:
Visual cleanup - clicking on a patient tab no longer loses the contents of that pane.

Index: tolven6.js
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tolven6.js	28 Aug 2006 19:21:00 -0000	1.7
--- tolven6.js	7 Nov 2006 04:06:48 -0000	1.8
***************
*** 179,183 ****
  	// Although we request the upper-most container first, there's no guarantee it will arrive first.
  	function showContentContainer( dest, original ) {
- //		debugDupeCheck( dest );
  		var container = removeLast( dest );
  		// Recurse to get parent
--- 179,182 ----
***************
*** 188,197 ****
  		}
  		// Let the original be the actual pane to display if a container is later selected.
! //VSP		if (dest!=original)	visibleSubPage[dest] = original;
! 		if (dest!=original)	$(dest).visibleSubPage = original;
! //		else $(dest).visibleSubPage = "";
  
- //		alert( "Show: " + $(dest).id + " was " + $(dest).style.borderColor);
- //		$(dest).style.borderColor = 'green green green green';
  		$(dest).style.display = 'block';
  //		Element.show(dest);
--- 187,192 ----
  		}
  		// Let the original be the actual pane to display if a container is later selected.
! 		if (dest!=original)	$(dest).setAttribute("visibleSubPage", original);
  
  		$(dest).style.display = 'block';
  //		Element.show(dest);
***************
*** 199,204 ****
  
  	function showPane( paneId ) {
- 		if (paneId==visiblePage) return;
- 		hideContent();
  		var pane = $(paneId);
  		// Is this pane new? If so, create it now.
--- 194,197 ----
***************
*** 206,222 ****
  			pane = addRemoteContent( paneId, paneId );
  		}
! //VSP		var realItem = visibleSubPage[paneId];
! 		var realItem = $(paneId).visibleSubPage;
! //		debugShowElementList( "ShowPane: ", $('paneArea').getElementsByTagName('div') );
! 		if (realItem!=null && realItem!="") {
! 			showContentContainer( realItem, realItem );
! 			currentMenus( realItem ); 
! 			visiblePage = realItem;
! 			return;
  		}
! 		showContentContainer( paneId, paneId );
! 		visiblePage = paneId;
! 		// Now make menu items selected
! 		currentMenus( paneId ); 
  	}
  	
--- 199,211 ----
  			pane = addRemoteContent( paneId, paneId );
  		}
! 		var targetItem = pane;
! 		while ( targetItem.getAttribute("visibleSubPage") != null) {
! 			targetItem = $(targetItem.getAttribute("visibleSubPage"));
  		}
! 		if (targetItem.id==visiblePage) return;
! 		hideContent();
! 		showContentContainer( targetItem.id, targetItem.id );
! 		currentMenus( targetItem.id ); 
! 		visiblePage = targetItem.id;
  	}
  	
***************
*** 232,237 ****
  			}
  		}
- //		if(e.checked==true) Element.show(e.value);
- //		else Element.hide(e.value);
  	}
  	 
--- 221,224 ----
***************
*** 254,264 ****
  	// Find all content and container class elements and make sure they are hidden
  	function hideContent() {
! //		alert( "Hiding" );
  		var e = $('paneArea').getElementsByTagName('div');
- //		debugShowElementList( "hideContent: ", e );
  		for (var x = 0; x < e.length; x++) {
  			if (e[x].className=="container" && e[x].style.display!='none') {
- //				alert( "Hide: " + e[x].id + " was " +  e[x].style.borderColor);
- //				e[x].style.borderColor = 'red red red red';
  				e[x].style.display = 'none';
  //				Element.hide(e[x]);
--- 241,248 ----
  	// Find all content and container class elements and make sure they are hidden
  	function hideContent() {
! 		
  		var e = $('paneArea').getElementsByTagName('div');
  		for (var x = 0; x < e.length; x++) {
  			if (e[x].className=="container" && e[x].style.display!='none') {
  				e[x].style.display = 'none';
  //				Element.hide(e[x]);
***************
*** 281,284 ****
--- 265,269 ----
  	function removeLast( path ) {
  		if (path==null) return null;
+ 		if (path.length < 2 ) return null;
  		var last = path.lastIndexOf(':',path.length-1);
  		if (last>0) return path.substring( 0, last );
***************
*** 333,339 ****
  			content.className = 'container';
  			content.style.display = 'block';
- //			content.style.borderWidth = '1px 1px 1px 1px';
- //			content.style.borderColor = 'yellow yellow yellow yellow';
- //			content.style.borderStyle = 'solid solid solid solid';
  			var level = getLevel( contentName );
  			if (level==0) {
--- 318,321 ----
***************
*** 351,361 ****
  	function newContentArrived( contentId ) {
  		var content = $(contentId);
! 		if (content.className=='container' && content.visibleSubPage==null) {
  			// Get the menu items
  			var lis = content.getElementsByTagName('li');
  			if (lis.length > 0) {
  				var id = removeLast(lis[0].id);
  				visiblePage = id;
! 				content.visibleSubPage = id;
  				addRemoteContent( id, id );
  			}
--- 333,344 ----
  	function newContentArrived( contentId ) {
  		var content = $(contentId);
! 		if (content.className=='container' && content.getAttribute("visibleSubPage")==null) {
  			// 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 );
  			}
***************
*** 372,377 ****
  			div.style.display = 'block';
  			paneArea.appendChild( div );
- //			div.style.borderBottom = '1px solid #FF6600';
- //			div.innerHTML = 'Level ' + x + ' content goes here:';
  		}
  	}
--- 355,358 ----
***************
*** 382,387 ****
  		setupPaneArea('paneArea');
  		showPane( initialPage );
- //		alert( "Showing "  +initialPage );
- 		
  	}
  	
--- 363,366 ----
***************
*** 415,433 ****
  // This closes a tab and everything on the page with that tab's id prefix.
  function closeTab( id ) {
- //	alert( "Closing: " + id );
  	// We now need to find something to show other than what we're removing
  	var n = displayableSibling( id );
- //	alert( "Candidate: " + n.id );
  	var np = removeLast( n.id );
- //	alert( "showPane: " + np );
  	visiblePage = "xx";
  	showPane( np );
  	// Now do the delete
  	var idcomp = id + ":";
- //	alert( "Closing prefix: " + idcomp );
  	var e = document.body.getElementsByTagName('*');
  	for (var x=0; x < e.length;x++) {
  		if (idcomp==e[x].id.substr( 0, idcomp.length )) {
- //			alert( "Remove: " +  e[x].id );
  			Element.remove( e[x] );
  		}
--- 394,407 ----
***************
*** 437,445 ****
  	for (var x=0; x < f.length;x++) {
  		if (idcomp==f[x].id.substr( 0, idcomp.length )) {
- //			alert( "Remove2: " +  f[x].id );
  			Element.remove( f[x] );
  		}
  	}
- //	alert( "Remove: " + id );
  	Element.remove( id );
  }
--- 411,417 ----

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

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

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

Modified Files:
	faces-config.xml 
Log Message:
Some visual cleanup

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** faces-config.xml	6 Nov 2006 07:41:30 -0000	1.25
--- faces-config.xml	6 Nov 2006 23:12:05 -0000	1.26
***************
*** 39,42 ****
--- 39,46 ----
         <from-view-id>/*</from-view-id>
          <navigation-case>
+             <from-outcome>adminAccount</from-outcome>
+             <to-view-id>/private/adminAccount.xhtml</to-view-id>
+         </navigation-case>
+         <navigation-case>
              <from-outcome>/public/activating</from-outcome>
              <to-view-id>/public/activating.xhtml</to-view-id>
***************
*** 153,157 ****
          </navigation-case>
      </navigation-rule>
- 
      <navigation-rule>
          <description>
--- 157,160 ----
***************
*** 162,166 ****
              <from-action>#{reg.updateAccount}</from-action>
              <from-outcome>success</from-outcome>
!             <to-view-id>/private/selectAccount.xhtml</to-view-id>
              <redirect/>
          </navigation-case>
--- 165,169 ----
              <from-action>#{reg.updateAccount}</from-action>
              <from-outcome>success</from-outcome>
!             <to-view-id>/private/dispatch.xhtml</to-view-id>
              <redirect/>
          </navigation-case>
***************
*** 177,181 ****
          <navigation-case>
              <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/selectAccount.xhtml</to-view-id>
          </navigation-case>
          <navigation-case>
--- 180,184 ----
          <navigation-case>
              <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/dispatch.xhtml</to-view-id>
          </navigation-case>
          <navigation-case>
***************
*** 220,224 ****
          <navigation-case>
              <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/selectAccount.xhtml</to-view-id>
              <redirect/>
          </navigation-case>
--- 223,227 ----
          <navigation-case>
              <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/dispatch.xhtml</to-view-id>
              <redirect/>
          </navigation-case>

[Tolven-cvs-commit] tolvenWEB/web/five activity.xhtml, 1.6, 1.7 dispats.xhtml, 1.5, 1.6 patients.xhtml, 1.11, 1.12

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

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

Modified Files:
	activity.xhtml dispats.xhtml patients.xhtml 
Log Message:
Some visual cleanup

Index: patients.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** patients.xhtml	30 Oct 2006 19:34:24 -0000	1.11
--- patients.xhtml	6 Nov 2006 23:12:05 -0000	1.12
***************
*** 46,50 ****
  				Filter (last name): <input name="patientFilter" type="text" id="patientFilter" />
  			</form>
! 			<div id="#{menu.element}LGDG" style="border: 1px solid #E1E1E1;width:510px">
  				<table id="#{menu.element}LG_header" >
  				  <thead>
--- 46,50 ----
  				Filter (last name): <input name="patientFilter" type="text" id="patientFilter" />
  			</form>
! 			<div id="#{menu.element}LGDG" style="width:510px">
  				<table id="#{menu.element}LG_header" >
  				  <thead>

Index: dispats.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/dispats.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dispats.xhtml	29 Aug 2006 07:40:52 -0000	1.5
--- dispats.xhtml	6 Nov 2006 23:12:05 -0000	1.6
***************
*** 76,80 ****
  				Diagnosis Filter: <input name="diseaseFilter" type="text" id="diseaseFilter" />
  			</form>
! 			<div id="dispatsDG" style="border: 1px solid #E1E1E1;width:780px">
  				<table id="dispatsGrid_header" >
  				  <thead>
--- 76,80 ----
  				Diagnosis Filter: <input name="diseaseFilter" type="text" id="diseaseFilter" />
  			</form>
! 			<div id="dispatsDG" style="width:780px">
  				<table id="dispatsGrid_header" >
  				  <thead>

Index: activity.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/activity.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** activity.xhtml	29 Aug 2006 21:10:36 -0000	1.6
--- activity.xhtml	6 Nov 2006 23:12:05 -0000	1.7
***************
*** 10,13 ****
--- 10,21 ----
    <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/>
+      </c:if>
+      <c:if test="#{menu.menuDataCount!=0}">
  <script language="JavaScript" type="text/javascript">
  // <![CDATA[
***************
*** 25,29 ****
  // ]]>
  </script>
! 	  <div id="#{menu.element}LGDG" style="border: 1px solid #E1E1E1;width:750px">
  
  		<table id="#{menu.element}LG_header">
--- 33,37 ----
  // ]]>
  </script>
! 	  <div id="#{menu.element}LGDG" style="width:750px">
  
  		<table id="#{menu.element}LG_header">
***************
*** 60,64 ****
  		</table>
  	  </div>
! 
  	</ui:composition>
    </body>
--- 68,72 ----
  		</table>
  	  </div>
! 	 </c:if>
  	</ui:composition>
    </body>

[Tolven-cvs-commit] tolvenWEB/web/templates portalTemplate.xhtml, 1.12, 1.13

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

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

Modified Files:
	portalTemplate.xhtml 
Log Message:
Some visual cleanup

Index: portalTemplate.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/templates/portalTemplate.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** portalTemplate.xhtml	17 Oct 2006 06:24:59 -0000	1.12
--- portalTemplate.xhtml	6 Nov 2006 23:12:05 -0000	1.13
***************
*** 33,54 ****
  	<div class="header">
  		<div class="#{brand}"></div>
! 		<table class="utility">
! 			<tr>
! 				<td class="user">
! 					<h:form>
! 						<h:outputText value="Logged in as #{top.tp.givenName} #{top.tp.sn} " />
! 						<h:commandLink action="#{top.logout}">
! 							<h:outputText styleClass="smallText" value="[ Log out ]" />
! 						</h:commandLink>
! 					</h:form>
! 					<!--h:outputText value="Last Login: #{top.user.oldLastLogin}" /-->
! 				</td>
! 				<td> 
! 				   <h:outputText value="#{top.accountTitle} "/> 
! 	               <h:outputLink value="../private/adminAccount.jsf"  rendered="#{top.accountAdmin}">
! 						<h:outputText styleClass="smallText" value=" [Admin]" />
! 	               </h:outputLink>
! </td>			</tr>
! 		</table>
  	</div>
  	
--- 33,54 ----
  	<div class="header">
  		<div class="#{brand}"></div>
! 		<h:form>
! 			<table class="utility">
! 				<tr>
! 					<td class="user">
! 							<h:outputText value="Logged in as #{top.tp.givenName} #{top.tp.sn} " />
! 							<h:commandLink action="#{top.logout}">
! 								<h:outputText styleClass="smallText" value="[Log out]" />
! 							</h:commandLink>
! 					</td>
! 					<td class="user"> 
! 					   <h:outputText value="#{top.accountTitle} "/> 
! 		               <h:commandLink action="adminAccount"  rendered="#{top.accountAdmin}">
! 							<h:outputText styleClass="smallText" value=" [Admin]" />
! 		               </h:commandLink>
! 					</td>
! 				</tr>
! 			</table>
! 		</h:form>
  	</div>
  	

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web TopAction.java, 1.19, 1.20

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

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

Modified Files:
	TopAction.java 
Log Message:
Bug: set known type (accountType) in top so #{top.accountType} works.

Index: TopAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TopAction.java	6 Nov 2006 07:41:30 -0000	1.19
--- TopAction.java	6 Nov 2006 22:25:37 -0000	1.20
***************
*** 153,156 ****
--- 153,157 ----
      	if (accountUserId!=0) {
      		accountUser = activation.findAccountUser(accountUserId );
+     		accountType = accountUser.getAccount().getAccountType().getKnownType();
      		setPostLoginAction(accountUser.getAccount().getAccountType().getHomePage());
      		return "dispatch";
***************
*** 214,217 ****
--- 215,219 ----
  		setAccountTitle( accountUser.getAccount().getTitle());
  		setAccountTimeZone( accountUser.getAccount().getTimeZone());
+ 		accountType = accountUser.getAccount().getAccountType().getKnownType();
          // Ensure that this user has a menu structure setup
          menuLocal.createDefaultMenuStructure( accountUser.getAccount() );

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web SysAdmin.java, NONE, 1.1 TolvenContext.java, NONE, 1.1 StatusConverter.java, NONE, 1.1 TopAction.java, 1.18, 1.19 RegisterAction.java, 1.22, 1.23 MenuAction.java, 1.22, 1.23

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

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

Modified Files:
	TopAction.java RegisterAction.java MenuAction.java 
Added Files:
	SysAdmin.java TolvenContext.java StatusConverter.java 
Log Message:
Add AccountType support - see release notes for further details

--- NEW FILE: SysAdmin.java ---
package org.tolven.web;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;

import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.SelectItem;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.persistence.NoResultException;

import org.tolven.core.entity.AccountType;
import org.tolven.core.entity.Status;
import org.tolven.core.AccountDAOLocal;

/**
 * SystAdmin - allow users to enter static data such as AccountTypes, needed
 * to support Account and MenuStructure organization.  Any user who can log in
 * to the application has access to sys admin functions
 * @author person1
 *
 */
public class SysAdmin extends TolvenAction {
//  @EJB 
    private AccountDAOLocal accountBean;
	private DataModel accountTypesModel;
	private AccountType currentAccountType;
	private String knownType;
	private String homePage;
	private String longDesc;
	private String status = Status.ACTIVE.value();
	private boolean readOnly = false;
	private boolean checkbox;
	protected String [] changestatus = new String[0];
	private List<SelectItem> accTypes;
	private String active;
	private String inactive;
	
	   /** Creates a new instance of RegisterAction */
    public SysAdmin() {
        try
        {
           InitialContext ctx = new InitialContext();
           // J2EE 1.5 has not yet defined exact XML <ejb-ref> syntax for EJB3
           accountBean = (AccountDAOLocal) ctx.lookup("tolven/AccountDAOBean/local");
           active = accountBean.statusForValue("active");
           inactive = accountBean.statusForValue("inactive");
          }
        catch (NamingException e)
        {
           throw new RuntimeException(e);
        }
    }

    public DataModel getAccountTypesModel( ) {
    	if (this.accountTypesModel==null) {
    		accountTypesModel = new ListDataModel();
    		accountTypesModel.setWrappedData(accountBean.findAllAccountTypes());
    	}
		return accountTypesModel;
    }

    /**
     * find out how many accountTypes exist
     * @return int 
     */
	public int getAccountTypeCount() {
		return getAccountTypesModel().getRowCount();
	}
	
	public List<SelectItem> getAccTypes() throws NamingException, IOException {
		if (accTypes== null){
			List<AccountType>accountTypes = accountBean.findAllAccountTypes();
			Iterator iter = accountTypes.iterator();
			if (accountTypes.isEmpty() == false){
				int count = accountTypes.size();
				accTypes = new ArrayList<SelectItem>( count ); 
				Long idstr = null; 
				for (int x=0; x < count; x++){
					AccountType aty = (AccountType)iter.next();
					accTypes.add(new SelectItem( idstr.toString(aty.getId()), aty.getStatus() ));
				}
			} else { System.out.println("No account types defined"); }
		}
		 return accTypes;
	}
	
	public void setChangestatus(String changestatus[] ){
		this.changestatus = changestatus;
	}
	public String[] getChangestatus(){
		return this.changestatus;
	}
	
	public boolean isCheckbox(){
		return this.checkbox;
	}
	public void setCheckbox(boolean value){
		this.checkbox = value;
	}
	public String getKnownType() {
		return knownType;
	}
	public void setKnownType(String knownType) {
		this.knownType = knownType;
	}
	public String getHomePage() {
		return homePage;
	}
	public void setHomePage(String homePage) {
		this.homePage = homePage;
	}
	public String getLongDesc() {
		return longDesc;
	}
	public void setLongDesc(String longDesc) {
		this.longDesc = longDesc;
	}
	public boolean getReadOnly() {
		return readOnly;
	}
	public void setReadOnly(boolean readOnly) {
		this.readOnly = readOnly;
	}
	
	/**
	 * Update the current AccountType
	 *
	 */
    public String updateAccountType() throws Exception {
    	System.out.println( "Updating AccountType ID: " + getCurrentAccountType().getId());
		accountBean.updateAccountType( getCurrentAccountType() );
		return "success";
    }

    /**
     * User selected a specific row, select the account type at that row so it can be edited if needed.
     * @return
     */
    public String selectAccountType( ) {
    	AccountType accountType = (AccountType) accountTypesModel.getRowData();
    	if (accountType==null) {
    		return "error";
    	}
    	setCurrentAccountType( accountType );
    	return "success";
    }
    /**
     * Add a new AccountType. The knownType must not already exist as an active AccountType.
     * @return outcome used by faces-config.xml
     * @throws Exception
     */
    public String addAccountType() throws Exception {
    	AccountType accountType = accountBean.findAccountTypebyKnownType( getKnownType());
    	if (accountType!=null ) {
    		FacesContext.getCurrentInstance().addMessage( null, new FacesMessage("Known type already exists"));
			return "fail";
    	} else {
			AccountType newAccountType = accountBean.createAccountType(
				this.getKnownType(),this.getHomePage(),this.getLongDesc(),
				this.getReadOnly(), this.getStatus() );
			if (newAccountType == null) {
				System.out.println("AccountType not created");
				return "fail";
			} else {
				// Clear the accountTypes list so we requery to get the current state after this change
				accountTypesModel = null;
				// Tell faces we were successful and to go to the next page.
				return "success";
	    	}
    	}
    }

    public String getStatus() {
		return status;
	}

    public void setStatus(String status) {
		this.status = status;
	}

	public AccountType getCurrentAccountType() {
		if (currentAccountType==null) currentAccountType = new AccountType();
		return currentAccountType;
	}

	public void setCurrentAccountType(AccountType currentAccountType) {
		this.currentAccountType = currentAccountType;
	}

}

Index: RegisterAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** RegisterAction.java	19 Oct 2006 01:50:14 -0000	1.22
--- RegisterAction.java	6 Nov 2006 07:41:30 -0000	1.23
***************
*** 17,21 ****
  import java.util.Date;
  import java.util.List;
- import java.util.Map;
  import java.util.TimeZone;
  
--- 17,20 ----
***************
*** 28,32 ****
  
  import org.apache.commons.fileupload.FileItem;
- import org.tolven.admin.JoinNewAccountInvitation;
  import org.tolven.app.MenuLocal;
  import org.tolven.core.AccountDAOLocal;
--- 27,30 ----
***************
*** 36,44 ****
  import org.tolven.core.TolvenPropertiesLocal;
  import org.tolven.core.entity.Account;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.Sponsorship;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.doc.DocumentLocal;
- import org.tolven.doc.entity.Invitation;
  import org.tolven.gen.CHRGenerator;
  import org.tolven.security.TolvenPerson;
--- 34,43 ----
  import org.tolven.core.TolvenPropertiesLocal;
  import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.AccountType;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.Sponsorship;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.gen.CHRGenerator;
  import org.tolven.security.TolvenPerson;
***************
*** 76,82 ****
--- 75,90 ----
      private AccountUser accountUser;
      private Account account;
+     
+     private AccountType accountType;
  
+     private List<SelectItem> accountDescs;
+ 	private List<AccountType> accountTypes;
+     private String newAccountTypeStr;
+     //selected account type id for new account 
+     private String knownType;
+     
      private String accountTitle;
      private String newAccountTitle;
+     
      private String newTimeZone;
      private boolean genDemoData;
***************
*** 93,99 ****
  	
  	private List<SelectItem> timeZones;
- 
- 	private boolean ephr;
- 	private boolean echr;
  	
      // Search Criteria
--- 101,104 ----
***************
*** 111,122 ****
      private List<AccountUser> accountUsers;
      
-     private String accountType;
-     
      /** Creates a new instance of RegisterAction */
      public RegisterAction() {
          try
          {
-         	echr = false;
-         	ephr = false;
             InitialContext ctx = new InitialContext();
             // J2EE 1.5 has not yet defined exact XML <ejb-ref> syntax for EJB3
--- 116,123 ----
***************
*** 141,146 ****
  
  	public String createNewAccount() throws Exception {
! 		Account account = accountBean.createAccount( this.getAccountType(), this.getNewAccountTitle(), getNewTimeZone() );
! 		System.out.println( "Created account: " + account.getId());
  		// Note, the user automatically gets account permission because they are the only user on that new account.
  		accountBean.addAccountUser( account, getTop().getUser(), getNow(), true);
--- 142,147 ----
  
  	public String createNewAccount() throws Exception {
! 		Account account = accountBean.createAccount2( this.getNewAccountTitle(), getNewTimeZone(), getNewAccountType() );
! 		//System.out.println( "Created account: " + account.getId() + "acct type " + account.getAccountType().getKnownType());
  		// Note, the user automatically gets account permission because they are the only user on that new account.
  		accountBean.addAccountUser( account, getTop().getUser(), getNow(), true);
***************
*** 150,153 ****
--- 151,156 ----
          	chrGen.createPatients( getTop().getUser(), account, 100, getTop().getNow(), 1996 );
          }
+         System.out.println("created patients");
+         
  		return "success";
  	}
***************
*** 242,246 ****
  				}
  			}
!             returnStatus = "activated";
          } else {
      		try {
--- 245,250 ----
  				}
  			}
! 			returnStatus = Status.fromValue("activated").value();
! 
          } else {
      		try {
***************
*** 257,261 ****
  				}
  			}
! 	        returnStatus = "registered";
          }
          // Invite the user to join a new Tolven account (this could be optional if the user is expecting an invitation from someone else
--- 261,266 ----
  				}
  			}
! 			returnStatus = Status.fromValue("registered").value();
! 
          }
          // Invite the user to join a new Tolven account (this could be optional if the user is expecting an invitation from someone else
***************
*** 269,272 ****
--- 274,278 ----
       * <p> In this method, UID and email address are kept separate in LDAP. </p>
       */
+   
      public String activate() throws Exception {
      	if (!Boolean.parseBoolean(propertyBean.getProperties().getProperty("tolven.login.create.demoUser"))) {
***************
*** 284,287 ****
--- 290,297 ----
          if (error) return "error";
          getTp().setCn( getTp().getGivenName() + " " + getTp().getSn());
+         
+         if (ldap == null){
+         	System.out.println("LDAP is null");
+         }
          // Verify email address is unique in LDAP
          if (ldap.entryExists( tp.getUid() )) {
***************
*** 291,295 ****
--- 301,307 ----
          // Optional email address
          getTp().addMail( getRepeatUid() );
+       
          String returnStatus = null;
+         
  		try {
  			activation.registerAndActivate( tp, getNow() );
***************
*** 305,343 ****
  			throw e;
  		}
!         returnStatus = "activated";
!         // As soon as the user get's established, we'll allow them to create a new account using a 
!         // JoinNewAccount invitation.
!         // Create personal health record account
!         if (this.isEphr()) {
! 	        // As soon as the user get's established, we'll allow them to create a new account using a 
! 	        // JoinNewAccount invitation.
! 	        // We don't queue or send this one, the user will pick it up during login
! 	        JoinNewAccountInvitation joinAccountInvitationDetail = new JoinNewAccountInvitation();
! 	        joinAccountInvitationDetail.setAccountType( "ephr" );
! 	        Invitation invite = invitationBean.createInvitation(getTp().getUid(), joinAccountInvitationDetail );
! 	        // TODO: This is language-dependent - but NOT global to the product.
! 	        invite.setTitle("Create and join a new personal health record account");
! 	        invite.setCreated(getNow());
! 	        // Immediately take the action if so requested, otherwise, we'll do this when the user gets the email invitation to activate
!         	invitationBean.executeInvitation( invite, getNow());
!         }
!         // Create clinical health record account
!         if (this.isEchr()) {
! 	        // As soon as the user get's established, we'll allow them to create a new account using a 
! 	        // JoinNewAccount invitation.
! 	        // We don't queue or send this one, the user will pick it up during login
! 	        JoinNewAccountInvitation joinAccountInvitationDetail = new JoinNewAccountInvitation();
! 	        joinAccountInvitationDetail.setAccountType( "echr" );
! 	        Invitation invite = invitationBean.createInvitation(getTp().getUid(), joinAccountInvitationDetail );
! 	        // TODO: This is language-dependent - but NOT global to the product.
! 	        invite.setTitle("Create and join a new clinical health record account");
! 	        invite.setCreated(getNow());
! 	        // Immediately take the action if so requested, otherwise, we'll do this when the user gets the email invitation to activate
!         	invitationBean.executeInvitation( invite, getNow());
!         }
  
          return returnStatus;
      }
!  
      /**
       * Update user preferences. If password specified, both versions must match. If password not supplied, it is not changed.
--- 317,342 ----
  			throw e;
  		}
! 		returnStatus = Status.fromValue("activated").value();
! 
! //        // As soon as the user get's established, we'll allow them to create a new account using a 
! //        // JoinNewAccount invitation.
! //        // Create health record with selected account type
! //        String knownType = getNewAccountType().getKnownType();
! //	    // As soon as the user get's established, we'll allow them to create a new account using a 
! //	    // JoinNewAccount invitation.
! //	    // We don't queue or send this one, the user will pick it up during login
! //	    JoinNewAccountInvitation joinAccountInvitationDetail = new JoinNewAccountInvitation();
! //	    joinAccountInvitationDetail.setAccountType( knownType );
! //	    Invitation invite = invitationBean.createInvitation(getTp().getUid(), joinAccountInvitationDetail );
! //	        // TODO: This is language-dependent - but NOT global to the product.
! //	    invite.setTitle("Create and join a new record account of type " + knownType);
! //	    invite.setCreated(getNow());
! //	    // Immediately take the action if so requested, otherwise, we'll do this when the user gets the email invitation to activate
! //	    invitationBean.executeInvitation( invite, getNow());
  
          return returnStatus;
      }
! 
!     
      /**
       * Update user preferences. If password specified, both versions must match. If password not supplied, it is not changed.
***************
*** 515,523 ****
  	}
  
! 	public String getAccountType() {
  		return accountType;
  	}
  
! 	public void setAccountType(String accountType) {
  		this.accountType = accountType;
  	}
--- 514,522 ----
  	}
  
! 	public AccountType getAccountType() {
  		return accountType;
  	}
  
! 	public void setAccountType(AccountType accountType) {
  		this.accountType = accountType;
  	}
***************
*** 542,545 ****
--- 541,551 ----
  	public List<AccountUser> getAccountUsers() throws NamingException, IOException {
  		if (accountUsers==null) accountUsers = activation.findAccountUsers( getAccount() );
+ 			for ( AccountUser accUser : accountUsers ) {
+ 				Account acc = accUser.getAccount();
+ 				if ( acc != null ){
+ 					AccountType accountType = acc.getAccountType();
+ 					//force fetch of AccountType to get hold of KnownType
+ 				}
+ 			}
  		return accountUsers;
  	}
***************
*** 560,563 ****
--- 566,573 ----
  	public List<AccountUser> getUserAccounts() throws NamingException, IOException {
  		if (userAccounts==null) userAccounts = activation.findUserAccounts( getUser() );
+ 			for ( AccountUser accountUser : userAccounts ) {
+ 				String atype = accountUser.getAccount().getAccountType().getKnownType();
+ //				System.out.println("TYPE "+ atype);
+ 			}
  		return userAccounts;
  	}
***************
*** 566,570 ****
  		this.userAccounts = userAccounts;
  	}
! 
  	public String addDemoUser( ) {
  		if (getNewDemoUser()==null) return "success";
--- 576,595 ----
  		this.userAccounts = userAccounts;
  	}
! 	
! 	
! 	public List<SelectItem> getAccountDescs() throws NamingException, IOException {
! 		if (accountDescs== null){
! 			accountTypes = accountBean.findActiveAccountTypes();
! 			if (accountTypes.isEmpty() == false){
! 				int count = accountTypes.size();
! 				accountDescs = new ArrayList<SelectItem>( count ); 
! 				for (AccountType accountType : accountTypes ){
! 					accountDescs.add(new SelectItem( Long.toString(accountType.getId()), accountType.getLongDesc() ));
! 				}
! 			} else { System.out.println("No account types defined"); }
! 		}
! 		 return accountDescs;
! 		}
! 	
  	public String addDemoUser( ) {
  		if (getNewDemoUser()==null) return "success";
***************
*** 618,637 ****
  	}
  
! 	public boolean isEchr() {
! 		return echr;
! 	}
! 
! 	public void setEchr(boolean echr) {
! 		this.echr = echr;
! 	}
! 
! 	public boolean isEphr() {
! 		return ephr;
! 	}
! 
! 	public void setEphr(boolean ephr) {
! 		this.ephr = ephr;
! 	}
! 
  	public boolean isReferenceRequired() throws IOException {
  		if (referenceRequired==null) {
--- 643,647 ----
  	}
  
! 	
  	public boolean isReferenceRequired() throws IOException {
  		if (referenceRequired==null) {
***************
*** 684,686 ****
--- 694,716 ----
  	}
  
+ 	public AccountType getNewAccountType(){
+ 		return accountBean.findAccountType(getAccountTypeId());
+ 	}
+ 	
+ 	public String getNewAccountTypeStr() {
+ 		return newAccountTypeStr;
+ 	}
+ 
+ 	public long getAccountTypeId(){ 
+ 		return Long.parseLong( newAccountTypeStr);
+ 	}
+ 
+ 	public void setNewAccountTypeStr(String newAccountTypeStr) {
+ 		this.newAccountTypeStr = newAccountTypeStr;
+ 	}
+ 	public String getKnownType() {
+ 		if (knownType==null) knownType = getAccount().getAccountType().getKnownType();
+ 		return knownType;
+ 	}
+ 	
  }

--- NEW FILE: StatusConverter.java ---
package org.tolven.web;

import java.lang.Boolean;

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

public class StatusConverter implements Converter{
	public Object getAsObject(FacesContext ctx, UIComponent comp, String value)throws ConverterException {
	
		return value;
	
 }
	
	public String getAsString(FacesContext context,
			UIComponent component, Object value) throws ConverterException{
		String inputValue = value.toString();
		if ("true".equals(inputValue) || "false".equals(inputValue)){
			return value.toString();
		}
		Boolean convertValue;
		convertValue = false;
		//System.out.println("STATUS INPUT " + inputValue);
		if ( "ACTIVE".equals(inputValue)){
			convertValue = true;
		}
		return convertValue.toString();
	}
	
	
}


--- NEW FILE: TolvenContext.java ---
package org.tolven.web;

import java.util.List;

import javax.naming.InitialContext;
import javax.naming.NamingException;

import org.tolven.core.AccountDAOLocal;
import org.tolven.core.entity.AccountType;
import org.tolven.core.entity.Status;

public class TolvenContext extends Object {
    private List<AccountType> accountTypes;
    private AccountDAOLocal accountBean;
    private boolean initialized = false;
    
    public TolvenContext() {
        try
        {
           InitialContext ctx = new InitialContext();
           accountBean = (AccountDAOLocal) ctx.lookup("tolven/AccountDAOBean/local");
        }
        catch (NamingException e)
        {
           throw new RuntimeException(e);
        }
    }
    
    public List<AccountType> getAccountTypes() {
    	if (accountTypes==null) accountTypes = accountBean.findAllAccountTypes();
		return accountTypes;
	}

	public void setAccountTypes(List<AccountType> accountTypes) {
		this.accountTypes = accountTypes;
	}
    
	public void resetAccountTypes() {
		accountTypes = null;
	}
	/**
	 * Return true if the system appears to not have been initiallized
	 * @return
	 */
	public boolean isInitialized() {
		return initialized;
	}
	/**
	 * One-time initialization if we discover there's no account types at all.
	 *
	 */
	public void initializeAccountTypes() {
		System.out.println( "Creating seed account types");
//		accountBean.createAccountType("admin", "admin/sysadmin.jsf", "SystemAdministrator", false, Status.ACTIVE.value());
		accountBean.createAccountType("echr", "echr.jsf", "Clinical Account", false, Status.ACTIVE.value());
		accountBean.createAccountType("ephr", "ephr.jsf", "Personal Account", false, Status.ACTIVE.value());
		System.out.println( "Migrating accounts");
		accountBean.accountTypeConversion();
		resetAccountTypes();
	}

	/**
	 * Do one-time initialization
	 *
	 */
	public void initialize( ) {
		if (isInitialized()) return;
		System.out.println( "One Time Initialization");
		if (getAccountTypes().size()==0 ) initializeAccountTypes();
		initialized = true;
	}

	public void setInitialized(boolean initialized) {
		this.initialized = initialized;
	}
}

Index: MenuAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MenuAction.java	3 Oct 2006 15:20:30 -0000	1.22
--- MenuAction.java	6 Nov 2006 07:41:30 -0000	1.23
***************
*** 372,376 ****
  //	        System.out.println("Preparing Graph");
  			MenuStructure ms = getThisMenu( );
! 			JFreeChart chart = createChart(createDataset( ms.getAccount().getKnownType() + ":patient:results:lab"));
  	        String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false));
  	        graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8");
--- 372,376 ----
  //	        System.out.println("Preparing Graph");
  			MenuStructure ms = getThisMenu( );
! 			JFreeChart chart = createChart(createDataset( ms.getAccount().getAccountType().getKnownType() + ":patient:results:lab"));
  	        String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false));
  	        graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8");

Index: TopAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TopAction.java	17 Oct 2006 06:24:59 -0000	1.18
--- TopAction.java	6 Nov 2006 07:41:30 -0000	1.19
***************
*** 32,35 ****
--- 32,36 ----
  import org.tolven.core.InvitationLocal;
  import org.tolven.core.TolvenPropertiesLocal;
+ import org.tolven.core.entity.AccountType;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.TolvenUser;
***************
*** 65,71 ****
      private String accountType;
      private String timeZone;
-     
      private String accountTimeZone;
! 
      private TolvenPerson tp;
  
--- 66,71 ----
      private String accountType;
      private String timeZone;
      private String accountTimeZone;
!     private String postLoginAction;
      private TolvenPerson tp;
  
***************
*** 126,137 ****
      	return "Transaction time at the server: " + getNow().toString() + ",  Timezone: " + getTimeZone();
      }
-     /**
-      * Only call this from dispatch, one time, right after login.
-      * @return
-      * @throws Exception
-      */
-     public String getPostLoginAction() throws Exception {
-     	return postLogin()+".jsf";
-     }
      
      /**
--- 126,129 ----
***************
*** 150,157 ****
       */
      public String postLogin() throws Exception{
!         AccountUser accountUser = null;
      	if (accountUserId!=0) {
      		accountUser = activation.findAccountUser(accountUserId );
!     		return accountUser.getAccount().getKnownType();
      	}
          String principal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName();
--- 142,158 ----
       */
      public String postLogin() throws Exception{
!     	// Initialize tolven here
!     	Map<String,Object> appMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
!     	TolvenContext tolven = (TolvenContext) appMap.get("tolven");
!     	if (tolven==null) {
!     		tolven = new TolvenContext();
!     		appMap.put("tolven", tolven);
!     	}
!     	tolven.initialize();
!     	AccountUser accountUser = null;
      	if (accountUserId!=0) {
      		accountUser = activation.findAccountUser(accountUserId );
!     		setPostLoginAction(accountUser.getAccount().getAccountType().getHomePage());
!     		return "dispatch";
      	}
          String principal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName();
***************
*** 200,205 ****
          // If still null, because there's no default or maybe because the user has no account yet, ask user what to do
          // Note: We'll return here after the user decides.
!         if (accountUser==null) return "selectAccount";
!         
      	accountUserId = accountUser.getId();
  		// Save the account Id - we'll need it in subsequent requests
--- 201,212 ----
          // If still null, because there's no default or maybe because the user has no account yet, ask user what to do
          // Note: We'll return here after the user decides.
!         if (accountUser==null) {
!             if (activation.countUserAccounts( getUser() ) > 0 ) {
!             	postLoginAction = "selectAccount.jsf";
!             } else {
!             	postLoginAction = "createAccount.jsf";
!             }
!         	return "dispatch";
!         }
      	accountUserId = accountUser.getId();
  		// Save the account Id - we'll need it in subsequent requests
***************
*** 218,228 ****
          }
  
! //        Map<String,Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
! //        for (Object x : sessionMap.keySet().toArray()) {
! //        	System.out.println( "Session Attribute: " + x );
! //        }
!         accountType = accountUser.getAccount().getKnownType();
!         System.out.println( "Dispatching to KnownType: " + accountType );
!         return accountType;
      }
  
--- 225,230 ----
          }
  
! 		setPostLoginAction(accountUser.getAccount().getAccountType().getHomePage());
! 		return "dispatch";
      }
  
***************
*** 231,235 ****
      }
  
!     public String dispatchingLogout(String outcome){
  //        System.out.println( "Logged out ");
          FacesContext fc = javax.faces.context.FacesContext.getCurrentInstance();
--- 233,244 ----
      }
  
!     public String getPostLoginAction() throws Exception {
!     	postLogin();
! 		return postLoginAction;
! 	}
! 	public void setPostLoginAction(String postLoginAction) {
! 		this.postLoginAction = postLoginAction;
! 	}
! 	public String dispatchingLogout(String outcome){
  //        System.out.println( "Logged out ");
          FacesContext fc = javax.faces.context.FacesContext.getCurrentInstance();
***************
*** 465,471 ****
  	return accountType;
  }
! public void setAccountType(String accountType) {
! 	this.accountType = accountType;
! }
  
  }
--- 474,478 ----
  	return accountType;
  }
! 
  
  }

[Tolven-cvs-commit] tolvenWEB/web/private selectAccount.xhtml, 1.16, 1.17 adminAccount.xhtml, 1.8, 1.9 userDemog.xhtml, 1.6, 1.7 createAccount.xhtml, 1.1, 1.2 prefPhotos.xhtml, 1.4, 1.5 customize.xhtml, 1.4, 1.5

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

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

Modified Files:
	selectAccount.xhtml adminAccount.xhtml userDemog.xhtml 
	createAccount.xhtml prefPhotos.xhtml customize.xhtml 
Log Message:
Add AccountType support - see release notes for further details

Index: prefPhotos.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/prefPhotos.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** prefPhotos.xhtml	14 Oct 2006 20:15:51 -0000	1.4
--- prefPhotos.xhtml	6 Nov 2006 07:41:30 -0000	1.5
***************
*** 11,15 ****
  <body>
      <ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.knownType}"/>
          <ui:define name="content">
              <div>
--- 11,15 ----
  <body>
      <ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.accountType.knownType}"/>
          <ui:define name="content">
              <div>

Index: customize.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/customize.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** customize.xhtml	14 Oct 2006 20:15:51 -0000	1.4
--- customize.xhtml	6 Nov 2006 07:41:30 -0000	1.5
***************
*** 11,15 ****
  <body>
  	<ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.knownType}"/>
  		<ui:define name="content">
  	 	<h3>Advanced menu customization</h3>
--- 11,15 ----
  <body>
  	<ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.accountType.knownType}"/>
  		<ui:define name="content">
  	 	<h3>Advanced menu customization</h3>

Index: selectAccount.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** selectAccount.xhtml	4 Nov 2006 19:33:42 -0000	1.16
--- selectAccount.xhtml	6 Nov 2006 07:41:30 -0000	1.17
***************
*** 16,41 ****
  		<div id="paneArea" class="pane">
  	 	<h:form id="accountForm" >
- 		  <c:if test="#{top.accountUserId!=0}">
- 			<h:commandLink id="continue" action="#{top.postLogin}" value="Continue"/>
- 				<script language="JavaScript" type="text/javascript">
- 				 // <![CDATA[
- 				        window.onload=function() {
- 				        var c = $('accountForm:continue');
- 				        if (c!=null) c.click();
- 				        }
- 				  // ]]>
- 				</script>
- 		  </c:if>
- 		  <c:if test="#{acc.accountUserCount==0}">
- 			<h:commandLink id="continue" action="createAccount" value="Create Account"/>
- 				<script language="JavaScript" type="text/javascript">
- 				 // <![CDATA[
- 				        window.onload=function() {
- 				        $('accountForm:continue').click();
- 				        }
- 				  // ]]>
- 				</script>
- 		  </c:if>
- 		  <c:if test="#{top.accountUserId==0}">
  		   <h:panelGroup rendered="#{invitation.openInvitationCount!=0}">
  			<h2>You have the following Invitations</h2>
--- 16,19 ----
***************
*** 81,85 ****
  							<h:outputText value="Account Type"/>
  						</f:facet>
! 						<h:outputText value="#{item.account.knownType}"/>
  					</h:column>
  					<h:column>
--- 59,63 ----
  							<h:outputText value="Account Type"/>
  						</f:facet>
! 						<h:outputText value="#{item.account.accountType.knownType}"/>
  					</h:column>
  					<h:column>
***************
*** 107,111 ****
  			<h:outputText value="Create a new clinical or personal account"/>
  		</h:commandLink>
- 	     </c:if>
  		</h:form>
  		</div>
--- 85,88 ----

Index: createAccount.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/createAccount.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createAccount.xhtml	17 Oct 2006 03:03:10 -0000	1.1
--- createAccount.xhtml	6 Nov 2006 07:41:30 -0000	1.2
***************
*** 17,30 ****
  			<h2>Create a new health record account</h2>
  	        <h:panelGrid columns="2">
! 				<h:outputText value="Account Type"/>
!                 <h:selectOneMenu value="#{reg.accountType}" >
!                 	<f:selectItem itemLabel="Clinical Account" itemValue="echr"/>
!                 	<f:selectItem itemLabel="Personal Account" itemValue="ephr"/>
!                 </h:selectOneMenu>
                  <h:outputText value="Account Title"/>
                  <h:inputText value="#{reg.newAccountTitle}" size="50" />
                  <h:outputText value="Timezone"/>
                  <h:selectOneMenu value="#{reg.newTimeZone}" >
!                 	<f:selectItems value="#{reg.timeZones}"/>
                  </h:selectOneMenu>
  				<h:selectBooleanCheckbox value="#{reg.genDemoData}" />
--- 17,29 ----
  			<h2>Create a new health record account</h2>
  	        <h:panelGrid columns="2">
!                <h:outputText value="Account Type"/>
!  				<h:selectOneMenu value="#{reg.newAccountTypeStr}" >
!                 	<f:selectItems value="#{reg.accountDescs}" />
!                 </h:selectOneMenu>         
                  <h:outputText value="Account Title"/>
                  <h:inputText value="#{reg.newAccountTitle}" size="50" />
                  <h:outputText value="Timezone"/>
                  <h:selectOneMenu value="#{reg.newTimeZone}" >
!                 	<f:selectItems value="#{reg.timeZones}" />
                  </h:selectOneMenu>
  				<h:selectBooleanCheckbox value="#{reg.genDemoData}" />

Index: adminAccount.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/adminAccount.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** adminAccount.xhtml	19 Oct 2006 01:50:14 -0000	1.8
--- adminAccount.xhtml	6 Nov 2006 07:41:30 -0000	1.9
***************
*** 125,129 ****
  	        </h:form>
  	        
! 			<h:panelGroup rendered="#{reg.account.knownType=='echr'}">
  	         <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3>
  				<p>Generate random patients and add them to this account. Keep the number of patients generated under 200. 
--- 125,129 ----
  	        </h:form>
  	        
! 			<h:panelGroup rendered="#{reg.account.accountType.knownType=='echr'}">
  	         <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3>
  				<p>Generate random patients and add them to this account. Keep the number of patients generated under 200. 

Index: userDemog.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/private/userDemog.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** userDemog.xhtml	14 Oct 2006 20:15:51 -0000	1.6
--- userDemog.xhtml	6 Nov 2006 07:41:30 -0000	1.7
***************
*** 12,16 ****
  <body>
      <ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.knownType}"/>
          <ui:define name="content">
           <h3>User Preferences</h3>
--- 12,16 ----
  <body>
      <ui:composition template="../templates/portalTemplate.xhtml">
! 		<ui:param name="skin" value="#{reg.account.accountType.knownType}"/>
          <ui:define name="content">
           <h3>User Preferences</h3>
***************
*** 90,94 ****
                      <h:outputText value="Account Type"/>
                  </f:facet>
!                 <h:outputText value="#{au.account.knownType}"/>
              </h:column>
              <h:column>
--- 90,94 ----
                      <h:outputText value="Account Type"/>
                  </f:facet>
!                 <h:outputText value="#{au.account.accountType.knownType}"/>
              </h:column>
              <h:column>

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

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

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

Modified Files:
	faces-config.xml 
Log Message:
Add AccountType support - see release notes for further details

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** faces-config.xml	19 Oct 2006 01:50:14 -0000	1.24
--- faces-config.xml	6 Nov 2006 07:41:30 -0000	1.25
***************
*** 22,25 ****
--- 22,32 ----
      <converter>
          <description>
+             Register a Converter implementation for displaying a status as true or false
+         </description>
+         <converter-id>statusConverter</converter-id>
+         <converter-class>org.tolven.web.StatusConverter</converter-class>
+     </converter>
+     <converter>
+         <description>
              Convert between a string and a List of Strings
          </description>
***************
*** 28,31 ****
--- 35,39 ----
      </converter>
  
+ 
      <navigation-rule>
         <from-view-id>/*</from-view-id>
***************
*** 279,288 ****
          <navigation-case>
              <from-action>#{top.postLogin}</from-action>
-             <from-outcome>selectAccount</from-outcome>
-             <to-view-id>/private/selectAccount.xhtml</to-view-id>
-             <redirect/>
-         </navigation-case>
-         <navigation-case>
-             <from-action>#{top.postLogin}</from-action>
              <from-outcome>activated</from-outcome>
              <to-view-id>/private/activated.xhtml</to-view-id>
--- 287,290 ----
***************
*** 290,293 ****
--- 292,299 ----
          </navigation-case>
          <navigation-case>
+             <from-outcome>dispatch</from-outcome>
+             <to-view-id>/private/dispatch.xhtml</to-view-id>
+         </navigation-case>
+         <navigation-case>
              <from-action>#{top.postLogin}</from-action>
              <from-outcome>missingUserObject</from-outcome>
***************
*** 315,330 ****
          <from-view-id>/private/selectAccount.xhtml</from-view-id>
          <navigation-case>
!             <from-outcome>inviteSuccess</from-outcome>
!             <to-view-id>/private/selectAccount.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!         <navigation-case>
!             <from-outcome>echr</from-outcome>
!             <to-view-id>/private/echr.xhtml</to-view-id>
!             <redirect/>
          </navigation-case>
          <navigation-case>
!             <from-outcome>ephr</from-outcome>
!             <to-view-id>/private/ephr.xhtml</to-view-id>
              <redirect/>
          </navigation-case>
--- 321,330 ----
          <from-view-id>/private/selectAccount.xhtml</from-view-id>
          <navigation-case>
!             <from-outcome>dispatch</from-outcome>
!             <to-view-id>/private/dispatch.xhtml</to-view-id>
          </navigation-case>
          <navigation-case>
!             <from-outcome>inviteSuccess</from-outcome>
!             <to-view-id>/private/selectAccount.xhtml</to-view-id>
              <redirect/>
          </navigation-case>
***************
*** 333,340 ****
              <to-view-id>/private/createAccount.xhtml</to-view-id>
          </navigation-case>
-         <navigation-case>
-             <from-outcome>createAccount</from-outcome>
-             <to-view-id>/private/createAccount.xhtml</to-view-id>
-         </navigation-case>
  	</navigation-rule>
      <navigation-rule>
--- 333,336 ----
***************
*** 575,579 ****
          </navigation-case>
      </navigation-rule>
! 
      <managed-bean>
          <description>
--- 571,640 ----
          </navigation-case>
      </navigation-rule>
!     <navigation-rule>
!         <description>
!             System Administration
!         </description>
!         <from-view-id>/private/admin/sysAdmin.xhtml</from-view-id>
!         <navigation-case>
!             <from-outcome>add</from-outcome>
!             <to-view-id>/private/admin/addAccountType.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!         <navigation-case>
!             <from-action>#{sys.selectAccountType}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/private/admin/updateAccountType.xhtml</to-view-id>
!         </navigation-case>
!          <navigation-case>
!             <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/admin/index.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!     </navigation-rule>
!     <navigation-rule>
!         <description>
!             Add Account Type
!         </description>
!         <from-view-id>/private/admin/addAccountType.xhtml</from-view-id>
!            <navigation-case>
!             <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/admin/sysAdmin.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!        <navigation-case>
!             <from-action>#{sys.addAccountType}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/private/admin/sysAdmin.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!        <navigation-case>
!             <from-action>#{sys.addAccountType}</from-action>
!             <from-outcome>fail</from-outcome>
!             <to-view-id>/private/admin/addAccountType.xhtml</to-view-id>
!         </navigation-case>
!     </navigation-rule>
!     <navigation-rule>
!         <description>
!             Update Account Type
!         </description>
!         <from-view-id>/private/admin/updateAccountType.xhtml</from-view-id>
!            <navigation-case>
!             <from-outcome>cancel</from-outcome>
!             <to-view-id>/private/admin/sysAdmin.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!        <navigation-case>
!             <from-action>#{sys.updateAccountType}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/private/admin/sysAdmin.xhtml</to-view-id>
!             <redirect/>
!         </navigation-case>
!        <navigation-case>
!             <from-action>#{sys.updateAccountType}</from-action>
!             <from-outcome>fail</from-outcome>
!             <to-view-id>/private/admin/updateAccountType.xhtml</to-view-id>
!         </navigation-case>
!     </navigation-rule>
!     
      <managed-bean>
          <description>
***************
*** 635,638 ****
--- 696,715 ----
      <managed-bean>
          <description>
+             Single Tolven application context
+         </description>
+         <managed-bean-name>tolven</managed-bean-name>
+         <managed-bean-class>org.tolven.web.TolvenContext</managed-bean-class>
+         <managed-bean-scope>application</managed-bean-scope>
+     </managed-bean>
+      <managed-bean>
+         <description>
+             Sys Admin request actions and context
+         </description>
+         <managed-bean-name>sys</managed-bean-name>
+         <managed-bean-class>org.tolven.web.SysAdmin</managed-bean-class>
+         <managed-bean-scope>request</managed-bean-scope>
+     </managed-bean>
+     <managed-bean>
+         <description>
              Invitation-related request actions and context
          </description>
***************
*** 654,657 ****
      <managed-bean-scope>request</managed-bean-scope>
      </managed-bean>
! 
  </faces-config>
--- 731,734 ----
      <managed-bean-scope>request</managed-bean-scope>
      </managed-bean>
! 	
  </faces-config>

[Tolven-cvs-commit] tolvenWEB/web/private/admin index.xhtml, NONE, 1.1 sysAdmin.xhtml, NONE, 1.1 addAccountType.xhtml, NONE, 1.1 updateAccountType.xhtml, NONE, 1.1

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

Update of /cvsroot/tolven/tolvenWEB/web/private/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20429/web/private/admin

Added Files:
	index.xhtml sysAdmin.xhtml addAccountType.xhtml 
	updateAccountType.xhtml 
Log Message:
Add AccountType support - see release notes for further details

--- NEW FILE: addAccountType.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>System Administration</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition template="../../templates/portalTemplate.xhtml">
		<ui:param name="skin" value="echr"/>
        <ui:define name="content">
        <h2>System Administration - Account Types</h2>
         <h3>Add New Account Type</h3>
	        <h:form id="addAccountType">
	           <h:panelGrid columns="2">
	           		<h:outputText value="Account Type"/>
	           		<h:inputText id="type" value ="#{sys.knownType}" size="20" required="true"/>
	           		<h:outputText value="Homepage"/>
	           		<h:inputText id="homepage" value ="#{sys.homePage}" size="20"/>
	           		<h:outputText value="Description"/>
	           		<h:inputText id="longdesc" value="#{sys.longDesc}" size="20"/>
	           		<h:outputText value="Read only(default false)"/>
	           		<h:selectBooleanCheckbox id="readonly" value="#{sys.readOnly}"/>
	           		<h:outputText value="Status"/>
	           		<h:selectOneMenu id="status" value="#{sys.status}">
	           			<f:selectItem itemValue="active" itemLabel="Active"/>
	           			<f:selectItem itemValue="new" itemLabel="Pending (new)"/>
	           		</h:selectOneMenu>
	           </h:panelGrid>
	          <h:messages errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
               <h:commandButton action="cancel" immediate="true" value="Cancel"/>
               <h:commandButton action="#{sys.addAccountType}" value="Add"/>
           </h:form>
		</ui:define>
    </ui:composition>
  </body>
</html>

--- NEW FILE: index.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>System Administration Home Page</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition template="../../templates/portalTemplate.xhtml">
		<ui:param name="skin" value="echr"/>
        <ui:define name="content">
        <h2>System Administration</h2>
        	<h:commandLink action="sysAdmin">
				<h:outputText value="System administration"/>
			</h:commandLink>
		</ui:define>
    	</ui:composition>
  </body>
</html>


--- NEW FILE: updateAccountType.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>System Administration</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition template="../../templates/portalTemplate.xhtml">
		<ui:param name="skin" value="echr"/>
        <ui:define name="content">
        <h2>System Administration - Account Types</h2>
         <h3>Update Account Type</h3>
	        <h:form id="updateAccountType">
	          <h:messages errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
       		  <h:inputHidden id="id" value ="#{sys.currentAccountType.id}"/>
	          <h:panelGrid columns="2">
	           		<h:outputText value="Id"/>
	           		<h:inputText id="id2" value ="#{sys.currentAccountType.id}" size="10" readonly="true" />
	           		<h:outputText value="Account Type"/>
	           		<h:inputText id="type" value ="#{sys.currentAccountType.knownType}" size="20" required="true"/>
	           		<h:outputText value="Homepage"/>
	           		<h:inputText id="homepage" value ="#{sys.currentAccountType.homePage}" size="20"/>
	           		<h:outputText value="Description"/>
	           		<h:inputText id="longdesc" value="#{sys.currentAccountType.longDesc}" size="20"/>
	           		<h:outputText value="Read only(default false)"/>
	           		<h:selectBooleanCheckbox id="readonly" value="#{sys.currentAccountType.readOnly}"/>
	           		<h:outputText value="Status"/>
	           		<h:selectOneMenu id="status" value="#{sys.currentAccountType.status}">
	           			<f:selectItem itemValue="new" itemLabel="Pending (new)"/>
	           			<f:selectItem itemValue="active" itemLabel="Active"/>
	           			<f:selectItem itemValue="inactive" itemLabel="Inactive"/>
	           		</h:selectOneMenu>
	           </h:panelGrid>
               <h:commandButton action="cancel" immediate="true" value="Cancel"/>
               <h:commandButton action="#{sys.updateAccountType}" value="Update"/>
           </h:form>
		</ui:define>
    </ui:composition>
  </body>
</html>

--- NEW FILE: sysAdmin.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>System Administration</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition template="../../templates/portalTemplate.xhtml">
		<ui:param name="skin" value="echr"/>
        <ui:define name="content">
        <h2>System Administration</h2>
        <h3>Account Types</h3>
        <h:form id="sysAdmin">
	        <h:panelGroup rendered="#{sys.accountTypeCount!=0}">
	           <h:dataTable value ="#{sys.accountTypesModel}" var="act" >
		           <h:column>
		           	  <f:facet name="header">
		                <h:outputText value="Known Type"/>
		              </f:facet>
		               <h:commandLink action="#{sys.selectAccountType}" immediate="true">
			                <h:outputText value="#{act.knownType}" />
			           </h:commandLink>
		            </h:column>
		            <h:column>
		              <f:facet name="header">
		                <h:outputText value="Description" />
		              </f:facet>
		                <h:outputText value="#{act.longDesc}"/>
					</h:column>
					<h:column>
					  <f:facet name="header">
		                <h:outputText value="Status" />
		              </f:facet>
		                <h:outputText value="#{act.status}"/>
					</h:column>
				</h:dataTable>
			</h:panelGroup>
	        <h:commandLink action="add">
	     		<h:outputText value="Add a new AccountType"/>
	        </h:commandLink>
          </h:form>
		</ui:define>
    </ui:composition>
  </body>
</html>

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/bean AccountDAOBean.java, 1.7, 1.8 InvitationSender.java, 1.8, 1.9 InvitationBean.java, 1.13, 1.14 ActivationBean.java, 1.17, 1.18

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

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

Modified Files:
	AccountDAOBean.java InvitationSender.java InvitationBean.java 
	ActivationBean.java 
Log Message:
Add AccountType support - see release notes for further details

Index: InvitationSender.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationSender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InvitationSender.java	3 Sep 2006 01:13:16 -0000	1.8
--- InvitationSender.java	6 Nov 2006 07:41:24 -0000	1.9
***************
*** 28,31 ****
--- 28,32 ----
  
  import org.tolven.core.InvitationLocal;
+ import org.tolven.core.entity.Status;
  import org.tolven.doc.entity.Invitation;
  
***************
*** 54,58 ****
  	        if ("test".equals(invitation.getDispatchAction())) {
  				System.out.println("[InvitationSender:onMessage] TEST MSG: " + invitation.getTitle());
! 				invitation.setStatus("USED");
  				return;
  	        }
--- 55,60 ----
  	        if ("test".equals(invitation.getDispatchAction())) {
  				System.out.println("[InvitationSender:onMessage] TEST MSG: " + invitation.getTitle());
! 				String completedStatus = Status.fromValue("COMPLETED").value();	  
! 				invitation.setStatus(completedStatus);
  				return;
  	        }

Index: AccountDAOBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AccountDAOBean.java	17 Oct 2006 03:02:10 -0000	1.7
--- AccountDAOBean.java	6 Nov 2006 07:41:24 -0000	1.8
***************
*** 14,17 ****
--- 14,18 ----
  package org.tolven.core.bean;
  
+ import java.util.ArrayList;
  import java.util.Date;
  import java.util.List;
***************
*** 28,33 ****
--- 29,37 ----
  import org.tolven.core.entity.AccountType;
  import org.tolven.core.entity.Sponsorship;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.core.entity.AccountUser;
+ 
+ 
  /**
   * This is the bean class for the AccountDAOBean enterprise bean.
***************
*** 59,65 ****
       * @return A new Account object
       */
!     public Account createAccount( String accountType, String title, String timeZone ) {
          Account account = new Account();
!         account.setKnownType( accountType );
          account.setTitle(title);
  		account.setTimeZone( timeZone );
--- 63,70 ----
       * @return A new Account object
       */
!     public Account createAccount( String knownType, String title, String timeZone ) {
          Account account = new Account();
!         AccountType accountType = findAccountTypebyKnownType(knownType);
!         account.setAccountType( accountType );
          account.setTitle(title);
  		account.setTimeZone( timeZone );
***************
*** 68,78 ****
      }
  
!     /**
       * Create a new account. No users are associated with this account.
       * @param accountType
       * @return A new Account object
       */
!     public Account createAccount( String accountType ) {
!         return createAccount( accountType, null, null );
      }
  
--- 73,96 ----
      }
  
! 	/**
       * Create a new account. No users are associated with this account.
       * @param accountType
       * @return A new Account object
       */
!     public Account createAccount2(  String title, String timeZone, AccountType accountType ) {
!         Account account = new Account();
!         account.setAccountType( accountType );
!         account.setTitle(title);
! 		account.setTimeZone( timeZone );		//account.setAccountTypeId(accountTypeId);
!         em.persist( account );
!         return account;
!     }
!     /**
!      * Create a new account. No users are associated with this account.
!      * @param AccountType accountType
!      * @return A new Account object
!      */
!     public Account createAccount( String knownType ) {
!         return createAccount( knownType, null, null );
      }
  
***************
*** 90,96 ****
       */
       public TolvenUser findUser( String principal ) {
! //    	 System.out.println( "ActivationBean.findUser");
!     	 Query query = em.createQuery("SELECT DISTINCT u FROM TolvenUser u WHERE u.ldapUID = :principal " +
!                 "and (u.status = 'ACTIVE' or u.status = 'ACTIVATING')");
          query.setParameter("principal", principal.toLowerCase());
          query.setMaxResults(2);
--- 108,121 ----
       */
       public TolvenUser findUser( String principal ) {
!     	 //Support both types of active status;    	
!     	String activeStatus = Status.fromValue("active").value();
!     	String oldActiveStatus = Status.fromValue("ACTIVE").value();
!   		//Activating should be replaced by New
!  		String activatingStatus = Status.fromValue("ACTIVATING").value();
!  		String newStatus = Status.fromValue("new").value();
!  		String select = "SELECT DISTINCT u FROM TolvenUser u WHERE u.ldapUID = :principal " +
!         "and ( u.status = '";
!  		select += oldActiveStatus + "' or u.status = '" + activeStatus + "' or u.status = '" + newStatus + "' or u.status = '" + activatingStatus + "') ";
!     	 Query query = em.createQuery(select);
          query.setParameter("principal", principal.toLowerCase());
          query.setMaxResults(2);
***************
*** 112,116 ****
           au.setUser( user );
           au.setEffectiveDate( now );
!          au.setStatus("ACTIVE");
           // Don't make this the default account until asked, even if we only have one account for the user.
           au.setDefaultAccount( false ); 
--- 137,142 ----
           au.setUser( user );
           au.setEffectiveDate( now );
!  		 String activeStatus = Status.fromValue("active").value();
!          au.setStatus(activeStatus);
           // Don't make this the default account until asked, even if we only have one account for the user.
           au.setDefaultAccount( false ); 
***************
*** 172,176 ****
        	q.setParameter("account", account);
        	return q.getResultList();
        }
  
! }
--- 198,310 ----
        	q.setParameter("account", account);
        	return q.getResultList();
+       } 
+      
+      /**
+       * Return a list of all account types
+       * @return List
+       */
+      public List<AccountType> findAllAccountTypes ( ) {
+           Query query = em.createQuery("SELECT acty FROM AccountType acty");
+           List<AccountType> items = query.getResultList();
+           return items; 	
        }
  
!      /**
!       * Return a list of active account types
!       * @return List
!       */
!      public List<AccountType> findActiveAccountTypes ( ) {
!     	 String activeStatus = Status.fromValue("active").value(); 
!     	 String oldActiveStatus = Status.fromValue("ACTIVE").value(); 
!     	 String select = "SELECT acty FROM AccountType acty WHERE (acty.status = '";
!     	 select += activeStatus + "' or acty.status = '" + oldActiveStatus + "' ) ";
!          Query query = em.createQuery(select);
!          List<AccountType> items = query.getResultList();
!          return items; 	
!       }
!      
!     /**
!   	* Find an accountType by knownType
!   	* @return AccountType
!   	*/
!  	public AccountType findAccountTypebyKnownType( String knownType ) {
!  		List<String> activeStatus = new ArrayList<String>();
!  		activeStatus.add(Status.ACTIVE.value()); 
! 	   	activeStatus.add( Status.OLD_ACTIVE.value()); 
! 	   	activeStatus.add( Status.NEW.value()); 
!  		Query q = em.createQuery("SELECT acty FROM AccountType acty WHERE acty.knownType = :kt" +
!  				" and acty.status IN (:activeStatus) " );
!  		q.setParameter("kt", knownType);
!  		q.setParameter("activeStatus", activeStatus);
!  		List<AccountType> accountTypes = q.getResultList();
!  		if (accountTypes.size()==1) return accountTypes.get(0);
!  		else return null;
!  	}
!  	
!     /**
!   	* Find an accountType by id
!   	* @return AccountType
!   	*/
!  	public AccountType findAccountType( long id ) {
!  		return em.find(AccountType.class, id);
!  	}
!  	
!  	/**
!  	 * createAccountType - create a new row in AccountType
!  	 * @param knownType
!  	 * @param homePage
!  	 * @param longDesc
!  	 * @param readOnly
!  	 * @return
!  	 */
!     public AccountType createAccountType( String knownType, String homePage, String longDesc, boolean readOnly, String status ) {
!         AccountType accountType = new AccountType();
!         accountType.setKnownType( knownType );
!         accountType.setHomePage(homePage);
! 		accountType.setLongDesc(longDesc );	
! 		accountType.setReadOnly(readOnly);
! 		String encodedStatus = Status.fromValue(status).value();
! 		accountType.setStatus(encodedStatus);
!         em.persist( accountType );
!         return accountType;
!     }
! 
!     /**
!  	 * updateAccountType - update the indicated accountType record
!  	 * @param accountType
!  	 */
!     public void updateAccountType( AccountType accountType ){
!     	em.merge(accountType);
!     }
!     
!     /**
!      * statusForValue
!      * @param value
!      * @return String value of a status type
!      */
!     public String statusForValue( String value){
!     	String statusStr = Status.fromValue(value).value();
!     	return statusStr;
!     }
! 
!     /**
!      * One-time migration 5-Nov-2006 for Accounts without an AccountType.
!      */
!     public void accountTypeConversion() {
!     	em.flush();
!      	Query q = em.createQuery("SELECT a FROM Account a WHERE a.accountType = null");
!      	q.setMaxResults(1);
!      	List<Account> typelessAccouts = q.getResultList();
!      	if (typelessAccouts.size()>0) {
! 	    	Query q1 = em.createNativeQuery("update core.account set accounttype_id = (select at.id from core.account_type at where at.known_type = 'echr') where known_type = 'echr';");
! 	    	int countQ1 = q1.executeUpdate();
! 	    	Query q2 = em.createNativeQuery("update core.account set accounttype_id = (select at.id from core.account_type at where at.known_type = 'ephr') where known_type = 'ephr';");
! 	    	int countQ2 = q2.executeUpdate();
! 	    	System.out.println( "Upgraded " + (countQ1+countQ2) + " accounts to new AccountTypes");
!      	}
!     }
!     
!  } //endclass
!  	
! 
!    

Index: InvitationBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationBean.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InvitationBean.java	17 Oct 2006 03:02:10 -0000	1.13
--- InvitationBean.java	6 Nov 2006 07:41:24 -0000	1.14
***************
*** 55,58 ****
--- 55,59 ----
  import org.tolven.core.entity.Account;
  import org.tolven.core.entity.HealthRecord;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.doc.DocumentLocal;
***************
*** 218,224 ****
       */
      public Invitation createInvitation( String principal, InvitationDetail detail ) throws JAXBException, IOException {
      	Invitation invite = new Invitation( );
      	invite.setTargetEmail(principal);
!         invite.setStatus("ACTIVE");
          invite.setDetails( createDetail(detail) );
          em.persist( invite );
--- 219,226 ----
       */
      public Invitation createInvitation( String principal, InvitationDetail detail ) throws JAXBException, IOException {
+    	 	String activeStatus = Status.fromValue("ACTIVE").value(); 
      	Invitation invite = new Invitation( );
      	invite.setTargetEmail(principal);
!         invite.setStatus(activeStatus);
          invite.setDetails( createDetail(detail) );
          em.persist( invite );
***************
*** 253,259 ****
  	
  	public List<Invitation> findOpenInvitations( TolvenUser user, Date now) {
          Query query = em.createQuery("SELECT i FROM Invitation i WHERE i.targetEmail = :uid  " +
          		"AND (i.expiration > :now or i.expiration IS NULL) " +
!         		"AND i.status = 'ACTIVE' ");
          query.setParameter("uid", user.getLdapUID());
          query.setParameter("now", now);
--- 255,264 ----
  	
  	public List<Invitation> findOpenInvitations( TolvenUser user, Date now) {
+ 		 String activeStatus = Status.fromValue("active").value(); 
+ 		 String oldActiveStatus = Status.fromValue("ACTIVE").value(); 
+ 
          Query query = em.createQuery("SELECT i FROM Invitation i WHERE i.targetEmail = :uid  " +
          		"AND (i.expiration > :now or i.expiration IS NULL) " +
!         		"AND (i.status = '" + activeStatus + "' or i.status = '" + oldActiveStatus + "') ");
          query.setParameter("uid", user.getLdapUID());
          query.setParameter("now", now);
***************
*** 312,316 ****
  			}
  		}
! 		invitation.setStatus("USED");
  		em.merge( invitation );
  		
--- 317,322 ----
  			}
  		}
! 		String completedStatus = Status.fromValue("completed").value();	 
! 		invitation.setStatus(completedStatus);
  		em.merge( invitation );
  		

Index: ActivationBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/ActivationBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ActivationBean.java	16 Oct 2006 08:58:32 -0000	1.17
--- ActivationBean.java	6 Nov 2006 07:41:24 -0000	1.18
***************
*** 15,18 ****
--- 15,19 ----
  
  import java.io.IOException;
+ import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.Date;
***************
*** 40,43 ****
--- 41,45 ----
  import org.tolven.core.entity.HealthRecord;
  import org.tolven.core.entity.Sponsorship;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.doc.DocumentLocal;
***************
*** 46,49 ****
--- 48,52 ----
  import org.tolven.security.TolvenPerson;
  import org.tolven.security.bean.LDAPLocal;
+ 
  //import javax.jws.WebService;
  /**
***************
*** 110,114 ****
  	    	user.setSponsorship(sponsorship);
      	}
!         invitation.setStatus("USED");
          em.merge(invitation);
          return true;
--- 113,118 ----
  	    	user.setSponsorship(sponsorship);
      	}
!  		String completedStatus = Status.fromValue("completed").value();	 
!         invitation.setStatus(completedStatus);
          em.merge(invitation);
          return true;
***************
*** 123,127 ****
          TolvenUser user = new TolvenUser();
          user.setLdapUID( principal );
!         user.setStatus( "ACTIVE");
          user.setLastLogin( null );    // Last login is null, never logged in before this
          user.setCreation( now ); 
--- 127,132 ----
          TolvenUser user = new TolvenUser();
          user.setLdapUID( principal );
!  		String activeStatus = Status.fromValue("active").value();
!         user.setStatus( activeStatus);
          user.setLastLogin( null );    // Last login is null, never logged in before this
          user.setCreation( now ); 
***************
*** 146,152 ****
      	}
      	// Create an invitation
          Invitation invitation = new Invitation();
          invitation.setTargetEmail( tp.getUid() );
!         invitation.setStatus("ACTIVE");
          invitation.setTitle( "Finish new user activation");
          invitation.setDispatchAction("activate");
--- 151,159 ----
      	}
      	// Create an invitation
+  		String activeStatus = Status.fromValue("active").value();
+ 
          Invitation invitation = new Invitation();
          invitation.setTargetEmail( tp.getUid() );
!         invitation.setStatus(activeStatus);
          invitation.setTitle( "Finish new user activation");
          invitation.setDispatchAction("activate");
***************
*** 180,185 ****
       */
      public TolvenUser registerAndActivate(  TolvenPerson tp, Date now ) throws Exception {
! //        System.out.println( "Registering: " + tp.toString());
          // Create a new user object
      	TolvenUser user = createTolvenUser( tp.getUid(), now );
      	String rc = tp.getReferenceCode();
--- 187,193 ----
       */
      public TolvenUser registerAndActivate(  TolvenPerson tp, Date now ) throws Exception {
!        //System.out.println( "Registering: " + tp.toString());
          // Create a new user object
+        
      	TolvenUser user = createTolvenUser( tp.getUid(), now );
      	String rc = tp.getReferenceCode();
***************
*** 214,220 ****
        */
       public TolvenUser deactivateUser( String principal) {
!          TolvenUser user = accountBean.findUser( principal );
           if (user!=null) {
!             user.setStatus("INACTIVE");
           }
           return user;
--- 222,230 ----
        */
       public TolvenUser deactivateUser( String principal) {
!         TolvenUser user = accountBean.findUser( principal );
!   		String inactiveStatus = Status.fromValue("inactive").value();
!         
           if (user!=null) {
!             user.setStatus(inactiveStatus);
           }
           return user;
***************
*** 226,231 ****
       public AccountUser findDefaultAccountUser( TolvenUser user )
       {
!         Query query = em.createQuery("SELECT au FROM AccountUser au WHERE au.user = :user " +
!                 "and au.status = 'ACTIVE' and au.defaultAccount = true)");
          query.setParameter("user", user);
          List<AccountUser> accountUsers = query.getResultList();
--- 236,245 ----
       public AccountUser findDefaultAccountUser( TolvenUser user )
       {
!   		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;
!   		select += "' ) and au.defaultAccount = true";
!         Query query = em.createQuery(select);
          query.setParameter("user", user);
          List<AccountUser> accountUsers = query.getResultList();
***************
*** 263,268 ****
        */
        public List<AccountUser> findUserAccounts( TolvenUser user ) {
           Query query = em.createQuery("SELECT au FROM AccountUser au WHERE au.user = :user " +
!                  "and au.status = 'ACTIVE'");
           query.setParameter("user", user);
           List<AccountUser> items = query.getResultList();
--- 277,284 ----
        */
        public List<AccountUser> findUserAccounts( TolvenUser user ) {
+    		 String activeStatus = Status.fromValue("active").value();
+    		 String oldActiveStatus = Status.fromValue("ACTIVE").value(); 
           Query query = em.createQuery("SELECT au FROM AccountUser au WHERE au.user = :user " +
!                  "and ( au.status = '" + activeStatus + "' or au.status = '" + oldActiveStatus + "') ");
           query.setParameter("user", user);
           List<AccountUser> items = query.getResultList();
***************
*** 271,280 ****
        
        /**
         * Given the Tolven Account, find a list of all TolvenUsers that are users of the account.
         * We ignore users that are inactive.
         */
         public List<AccountUser> findAccountUsers( Account account ) {
            Query query = em.createQuery("SELECT au FROM AccountUser au WHERE au.account = :account " +
!                   "and au.user.status = 'ACTIVE' order by au.user.ldapUID");
            query.setParameter("account", account);
            List<AccountUser> items = query.getResultList();
--- 287,313 ----
        
        /**
+        * Count the number of accounts a user could log into
+        */
+       public long countUserAccounts( TolvenUser user )
+       {
+    		List<String> activeStatus = new ArrayList<String>();
+ 		activeStatus.add(Status.ACTIVE.value()); 
+ 		activeStatus.add( Status.OLD_ACTIVE.value()); 
+ 		Query query = em.createQuery("SELECT COUNT(au) FROM AccountUser au WHERE au.user = :user AND au.status IN (:activeStatus)");
+ 		query.setParameter("user", user);
+  		query.setParameter("activeStatus", activeStatus);
+ 		Long rslt = (Long) query.getSingleResult();
+ 		return rslt.longValue();
+      }
+ 
+       /**
         * Given the Tolven Account, find a list of all TolvenUsers that are users of the account.
         * We ignore users that are inactive.
         */
         public List<AccountUser> findAccountUsers( Account account ) {
+     		String activeStatus = Status.fromValue("active").value();
+     		 String oldActiveStatus = Status.fromValue("ACTIVE").value(); 
            Query query = em.createQuery("SELECT au FROM AccountUser au WHERE au.account = :account " +
!                   "and (au.user.status = '" + activeStatus + "' or au.user.status = '" + oldActiveStatus + "') order by au.user.ldapUID");       
            query.setParameter("account", account);
            List<AccountUser> items = query.getResultList();
***************
*** 286,294 ****
        */
        public List<TolvenUser> findAllActiveUsers( ) {
!          Query query = em.createQuery("SELECT u FROM TolvenUser u WHERE u.status = 'ACTIVE'");
           List<TolvenUser> items = query.getResultList();
           return items;
        }
! 
        /**
       * Count the number of users knows to the DB
--- 319,329 ----
        */
        public List<TolvenUser> findAllActiveUsers( ) {
!     		String activeStatus = Status.fromValue("active").value();
!     		String oldActiveStatus = Status.fromValue("ACTIVE").value();
!          Query query = em.createQuery("SELECT u FROM TolvenUser u WHERE u.status = '" + activeStatus + "' or u.status = '" + oldActiveStatus + "'");
           List<TolvenUser> items = query.getResultList();
           return items;
        }
!  
        /**
       * Count the number of users knows to the DB

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen/bean GenMedical.java, 1.12, 1.13 CHRGeneratorBean.java, 1.11, 1.12

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

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

Modified Files:
	GenMedical.java CHRGeneratorBean.java 
Log Message:
Add AccountType support - see release notes for further details

Index: GenMedical.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenMedical.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GenMedical.java	3 Oct 2006 03:14:43 -0000	1.12
--- GenMedical.java	6 Nov 2006 07:41:24 -0000	1.13
***************
*** 55,64 ****
  			this.patient = patient;
  			MenuStructure ms = patient.getMenuStructure();
! 			if ("echr".equals(patient.getAccount().getKnownType())) {
! 				msDisease = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getKnownType() + ":patients:disease");
! 		    	msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getKnownType() + ":activity");
  			}
! 			if ("ephr".equals(patient.getAccount().getKnownType())) {
! 		    	msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getKnownType() + ":family:activity");
  			}
  		    msProblem = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "problems");
--- 55,64 ----
  			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() + ":family:activity");
  			}
  		    msProblem = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "problems");

Index: CHRGeneratorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CHRGeneratorBean.java	17 Oct 2006 03:02:10 -0000	1.11
--- CHRGeneratorBean.java	6 Nov 2006 07:41:24 -0000	1.12
***************
*** 290,294 ****
  		if (vp.getDod() != null && vp.getDod().before(now)) return null;
  
! 		String accountType = account.getKnownType();
  		// Create the CCR document describing the patient.
  		DocCCR ccr = documentLocal.createCCRDocument(user.getId(), account.getId());
--- 290,294 ----
  		if (vp.getDod() != null && vp.getDod().before(now)) return null;
  
! 		String accountType = account.getAccountType().getKnownType();
  		// Create the CCR document describing the patient.
  		DocCCR ccr = documentLocal.createCCRDocument(user.getId(), account.getId());
***************
*** 338,349 ****
  		documentLocal.persistCCRDocument(ccr, true);
  
! 		MenuData mdpat = echr.addPatient(account, ccr, account.getKnownType() + ":patient", null);
  		
  		if ("echr".equals(accountType)) {
! 			echr.addPatient(account, ccr, account.getKnownType() + ":patients:all", mdpat);
  
  		}
  		if ("ephr".equals(accountType)) {
! 			echr.addPatient(account, ccr, account.getKnownType() + ":family:members", mdpat);
  		}
  		return mdpat;
--- 338,349 ----
  		documentLocal.persistCCRDocument(ccr, true);
  
! 		MenuData mdpat = echr.addPatient(account, ccr, account.getAccountType().getKnownType() + ":patient", null);
  		
  		if ("echr".equals(accountType)) {
! 			echr.addPatient(account, ccr, account.getAccountType().getKnownType() + ":patients:all", mdpat);
  
  		}
  		if ("ephr".equals(accountType)) {
! 			echr.addPatient(account, ccr, account.getAccountType().getKnownType() + ":family:members", mdpat);
  		}
  		return mdpat;

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core ActivationLocal.java, 1.13, 1.14 AccountDAOLocal.java, 1.7, 1.8

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

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

Modified Files:
	ActivationLocal.java AccountDAOLocal.java 
Log Message:
Add AccountType support - see release notes for further details

Index: ActivationLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/ActivationLocal.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ActivationLocal.java	3 Sep 2006 01:13:16 -0000	1.13
--- ActivationLocal.java	6 Nov 2006 07:41:24 -0000	1.14
***************
*** 97,100 ****
--- 97,105 ----
        
        /**
+        * Count the number of accounts a user could log into
+        */
+       public long countUserAccounts( TolvenUser user );
+ 
+       /**
         * Given the Tolven Account, find a list of all TolvenUsers that are users of the account.
         */

Index: AccountDAOLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/AccountDAOLocal.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AccountDAOLocal.java	17 Oct 2006 03:02:10 -0000	1.7
--- AccountDAOLocal.java	6 Nov 2006 07:41:24 -0000	1.8
***************
*** 24,27 ****
--- 24,29 ----
  import org.tolven.core.entity.Sponsorship;
  import org.tolven.core.entity.TolvenUser;
+ import org.tolven.core.entity.AccountType;
+ 
  
  /**
***************
*** 41,45 ****
       * @return A new Account object
       */
!     public Account createAccount( String accountType );
  
      /**
--- 43,47 ----
       * @return A new Account object
       */
!     public Account createAccount( String knownType );
  
      /**
***************
*** 49,54 ****
       * @return A new Account object
       */
!     public Account createAccount( String accountType, String title, String timeZone );
  
     	/**
       * Given the principal's name, get the TolvenUser.
--- 51,65 ----
       * @return A new Account object
       */
!     public Account createAccount( String knownType, String title, String timeZone );
  
+     /**
+      * Create a new account. No users are associated with this account.
+      * @param accountType
+      * @param timeZone Java time zone, null means use tolven default
+      * @return A new Account object
+      */
+     public Account createAccount2( String title, String timeZone, AccountType accType );
+ 
+  
     	/**
       * Given the principal's name, get the TolvenUser.
***************
*** 92,95 ****
--- 103,112 ----
  
        /**
+     	* Find an accountType by id
+     	* @return AccountType
+     	*/
+    	public AccountType findAccountType( long id );
+ 
+    		/**
         * Return a list of users sponsored users by the specified account. This attributes returned are captive
         * in order to avoid cross-account peeping beyond the scope of sponsorship. 
***************
*** 98,101 ****
--- 115,155 ----
         */
        public List<SponsoredUser> findSponsoredUsersForAccount( Account account );
+       /**
+        *  Return a list of all AccountTypes
+        */
+       public List<AccountType> findAllAccountTypes ( );
+       /**
+        * Get active AccountTypes
+        * @return
+        */
+       public List<AccountType> findActiveAccountTypes ( );
        
+   	  /**
+   	   * Return a single AccountType by known_type
+   	   * @param kt
+   	   * @return AccountType
+   	   */
+   	  public AccountType findAccountTypebyKnownType( String kt );
+   	  
+   	  /**
+   	   * Create new AccountType record 
+   	   * @param knownType, homePage, longDesc, readOnly
+   	   * @return AccountType
+   	   */
+   	   public AccountType createAccountType( String knownType, String homePage, String longDesc, boolean readOnly, String status );
+   	   /**
+   	    * Update AccountType record
+   	    * @param accountType
+   	    * @return void
+   	    */
+   	   public void updateAccountType( AccountType accountType );
+   	   /**
+   	    * Get status type for input value
+   	    */
+   	    public String statusForValue( String value);
+ 
+   	    /**
+   	     * One-time migration 5-Nov-2006 for Accounts without an AccountType.
+   	     */
+   	    public void accountTypeConversion();
  }

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/bean MenuBean.java, 1.34, 1.35

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

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

Modified Files:
	MenuBean.java 
Log Message:
Add AccountType support - see release notes for further details

Index: MenuBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** MenuBean.java	16 Oct 2006 19:08:13 -0000	1.34
--- MenuBean.java	6 Nov 2006 07:41:24 -0000	1.35
***************
*** 535,539 ****
  		}
  
! 		if (account.getKnownType().equals("echr")) {
  			//        user  parent   template           menuTemplate   seq node       menu text   visible  repeat  role
  			root = new MenuStructure( 
--- 535,539 ----
  		}
  
! 		if (account.getAccountType().getKnownType().equals("echr")) {
  			//        user  parent   template           menuTemplate   seq node       menu text   visible  repeat  role
  			root = new MenuStructure( 
***************
*** 546,550 ****
  		}
  		
! 		if (account.getKnownType().equals("ephr")) {
  			//        user  parent   template           menuTemplate   seq node       menu text   visible  repeat  role
  			root = new MenuStructure( 
--- 546,550 ----
  		}
  		
! 		if (account.getAccountType().getKnownType().equals("ephr")) {
  			//        user  parent   template           menuTemplate   seq node       menu text   visible  repeat  role
  			root = new MenuStructure( 

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/entity Status.java, NONE, 1.1 Account.java, 1.8, 1.9 AccountType.java, 1.2, 1.3

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

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

Modified Files:
	Account.java AccountType.java 
Added Files:
	Status.java 
Log Message:
Add AccountType support - see release notes for further details

Index: AccountType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/AccountType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AccountType.java	21 Aug 2006 00:26:29 -0000	1.2
--- AccountType.java	6 Nov 2006 07:41:24 -0000	1.3
***************
*** 48,51 ****
--- 48,57 ----
      private boolean readOnly;
      
+     @Column( name="LONG_DESC", length=255)
+     private String longDesc;
+    
+     @Column( name="STATUS", length=10)
+     private String status;
+   
      /** Creates a new instance of AccountType */
      public AccountType() {
***************
*** 88,91 ****
--- 94,113 ----
          this.knownType = knownType;
      }
+     public String getLongDesc() {
+         return longDesc;
+     }
+ 
+     public void setLongDesc(String longDesc) {
+         this.longDesc = longDesc;
+     }
+ 
+     public String getStatus() {
+         return status;
+     }
+ 
+     public void setStatus(String status) {
+         this.status = status;
+     }
+     
      
  }

Index: Account.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/Account.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Account.java	14 Oct 2006 20:13:35 -0000	1.8
--- Account.java	6 Nov 2006 07:41:24 -0000	1.9
***************
*** 52,58 ****
      @Column( name="USER_LOCALE", length=10)
      private String locale;
- 
-     @Column( name="KNOWN_TYPE", length=20)
-     private String knownType;
      
      @ManyToOne(fetch = FetchType.LAZY)
--- 52,55 ----
***************
*** 160,164 ****
  
      public AccountType getAccountType() {
!         return accountType;
      }
  
--- 157,161 ----
  
      public AccountType getAccountType() {
!          return accountType;
      }
  
***************
*** 166,183 ****
          this.accountType = accountType;
      }
! 
      public Set<AccountUser> getAccountUsers() {
          return accountUsers;
      }
  
      public void setAccountUsers(Set<AccountUser> accountUsers) {
          this.accountUsers = accountUsers;
      }
! 	public String getKnownType() {
! 		return knownType;
! 	}
! 	public void setKnownType(String knownType) {
! 		this.knownType = knownType;
! 	}
  	public Set<HealthRecord> getHealthRecords() {
  		return healthRecords;
--- 163,176 ----
          this.accountType = accountType;
      }
!     
      public Set<AccountUser> getAccountUsers() {
          return accountUsers;
      }
  
+     
      public void setAccountUsers(Set<AccountUser> accountUsers) {
          this.accountUsers = accountUsers;
      }
!     
  	public Set<HealthRecord> getHealthRecords() {
  		return healthRecords;

--- NEW FILE: Status.java ---
package org.tolven.core.entity;

public enum Status {
		ACTIVE("active"),
		OLD_ACTIVE("ACTIVE"),
		ACTIVATED("activated"),
		ACTIVATING("ACTIVATING"),
		COMPLETED("completed"),
		INACTIVE("inactive"),
		OLD_INACTIVE("INACTIVE"),
		NEW("new"),
		NULLIFIED("nullified"),
		OBSOLETE("obsolete"),
		REGISTERED("registered"),
		USED("USED");
		
		private final String value;

	    Status(String v) {
	        value = v;
	    }

	    public String value() {
	        return value;
	    }

	    public static Status fromValue(String v) {
	        for (Status c: Status.values()) {
	            if (c.value.equals(v)) {
	                return c;
	            }
	        }
	        throw new IllegalArgumentException(v.toString());
	    }

}

[Tolven-cvs-commit] tolvenWEB/web/private/admin - New directory

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

Update of /cvsroot/tolven/tolvenWEB/web/private/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20378/web/private/admin

Log Message:
Directory /cvsroot/tolven/tolvenWEB/web/private/admin added to the repository

[Tolven-cvs-commit] tolvenWEB/web/styles wizard.css, 1.2, 1.3 ephr.css, 1.2, 1.3

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

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

Modified Files:
	wizard.css ephr.css 
Log Message:
Wizard prototype (not production code)

Index: wizard.css
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/styles/wizard.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wizard.css	30 Oct 2006 19:34:23 -0000	1.2
--- wizard.css	4 Nov 2006 19:36:13 -0000	1.3
***************
*** 138,143 ****
  
  fieldset legend {
! 	margin-left: 3px;
! 	margin-right: 3px;
  }
  
--- 138,143 ----
  
  fieldset legend {
! 	padding-left: 3px;
! 	padding-right: 3px;
  }
  
***************
*** 147,151 ****
  
  .title {
! 	font-size: 0.75em; display: block; float: left; width: 29%; COLOR: #333333
  }
  
--- 147,151 ----
  
  .title {
! 	font-size: 0.95em; display: block; float: left; width: 29%; COLOR: #333333
  }
  
***************
*** 155,156 ****
--- 155,164 ----
  .selOK {
  }
+ 
+ fieldset.attention {
+ 	border: 3px solid #FF00FF; 
+ 	padding: 4px;
+ }
+ 
+ fieldset.plain {
+ }

Index: ephr.css
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/styles/ephr.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ephr.css	17 Oct 2006 06:24:59 -0000	1.2
--- ephr.css	4 Nov 2006 19:36:13 -0000	1.3
***************
*** 511,529 ****
  	BORDER-TOP-STYLE: none; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none
  }
! FIELDSET {
! 	PADDING-RIGHT: 0em; PADDING-LEFT: 0em; PADDING-BOTTOM: 1em; MARGIN-LEFT: 20px; BORDER-TOP-STYLE: none; MARGIN-RIGHT: 20px; PADDING-TOP: 1em; BORDER-BOTTOM: #cccccc 1px dotted; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none
! }
! LEGEND {
! 	
! }
! LABEL {
! 	DISPLAY: block; PADDING-BOTTOM: 0.25em; PADDING-TOP: 0.25em
! }
! INPUT {
! 	
! }
! .title {
! 	DISPLAY: block; FLOAT: left; WIDTH: 140px; COLOR: #333333
! }
  .radiobtn {
  	DISPLAY: inline
--- 511,515 ----
  	BORDER-TOP-STYLE: none; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none
  }
! 
  .radiobtn {
  	DISPLAY: inline