dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17385
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6896: (patient) Remove searching-key and hidden status in favorite.
------------------------------------------------------------
revno: 6896
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-10 08:21:56 +0700
message:
(patient) Remove searching-key and hidden status in favorite.
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAttributeAssociation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientDataElementAssociation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientFixedAttribueAssociation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientIdentifierTypeAssociation.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAttribueAssociation.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientDataElementAssociation.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientFixedAttribueAssociation.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientIdentifierTypeAssociation.hbm.xml
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReport.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm
--
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
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAttributeAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAttributeAssociation.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAttributeAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patientreport;
-
-import org.hisp.dhis.patient.PatientAttribute;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $PatientAttribueAssociation.java May 7, 2012 1:47:15 PM$
- */
-public class PatientAttributeAssociation
-{
- private Integer id;
-
- private PatientTabularReport patientTabularReport;
-
- private PatientAttribute patientAttribute;
-
- private String key;
-
- private boolean hidden;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public PatientAttributeAssociation()
- {
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public PatientTabularReport getPatientTabularReport()
- {
- return patientTabularReport;
- }
-
- public void setPatientTabularReport( PatientTabularReport patientTabularReport )
- {
- this.patientTabularReport = patientTabularReport;
- }
-
- public PatientAttribute getPatientAttribute()
- {
- return patientAttribute;
- }
-
- public void setPatientAttribute( PatientAttribute patientAttribute )
- {
- this.patientAttribute = patientAttribute;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- public boolean isHidden()
- {
- return hidden;
- }
-
- public void setHidden( boolean hidden )
- {
- this.hidden = hidden;
- }
-
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientDataElementAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientDataElementAssociation.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientDataElementAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patientreport;
-
-import org.hisp.dhis.dataelement.DataElement;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $PatientDataElementAssociation.java May 7, 2012 1:47:16 PM$
- */
-public class PatientDataElementAssociation
-{
- private Integer id;
-
- private PatientTabularReport patientTabularReport;
-
- private DataElement dataElement;
-
- private String key;
-
- private boolean hidden;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public PatientDataElementAssociation()
- {
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public PatientTabularReport getPatientTabularReport()
- {
- return patientTabularReport;
- }
-
- public void setPatientTabularReport( PatientTabularReport patientTabularReport )
- {
- this.patientTabularReport = patientTabularReport;
- }
-
- public DataElement getDataElement()
- {
- return dataElement;
- }
-
- public void setDataElement( DataElement dataElement )
- {
- this.dataElement = dataElement;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- public boolean isHidden()
- {
- return hidden;
- }
-
- public void setHidden( boolean hidden )
- {
- this.hidden = hidden;
- }
-
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientFixedAttribueAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientFixedAttribueAssociation.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientFixedAttribueAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patientreport;
-
-
-/**
- * @author Chau Thu Tran
- *
- * @version $PatientFixedAttribueAssociation.java May 7, 2012 1:47:15 PM$
- */
-public class PatientFixedAttribueAssociation
-{
- private Integer id;
-
- private PatientTabularReport patientTabularReport;
-
- private String attributeName;
-
- private String key;
-
- private boolean hidden;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public PatientFixedAttribueAssociation()
- {
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public PatientTabularReport getPatientTabularReport()
- {
- return patientTabularReport;
- }
-
- public void setPatientTabularReport( PatientTabularReport patientTabularReport )
- {
- this.patientTabularReport = patientTabularReport;
- }
-
- public String getAttributeName()
- {
- return attributeName;
- }
-
- public void setAttributeName( String attributeName )
- {
- this.attributeName = attributeName;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- public boolean isHidden()
- {
- return hidden;
- }
-
- public void setHidden( boolean hidden )
- {
- this.hidden = hidden;
- }
-
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientIdentifierTypeAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientIdentifierTypeAssociation.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientIdentifierTypeAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patientreport;
-
-import org.hisp.dhis.patient.PatientIdentifierType;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $PatientIdentifierTypeAssociation.java May 7, 2012 1:47:17 PM$
- */
-public class PatientIdentifierTypeAssociation
-{
- private Integer id;
-
- private PatientTabularReport patientTabularReport;
-
- private PatientIdentifierType patientIdentifierType;
-
- private String key;
-
- private boolean hidden;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public PatientIdentifierTypeAssociation()
- {
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public PatientTabularReport getPatientTabularReport()
- {
- return patientTabularReport;
- }
-
- public void setPatientTabularReport( PatientTabularReport patientTabularReport )
- {
- this.patientTabularReport = patientTabularReport;
- }
-
- public PatientIdentifierType getPatientIdentifierType()
- {
- return patientIdentifierType;
- }
-
- public void setPatientIdentifierType( PatientIdentifierType patientIdentifierType )
- {
- this.patientIdentifierType = patientIdentifierType;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- public boolean isHidden()
- {
- return hidden;
- }
-
- public void setHidden( boolean hidden )
- {
- this.hidden = hidden;
- }
-
-}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReport.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReport.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReport.java 2012-05-10 01:21:56 +0000
@@ -32,7 +32,10 @@
import java.util.List;
import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.patient.PatientIdentifierType;
import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.user.User;
@@ -63,13 +66,13 @@
private ProgramStage programStage;
- private List<PatientIdentifierTypeAssociation> identifiers = new ArrayList<PatientIdentifierTypeAssociation>();
-
- private List<PatientAttributeAssociation> attributes = new ArrayList<PatientAttributeAssociation>();
-
- private List<PatientFixedAttribueAssociation> fixedAttributes = new ArrayList<PatientFixedAttribueAssociation>();
-
- private List<PatientDataElementAssociation> dataElements = new ArrayList<PatientDataElementAssociation>();
+ private List<PatientIdentifierType> identifiers = new ArrayList<PatientIdentifierType>();
+
+ private List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
+
+ private List<String> fixedAttributes = new ArrayList<String>();
+
+ private List<DataElement> dataElements = new ArrayList<DataElement>();
private OrganisationUnit organisationUnit;
@@ -128,56 +131,56 @@
this.programStage = programStage;
}
- public List<PatientIdentifierTypeAssociation> getIdentifiers()
+ public OrganisationUnit getOrganisationUnit()
+ {
+ return organisationUnit;
+ }
+
+ public void setOrganisationUnit( OrganisationUnit organisationUnit )
+ {
+ this.organisationUnit = organisationUnit;
+ }
+
+ public List<PatientIdentifierType> getIdentifiers()
{
return identifiers;
}
- public void setIdentifiers( List<PatientIdentifierTypeAssociation> identifiers )
+ public void setIdentifiers( List<PatientIdentifierType> identifiers )
{
this.identifiers = identifiers;
}
- public List<PatientAttributeAssociation> getAttributes()
+ public List<PatientAttribute> getAttributes()
{
return attributes;
}
- public void setAttributes( List<PatientAttributeAssociation> attributes )
+ public void setAttributes( List<PatientAttribute> attributes )
{
this.attributes = attributes;
}
- public List<PatientFixedAttribueAssociation> getFixedAttributes()
+ public List<String> getFixedAttributes()
{
return fixedAttributes;
}
- public void setFixedAttributes( List<PatientFixedAttribueAssociation> fixedAttributes )
+ public void setFixedAttributes( List<String> fixedAttributes )
{
this.fixedAttributes = fixedAttributes;
}
- public List<PatientDataElementAssociation> getDataElements()
+ public List<DataElement> getDataElements()
{
return dataElements;
}
- public void setDataElements( List<PatientDataElementAssociation> dataElements )
+ public void setDataElements( List<DataElement> dataElements )
{
this.dataElements = dataElements;
}
- public OrganisationUnit getOrganisationUnit()
- {
- return organisationUnit;
- }
-
- public void setOrganisationUnit( OrganisationUnit organisationUnit )
- {
- this.organisationUnit = organisationUnit;
- }
-
public int getLevel()
{
return level;
=== removed file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAttribueAssociation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAttribueAssociation.hbm.xml 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAttribueAssociation.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.patientreport.PatientAttributeAssociation"
- table="patientattribueassociation">
-
- <id name="id" column="patientattribueassociationid">
- <generator class="native" />
- </id>
-
- <many-to-one name="patientTabularReport" class="org.hisp.dhis.patientreport.PatientTabularReport"
- column="patienttabularreportid" foreign-key="fk_patientattribueassociation_patienttabularreportid" />
-
- <many-to-one name="patientAttribute" class="org.hisp.dhis.patient.PatientAttribute"
- column="patientattributeid" foreign-key="fk_patientattribueassociation_patientattributeid" />
-
- <property name="key" />
-
- <property name="hidden" />
-
- </class>
-</hibernate-mapping>
=== removed file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientDataElementAssociation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientDataElementAssociation.hbm.xml 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientDataElementAssociation.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.patientreport.PatientDataElementAssociation"
- table="patientdataelementassociation">
-
- <id name="id" column="patientdataelementassociationid">
- <generator class="native" />
- </id>
-
- <many-to-one name="patientTabularReport" class="org.hisp.dhis.patientreport.PatientTabularReport"
- column="patienttabularreportid" foreign-key="fk_patientattribueassociation_patienttabularreportid" />
-
- <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_patientattribueassociation_dataelementid" />
-
- <property name="key" />
-
- <property name="hidden" />
-
- </class>
-</hibernate-mapping>
=== removed file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientFixedAttribueAssociation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientFixedAttribueAssociation.hbm.xml 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientFixedAttribueAssociation.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.patientreport.PatientFixedAttribueAssociation"
- table="patientfixedattribueassociation">
-
- <id name="id" column="patientfixedattribueassociationid">
- <generator class="native" />
- </id>
-
- <many-to-one name="patientTabularReport" class="org.hisp.dhis.patientreport.PatientTabularReport"
- column="patienttabularreportid" foreign-key="fk_patientattribueassociation_patienttabularreportid" />
-
- <property name="attributeName" />
-
- <property name="key" />
-
- <property name="hidden" />
-
- </class>
-</hibernate-mapping>
=== removed file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientIdentifierTypeAssociation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientIdentifierTypeAssociation.hbm.xml 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientIdentifierTypeAssociation.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.patientreport.PatientIdentifierTypeAssociation"
- table="patientidentifiertypeAssociation">
-
- <id name="id" column="patientidentifiertypeAssociationid">
- <generator class="native" />
- </id>
-
- <many-to-one name="patientTabularReport" class="org.hisp.dhis.patientreport.PatientTabularReport"
- column="patienttabularreportid" foreign-key="fk_patientattribueassociation_patienttabularreportid" />
-
- <many-to-one name="patientIdentifierType" class="org.hisp.dhis.patient.PatientIdentifierType"
- column="patientidentifierTypeid" foreign-key="fk_patientattribueassociation_patientidentifieriypeid" />
-
- <property name="key" />
-
- <property name="hidden" />
-
- </class>
-</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml 2012-05-10 01:21:56 +0000
@@ -21,31 +21,36 @@
<many-to-one name="programStage" class="org.hisp.dhis.program.ProgramStage"
column="programstageid" foreign-key="fk_patienttabularreport_programstageid" />
-
- <list name="attributes" cascade="all" >
- <key column="patienttabularreportid"/>
- <list-index column="sort_order" base="0" />
- <one-to-many class="org.hisp.dhis.patientreport.PatientAttributeAssociation"/>
- </list>
-
- <list name="fixedAttributes" cascade="all" >
- <key column="patienttabularreportid"/>
- <list-index column="sort_order" base="0" />
- <one-to-many class="org.hisp.dhis.patientreport.PatientFixedAttribueAssociation"/>
- </list>
-
- <list name="identifiers" cascade="all" >
- <key column="patienttabularreportid"/>
- <list-index column="sort_order" base="0" />
- <one-to-many class="org.hisp.dhis.patientreport.PatientIdentifierTypeAssociation"/>
- </list>
-
- <list name="dataElements" cascade="all" >
- <key column="patienttabularreportid"/>
- <list-index column="sort_order" base="0" />
- <one-to-many class="org.hisp.dhis.patientreport.PatientDataElementAssociation"/>
- </list>
-
+
+ <list name="identifiers" cascade="all"
+ table="patienttabularreport_identifiers">
+ <key column="patienttabularreportid" />
+ <list-index column="sort_order" base="0" />
+ <many-to-many class="org.hisp.dhis.patient.PatientIdentifierType"
+ column="patientidentifiertypeid" foreign-key="patienttabularreport_indentifierid" />
+ </list>
+
+ <list name="attributes" cascade="all" table="patienttabularreport_attributes">
+ <key column="patienttabularreportid" />
+ <list-index column="sort_order" base="0" />
+ <many-to-many class="org.hisp.dhis.patient.PatientAttribute"
+ column="patientattributeid" foreign-key="patienttabularreport_attributeid" />
+ </list>
+
+ <list name="fixedAttributes" table="patienttabularreport_fixedattribute">
+ <key column="patienttabularreportid" foreign-key="patienttabularreport_fixedAttribute" />
+ <list-index column="sort_order" />
+ <element type="text" column="fixedAttribute" />
+ </list>
+
+ <list name="dataElements" cascade="all"
+ table="patienttabularreport_dataelements">
+ <key column="patienttabularreportid" />
+ <list-index column="sort_order" base="0" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement"
+ foreign-key="patienttabularreport_dataelementid" />
+ </list>
+
<many-to-one name="organisationUnit"
class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid"
foreign-key="fk_patient_organisationunitid" />
@@ -55,9 +60,9 @@
<property name="sortedOrgunitAsc" />
<property name="facilityLB" />
-
+
<many-to-one name="user" class="org.hisp.dhis.user.User"
column="userid" foreign-key="fk_patienttabularreport_userid" />
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java 2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java 2012-05-10 01:21:56 +0000
@@ -43,10 +43,6 @@
import org.hisp.dhis.patient.PatientAttributeService;
import org.hisp.dhis.patient.PatientIdentifierType;
import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.patientreport.PatientAttributeAssociation;
-import org.hisp.dhis.patientreport.PatientDataElementAssociation;
-import org.hisp.dhis.patientreport.PatientFixedAttribueAssociation;
-import org.hisp.dhis.patientreport.PatientIdentifierTypeAssociation;
import org.hisp.dhis.patientreport.PatientTabularReport;
import org.hisp.dhis.patientreport.PatientTabularReportService;
import org.hisp.dhis.program.ProgramStage;
@@ -211,7 +207,7 @@
{
OrganisationUnit orgunit = organisationUnitService.getOrganisationUnit( orgunitId );
ProgramStage programStage = programStageService.getProgramStage( programStageId );
-
+
// ---------------------------------------------------------------------
// Get fixed-attributes
// ---------------------------------------------------------------------
@@ -227,30 +223,15 @@
tabularReport.setUser( currentUserService.getCurrentUser() );
// ---------------------------------------------------------------------
- // Get fixed-attributes
- // ---------------------------------------------------------------------
-
- List<PatientFixedAttribueAssociation> fixedAttrAssociations = new ArrayList<PatientFixedAttribueAssociation>();
-
- for ( String fixedAttribute : fixedAttributes )
- {
- PatientFixedAttribueAssociation association = new PatientFixedAttribueAssociation();
- association.setAttributeName( fixedAttribute );
- association.setPatientTabularReport( tabularReport );
- fixedAttrAssociations.add( association );
- }
-
- // ---------------------------------------------------------------------
// Get searching-keys
// ---------------------------------------------------------------------
- List<PatientIdentifierTypeAssociation> identifiers = new ArrayList<PatientIdentifierTypeAssociation>();
-
- List<PatientAttributeAssociation> attributes = new ArrayList<PatientAttributeAssociation>();
-
- List<PatientDataElementAssociation> dataElements = new ArrayList<PatientDataElementAssociation>();
-
- int index = 0;
+ List<PatientIdentifierType> identifiers = new ArrayList<PatientIdentifierType>();
+
+ List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
+
+ List<DataElement> dataElements = new ArrayList<DataElement>();
+
for ( String searchingValue : searchingValues )
{
String[] infor = searchingValue.split( "_" );
@@ -259,75 +240,21 @@
if ( objectType.equals( PREFIX_IDENTIFIER_TYPE ) )
{
- PatientIdentifierTypeAssociation association = new PatientIdentifierTypeAssociation();
- PatientIdentifierType identifierType = identifierTypeService.getPatientIdentifierType( objectId );
-
- association.setPatientIdentifierType( identifierType );
- association.setPatientTabularReport( tabularReport );
- association.setHidden( Boolean.parseBoolean( infor[2] ) );
-
- if ( infor.length == 4 )
- {
- association.setKey( infor[3].trim() );
- }
-
- identifiers.add( association );
-
- index++;
+ identifiers.add( identifierTypeService.getPatientIdentifierType( objectId ) );
}
else if ( objectType.equals( PREFIX_PATIENT_ATTRIBUTE ) )
{
- PatientAttributeAssociation association = new PatientAttributeAssociation();
- PatientAttribute attribute = patientAttributeService.getPatientAttribute( objectId );
-
- association.setPatientAttribute( attribute );
- association.setPatientTabularReport( tabularReport );
- association.setHidden( Boolean.parseBoolean( infor[2] ) );
-
- if ( infor.length == 4 )
- {
- association.setKey( infor[3].trim() );
- }
-
- attributes.add( association );
-
- index++;
+ attributes.add( patientAttributeService.getPatientAttribute( objectId ) );
}
else if ( objectType.equals( PREFIX_DATA_ELEMENT ) )
{
- PatientDataElementAssociation association = new PatientDataElementAssociation();
DataElement dataElement = dataElementService.getDataElement( objectId );
-
- association.setDataElement( dataElement );
- association.setPatientTabularReport( tabularReport );
- association.setHidden( Boolean.parseBoolean( infor[2] ) );
-
- if ( infor.length == 4 )
- {
- association.setKey( infor[3].trim() );
- }
-
- dataElements.add( association );
-
- index++;
+ dataElements.add( dataElement );
}
}
- if ( fixedAttrAssociations.size() > 0 )
- {
- tabularReport.setFixedAttributes( fixedAttrAssociations );
- }
- else if ( identifiers.size() > 0 )
- {
- tabularReport.setIdentifiers( identifiers );
- }
- else if ( attributes.size() > 0 )
- {
- tabularReport.setAttributes( attributes );
- }
-
- tabularReport.setFixedAttributes( fixedAttrAssociations );
+ tabularReport.setFixedAttributes( fixedAttributes );
tabularReport.setIdentifiers( identifiers );
tabularReport.setAttributes( attributes );
tabularReport.setDataElements( dataElements );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-05-09 09:50:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-05-10 01:21:56 +0000
@@ -564,7 +564,7 @@
Ext.Array.each(fixedAttributes, function(item) {
for (var i = 0; i < f.fixedAttributes.length; i++) {
var flag = false;
- if( item.paramName == f.fixedAttributes[i].name )
+ if( item.paramName == f.fixedAttributes[i] )
{
item.setValue( true );
flag = true;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-05-02 08:49:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-05-10 01:21:56 +0000
@@ -69,4 +69,5 @@
save_favorite:'$encoder.jsEscape($i18n.getString( 'save_favorite' ) , "'")',
overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
et_no_programs: '$encoder.jsEscape($i18n.getString( 'et_no_programs' ) , "'")',
+favorites:'$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")'
};
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2012-05-02 08:15:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2012-05-10 01:21:56 +0000
@@ -1,97 +1,56 @@
{
-#if( $grid.getRows().size() > 0)
- #set( $noHeader = $grid.getHeaders().size() )
- #set ( $metaData = $noHeader - $valueTypes.size())
- 'total': "$total",
- 'valueTypes':[
- #foreach( $col in $grid.getHeaders() )
- #if ($velocityCount <= $metaData + 1)
- {
- "valueType": "textfield",
- "suggestedValues": []
- },
- #end
- #end
-
- #set($index = 0)
- #foreach( $valueType in $valueTypes )
- {
- "valueType":
- #if( $valueType == 'number' || $valueType == 'NUMBER' )
- "textfield"
- #elseif( $valueType == 'bool' || $valueType == 'YES/NO' || $valueType =='optionSet' )
- "combobox"
- #elseif( $valueType == 'date' || $valueType == 'DATE' )
- "textfield"
- #else
- "textfield"
- #end,
- #set( $suggestedValues = $mapSuggestedValues.get($index) )
- "suggestedValues":[
- #foreach( $suggestedValue in $suggestedValues )
- ["$!encoder.jsonEncode( ${suggestedValue} )"]
- #if( $velocityCount < $suggestedValues.size() ),#end
- #end
-
- ]
- }
- #if( $velocityCount < $valueTypes.size() ),#end
- #set( $index = $index + 1 )
- #end
- ],
- 'columns':[
- "id",
- #foreach( $colName in $grid.getHeaders() )
- "$colName.name"
- #if( $velocityCount < $noHeader ),#end
- #end
- ],
- 'fields':[
- "id",
- #foreach( $col in $grid.getHeaders() )
- "col$velocityCount"
- #if( $velocityCount < $noHeader ),#end
- #end
- ],
- 'hidden':[
- #foreach( $col in $grid.getHeaders() )
- "$col.hidden"
- #if( $velocityCount < $noHeader ),#end
- #end
- ],
- 'items':[
- {
- "id":"$i18n.getString( 'filter' )",
- #foreach( $col in $grid.getHeaders() )
- #if ($velocityCount <= $metaData )
- "col$velocityCount": "",
- #end
- #end
-
- #set( $index = $metaData + 1 )
- #foreach( $value in $values )
- "col$index": "$value"
- #if( $velocityCount < $values.size() ),#end
- #set( $index = $index + 1 )
- #end
- },
- #foreach( $row in $grid.getRows() )
- {
- #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
- "id":$nr,
- #foreach( $col in $row )
- "col$velocityCount": "$!encoder.htmlEncode( $col )"
- #if( $velocityCount < $noHeader ),#end
- #end
- },
- #end
- ]
-#else
- 'total': 0,
- 'valueTypes':[],
- 'columns':[],
- 'fields':[],
- 'hidden':[],
- 'items':[]
-#end
+ "id": "${tabularReport.id}",
+ "name": "$!encoder.jsonEncode( ${tabularReport.name} )",
+ "lastUpdated": "$!format.formatDate( ${tabularReport.lastUpdated} )",
+ "programId": "${tabularReport.programStage.program.id}",
+ "anonymous": "${tabularReport.programStage.program.anonymous}",
+ "programStageId": "${tabularReport.programStage.id}",
+ "programStageName": "${tabularReport.programStage.name}",
+ "startDate": "$!format.formatDate( $tabularReport.startDate )",
+ "endDate": "$!format.formatDate( ${tabularReport.endDate} )",
+ "organisationUnitId": "${tabularReport.organisationUnit.id}",
+ "level": "${tabularReport.level}",
+ "sortedOrgunitAsc": "${tabularReport.sortedOrgunitAsc}",
+ "facilityLB": "${tabularReport.facilityLB}",
+ "identifiers": [
+ #set( $size = ${tabularReport.identifiers.size()} )
+ #set( $identifiers = ${tabularReport.identifiers} )
+ #foreach( ${identifier} in $!{identifiers} )
+ {
+ "id": "${identifier.id}",
+ "name": "${identifier.name}"
+ }
+ #if( $velocityCount < $size ),#end
+ #end
+ ],
+ "attributes": [
+ #set( $size = ${tabularReport.attributes.size()} )
+ #set( $attributes = ${tabularReport.attributes} )
+ #foreach( ${attribute} in $!{attributes} )
+ {
+ "id": "${attribute.id}",
+ "name": "${attribute.name}"
+ }
+ #if( $velocityCount < $size ),#end
+ #end
+ ],
+ "fixedAttributes": [
+ #set( $size = ${tabularReport.fixedAttributes.size()} )
+ #set( $fixedAttributes = ${tabularReport.fixedAttributes} )
+ #foreach( ${fixedAttribute} in $!{fixedAttributes} )
+ "${fixedAttribute}"
+ #if( $velocityCount < $size ),#end
+ #end
+ ],
+ "dataelements": [
+ #set( $size = ${tabularReport.dataElements.size()} )
+ #set( $dataElements = ${tabularReport.dataElements} )
+ #foreach( ${dataElement} in $!{dataElements} )
+ {
+ "id": "${dataElement.id}",
+ "name": "${dataElement.name}"
+ }
+ #if( $velocityCount < $size ),#end
+ #end
+ ]
}
\ No newline at end of file
