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/PatientProgram.hbm.xml

    r4295 r4969  
    1717                        column="guid" length="36" /> 
    1818 
    19         <property 
    20         name="dateEnrolled" 
    21         type="java.util.Date" 
    22         column="date_enrolled" 
    23         not-null="false" 
    24         length="19" 
    25     /> 
    26          
    27     <property 
    28         name="dateCompleted" 
    29         type="java.util.Date" 
    30         column="date_completed" 
    31         not-null="false" 
    32         length="19" 
    33     /> 
    34                  
    35     <property 
    36         name="dateCreated" 
    37         type="java.util.Date" 
    38         column="date_created" 
    39         not-null="true" 
    40         length="19" 
    41     /> 
    42          
     19        <property name="dateEnrolled" type="java.util.Date" column="date_enrolled" not-null="false" length="19" /> 
     20    <property name="dateCompleted" type="java.util.Date" column="date_completed" not-null="false" length="19" /> 
     21    <property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" /> 
    4322        <property name="voided" type="java.lang.Boolean" column="voided" length="1" not-null="true" /> 
    44  
    4523        <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" /> 
    46  
    4724        <property name="voidReason" type="java.lang.String" column="void_reason" length="255" /> 
    48  
    4925        <many-to-one name="voidedBy" class="org.openmrs.User" column="voided_by" /> 
     26        <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" /> 
    5027 
    5128    <!-- Associations --> 
    5229   
    5330    <!-- bi-directional many-to-one association to Program --> 
    54     <many-to-one 
    55         name="program" 
    56         class="org.openmrs.Program" 
    57         not-null="true" 
    58     > 
     31    <many-to-one name="program" class="org.openmrs.Program" not-null="true"> 
    5932        <column name="program_id" /> 
    6033    </many-to-one> 
    6134 
    6235        <!-- bi-directional many-to-one association to Patient --> 
    63     <many-to-one 
    64         name="patient" 
    65         class="org.openmrs.Patient" 
    66         not-null="true" 
    67     > 
     36    <many-to-one name="patient" class="org.openmrs.Patient" not-null="true"> 
    6837        <column name="patient_id" /> 
    6938    </many-to-one> 
    7039                 
    7140    <!-- bi-directional many-to-one association to User --> 
    72     <many-to-one 
    73         name="creator" 
    74         class="org.openmrs.User" 
    75         not-null="true" 
    76     > 
     41    <many-to-one name="creator" class="org.openmrs.User" not-null="true"> 
    7742        <column name="creator" /> 
     43    </many-to-one> 
     44     
     45    <!-- bi-directional many-to-one association to User --> 
     46    <many-to-one name="changedBy" class="org.openmrs.User"> 
     47        <column name="changed_by" /> 
    7848    </many-to-one> 
    7949