[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19664: minor fix, turn of lazy for a few PI properties that we always access (using AbstractEnrollmentSe...

revision-diff.txt (2.47 KB)

Morten

Since u are making many minor corrections. Can u pls also remove the 230 character constraint for attribute values in the UI? Db is OK (type text) but ui limit was never removed. I find that I cannot save almost any DE or indicator without truncating the additional def fields added as attributes.

Regards

Calle

···

On 16 Jul 2015 06:57, noreply@launchpad.net wrote:


revno: 19664

committer: Morten Olav Hansen mortenoh@gmail.com

branch nick: dhis2

timestamp: Thu 2015-07-16 11:56:40 +0700

message:

minor fix, turn of lazy for a few PI properties that we always access (using AbstractEnrollmentService.getEnrollment), speeds up most PI queries

modified:

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file ‘dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml’

— dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-06-23 15:59:19 +0000

+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-07-16 04:56:40 +0000

@@ -16,11 +16,9 @@

 <property name="lastUpdated" type="timestamp" />
  • <property name=“dateOfIncident” column=“dateofincident”

  •  not-null="true" />
    
  • <property name=“enrollmentDate” column=“enrollmentdate”

  •  not-null="true" />
    

@@ -30,10 +28,10 @@

 <many-to-one name="entityInstance"

   class="org.hisp.dhis.trackedentity.TrackedEntityInstance" column="trackedentityinstanceid"
  •  foreign-key="fk_programinstance_trackedentityinstanceid" />
    
  •  foreign-key="fk_programinstance_trackedentityinstanceid" lazy="false" />
    

    <many-to-one name=“program” class=“org.hisp.dhis.program.Program”

  •  column="programid" not-null="true" foreign-key="fk_programinstance_programid" />
    
  •  column="programid" not-null="true" foreign-key="fk_programinstance_programid" lazy="false" />
    
     <key column="programinstanceid" />
    

@@ -54,14 +52,14 @@

     column="messageconversationid" />

 </list>
  • <many-to-one name=“organisationUnit” class=“org.hisp.dhis.organisationunit.OrganisationUnit” column=“organisationunitid”

  •  foreign-key="fk_programinstance_organisationunitid" not-null="false" />
    
  •  foreign-key="fk_programinstance_organisationunitid" not-null="false" lazy="false" />
    

Done

···

On Thu, Jul 16, 2015 at 12:13 PM, Calle Hedberg calle.hedberg@gmail.com wrote:

Morten

Since u are making many minor corrections. Can u pls also remove the 230 character constraint for attribute values in the UI? Db is OK (type text) but ui limit was never removed. I find that I cannot save almost any DE or indicator without truncating the additional def fields added as attributes.

Regards

Calle

On 16 Jul 2015 06:57, noreply@launchpad.net wrote:


revno: 19664

committer: Morten Olav Hansen mortenoh@gmail.com

branch nick: dhis2

timestamp: Thu 2015-07-16 11:56:40 +0700

message:

minor fix, turn of lazy for a few PI properties that we always access (using AbstractEnrollmentService.getEnrollment), speeds up most PI queries

modified:

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file ‘dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml’

— dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-06-23 15:59:19 +0000

+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-07-16 04:56:40 +0000

@@ -16,11 +16,9 @@

 <property name="lastUpdated" type="timestamp" />
  • <property name=“dateOfIncident” column=“dateofincident”

  •  not-null="true" />
    
  • <property name=“enrollmentDate” column=“enrollmentdate”

  •  not-null="true" />
    

@@ -30,10 +28,10 @@

 <many-to-one name="entityInstance"

   class="org.hisp.dhis.trackedentity.TrackedEntityInstance" column="trackedentityinstanceid"
  •  foreign-key="fk_programinstance_trackedentityinstanceid" />
    
  •  foreign-key="fk_programinstance_trackedentityinstanceid" lazy="false" />
    

    <many-to-one name=“program” class=“org.hisp.dhis.program.Program”

  •  column="programid" not-null="true" foreign-key="fk_programinstance_programid" />
    
  •  column="programid" not-null="true" foreign-key="fk_programinstance_programid" lazy="false" />
    
     <key column="programinstanceid" />
    

@@ -54,14 +52,14 @@

     column="messageconversationid" />

 </list>
  • <many-to-one name=“organisationUnit” class=“org.hisp.dhis.organisationunit.OrganisationUnit” column=“organisationunitid”

  •  foreign-key="fk_programinstance_organisationunitid" not-null="false" />
    
  •  foreign-key="fk_programinstance_organisationunitid" not-null="false" lazy="false" />