Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/17/08 15:20:10 (6 months ago)
Author:
catullus
Message:

sync-bidrectional: partly merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional

    • Property svn:ignore changed from
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      to
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      *.iws
      *.ipr
      *.iml

  • openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/Cohort.hbm.xml

    r4661 r4969  
    1414 
    1515                <property name="name" type="java.lang.String"  
    16                         column="name" not-null="true" length="255" /> 
     16                        not-null="true" length="255" /> 
    1717                <property name="description" type="java.lang.String"  
    18                         column="description" not-null="true" length="1000" /> 
     18                        not-null="true" length="1000" /> 
    1919 
    20                 <set name="memberIds" cascade="none" lazy="false" table="cohort_member"> 
     20                <set name="memberIds" cascade="none" lazy="true" table="cohort_member"> 
    2121                        <key column="cohort_id"/> 
    2222                    <element column="patient_id" type="integer"/> 
    …… 
    2525                <property name="dateCreated" type="java.util.Date" 
    2626                        column="date_created" not-null="true" length="19" /> 
    27                 <property name="voided" type="java.lang.Boolean" column="voided" 
     27                <property name="voided" type="java.lang.Boolean" 
    2828                        length="1" not-null="true" /> 
    2929                <property name="dateVoided" type="java.util.Date" 
    …… 
    3131                <property name="voidReason" type="java.lang.String" 
    3232                        column="void_reason" length="255" /> 
     33                <property name="dateChanged" type="java.util.Date" 
     34                        column="date_changed" length="19" /> 
    3335 
    34                 <!-- bi-directional many-to-one association to User --> 
    35                 <many-to-one name="creator" class="User" not-null="true"> 
    36                         <column name="creator" /> 
    37                 </many-to-one> 
    38                 <!-- bi-directional many-to-one association to User --> 
    39                 <many-to-one name="voidedBy" class="User"> 
    40                         <column name="voided_by" /> 
    41                 </many-to-one> 
     36                <many-to-one name="creator" class="User" not-null="true" /> 
     37                <many-to-one name="voidedBy" class="User" column="voided_by" /> 
     38                <many-to-one name="changedBy" class="User" column="changed_by" /> 
    4239         
    4340        </class>