dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10084
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2754: Removed custom values (in fact it is predefined values) in data set / data entry form. Did not wo...
------------------------------------------------------------
revno: 2754
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-25 23:15:46 +0100
message:
Removed custom values (in fact it is predefined values) in data set / data entry form. Did not work properly and code is beyond repair.
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetCustomValuesAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_PT.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCustomValue.vm
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.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 directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValue.java 2009-09-27 22:30:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValue.java 1970-01-01 00:00:00 +0000
@@ -1,216 +0,0 @@
-package org.hisp.dhis.customvalue;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.io.Serializable;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-public class CustomValue
- implements Serializable
-{
- /**
- * The unique identifier for this CustomValue
- */
- private int id;
-
- /**
- * Dataset object value to be assigned to
- */
- private DataSet dataSet;
-
- /**
- * DataElement object value to be assigned to
- */
- private DataElement dataElement;
-
- /**
- * DataElementCategoryOptionCombo object value to be assigned to
- */
- private DataElementCategoryOptionCombo optionCombo;
-
- /**
- * Custom value
- */
- private String customValue;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public CustomValue()
- {
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public int getId()
- {
- return id;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- public DataSet getDataSet()
- {
- return dataSet;
- }
-
- public void setDataSet( DataSet dataSet )
- {
- this.dataSet = dataSet;
- }
-
- public DataElement getDataElement()
- {
- return dataElement;
- }
-
- public void setDataElement( DataElement dataElement )
- {
- this.dataElement = dataElement;
- }
-
- public DataElementCategoryOptionCombo getOptionCombo()
- {
- return optionCombo;
- }
-
- public void setOptionCombo( DataElementCategoryOptionCombo optionCombo )
- {
- this.optionCombo = optionCombo;
- }
-
- public String getCustomValue()
- {
- return customValue;
- }
-
- public void setCustomValue( String customValue )
- {
- this.customValue = customValue;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
-
- int result = 1;
-
- result = prime * result + ( ( customValue == null) ? 0 : customValue.hashCode() );
- result = prime * result + ( ( dataElement == null) ? 0 : dataElement.hashCode() );
- result = prime * result + ( ( dataSet == null) ? 0 : dataSet.hashCode() );
- result = prime * result + ( ( optionCombo == null) ? 0 : optionCombo.hashCode() );
-
- return result;
- }
-
- @Override
- public boolean equals( Object object )
- {
- if ( this == object )
- {
- return true;
- }
-
- if ( object == null )
- {
- return false;
- }
-
- if ( getClass() != object.getClass() )
- {
- return false;
- }
-
- final CustomValue other = (CustomValue) object;
-
- if ( customValue == null )
- {
- if ( other.customValue != null )
- {
- return false;
- }
- }
- else if ( !customValue.equals( other.customValue ) )
- {
- return false;
- }
-
- if ( dataElement == null )
- {
- if ( other.dataElement != null )
- {
- return false;
- }
- }
- else if ( !dataElement.equals( other.dataElement ) )
- {
- return false;
- }
-
- if ( dataSet == null )
- {
- if ( other.dataSet != null )
- {
- return false;
- }
- }
- else if ( !dataSet.equals( other.dataSet ) )
- {
- return false;
- }
-
- if ( optionCombo == null )
- {
- if ( other.optionCombo != null )
- {
- return false;
- }
- }
- else if ( !optionCombo.equals( other.optionCombo ) )
- {
- return false;
- }
-
- return true;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueService.java 2009-06-19 14:50:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueService.java 1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-package org.hisp.dhis.customvalue;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-public interface CustomValueService
-{
- String ID = CustomValue.class.getName();
-
- /**
- *
- * @param customValue
- * @return The generated unique identifier for this CustomValue.
- */
- int addCustomValue( CustomValue customValue );
-
- /**
- * Deletes a CustomValue.
- *
- * @param customValue. The CustomValue to delete.
- */
- void deleteCustomValue( CustomValue customValue );
-
- /**
- * Get all CustomValues by DataSet.
- *
- * @return A collection containing all CustomValues within given dataset.
- */
- Collection<CustomValue> getCustomValuesByDataSet( DataSet dataSet );
-
- /**
- * Get all CustomValues by DataElement.
- *
- * @return A collection containing all CustomValues within given dataelement.
- */
- Collection<CustomValue> getCustomValuesByDataElement( DataElement dataElement );
-
- /**
- * Get all CustomValues by DataElementCategoryCombo.
- *
- * @return A collection containing all CustomValues within given categorycombo.
- */
- Collection<CustomValue> getCustomValuesByCategoryCombo( DataElementCategoryCombo categoryCombo );
-
- /**
- * Get all CustomValues by DataSet, DataElement, DataElementCategoryCombo.
- *
- * @return A collection containing all CustomValues in a given criteria.
- */
- Collection<CustomValue> getCustomValues( DataSet dataSet, DataElement dataElement,
- DataElementCategoryOptionCombo dataElementCategoryOptionCombo );
-
- /**
- * Get CustomValue by Id.
- *
- * @return CustomValue object.
- */
- CustomValue getCustomValue( int id );
-
- /**
- * Get CustomValue by value.
- *
- * @return A collection containing found CustomValues.
- */
- Collection<CustomValue> findCustomValues( String searchValue );
-
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueStore.java 2009-07-05 20:32:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/customvalue/CustomValueStore.java 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.customvalue;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.common.GenericStore;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-public interface CustomValueStore
- extends GenericStore<CustomValue>
-{
- String ID = CustomValue.class.getName();
-
- /**
- * Get all CustomValues by DataSet.
- *
- * @return A collection containing all CustomValues.
- */
- Collection<CustomValue> getByDataSet( DataSet dataSet );
-
- /**
- * Get all CustomValues by DataElement.
- *
- * @return A collection containing all CustomValues.
- */
- Collection<CustomValue> getByDataElement( DataElement dataElement );
-
- /**
- * Get all CustomValues by DataElementCategoryCombo.
- *
- * @return A collection containing all CustomValues.
- */
- Collection<CustomValue> getByCategoryCombo( DataElementCategoryCombo categoryCombo );
-
- /**
- * Get all CustomValues by DataSet, DataElement, DataElementCategoryCombo.
- *
- * @return A collection containing all CustomValues.
- */
- Collection<CustomValue> get( DataSet dataSet, DataElement dataElement,
- DataElementCategoryOptionCombo dataElementCategoryOptionCombo );
-
- /**
- * Get CustomValue by value.
- *
- * @return A collection containing found CustomValues.
- */
- Collection<CustomValue> find( String searchValue );
-
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java 2010-06-03 10:32:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-package org.hisp.dhis.customvalue;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-@Transactional
-public class DefaultCustomValueService
- implements CustomValueService
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CustomValueStore customValueStore;
-
- public void setCustomValueStore( CustomValueStore customValueStore )
- {
- this.customValueStore = customValueStore;
- }
-
- // -------------------------------------------------------------------------
- // CustomValueService implementation
- // -------------------------------------------------------------------------
-
- public int addCustomValue( CustomValue customValue )
- {
- return customValueStore.save( customValue );
- }
-
- public void deleteCustomValue( CustomValue customValue )
- {
- customValueStore.delete( customValue );
- }
-
- public Collection<CustomValue> getCustomValues( DataSet dataSet )
- {
- return customValueStore.getByDataSet( dataSet );
- }
-
- public Collection<CustomValue> getCustomValuesByCategoryCombo( DataElementCategoryCombo categoryCombo )
- {
- return customValueStore.getByCategoryCombo( categoryCombo );
- }
-
- public Collection<CustomValue> getCustomValuesByDataElement( DataElement dataElement )
- {
- return customValueStore.getByDataElement( dataElement );
- }
-
- public Collection<CustomValue> getCustomValuesByDataSet( DataSet dataSet )
- {
- return customValueStore.getByDataSet( dataSet );
- }
-
- public CustomValue getCustomValue( int id )
- {
- return customValueStore.get( id );
- }
-
- public Collection<CustomValue> getCustomValues( DataSet dataSet, DataElement dataElement,
- DataElementCategoryOptionCombo dataElementCategoryOptionCombo )
- {
- return customValueStore.get( dataSet, dataElement, dataElementCategoryOptionCombo );
- }
-
- public Collection<CustomValue> findCustomValues( String searchValue )
- {
- return customValueStore.find( searchValue );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java 2009-07-05 20:32:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java 1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-package org.hisp.dhis.customvalue.hibernate;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.util.Collection;
-
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Restrictions;
-import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueStore;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.hibernate.HibernateGenericStore;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-public class HibernateCustomValueStore
- extends HibernateGenericStore<CustomValue> implements CustomValueStore
-{
- // -------------------------------------------------------------------------
- // CustomValueStore implementation
- // -------------------------------------------------------------------------
-
- @SuppressWarnings( "unchecked" )
- public Collection<CustomValue> getByDataSet( DataSet dataSet )
- {
- return getCriteria( Restrictions.eq( "dataSet", dataSet ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<CustomValue> getByCategoryCombo( DataElementCategoryCombo categoryCombo )
- {
- return getCriteria( Restrictions.eq( "optionCombo", categoryCombo ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<CustomValue> getByDataElement( DataElement dataElement )
- {
- return getCriteria( Restrictions.eq( "dataElement", dataElement ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<CustomValue> get( DataSet dataSet, DataElement dataElement,
- DataElementCategoryOptionCombo dataElementCategoryOptionCombo )
- {
- return getCriteria(
- Restrictions.eq( "dataSet", dataSet ),
- Restrictions.eq( "dataElement", dataElement ),
- Restrictions.eq( "optionCombo", dataElementCategoryOptionCombo ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<CustomValue> find( String searchValue )
- {
- return getCriteria( Restrictions.like( "customValue", searchValue, MatchMode.ANYWHERE ) ).list();
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-01-21 16:22:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-01-25 22:15:46 +0000
@@ -83,6 +83,7 @@
executeSql( "DROP TABLE sectionmembers" );
executeSql( "DROP TABLE reporttable_categoryoptioncombos" );
executeSql( "DROP TABLE dashboardcontent_datamartexports" );
+ executeSql( "DROP TABLE customvalue" );
executeSql( "ALTER TABLE dataelementcategoryoption drop column categoryid" );
executeSql( "ALTER TABLE reporttable DROP column dimensiontype" );
executeSql( "ALTER TABLE categoryoptioncombo DROP COLUMN displayorder" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-01-20 06:23:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-01-25 22:15:46 +0000
@@ -18,12 +18,6 @@
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
- <bean id="org.hisp.dhis.customvalue.CustomValueStore"
- class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
- <property name="clazz" value="org.hisp.dhis.customvalue.CustomValue" />
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
<bean id="org.hisp.dhis.dataelement.DataElementStore"
class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
<property name="clazz" value="org.hisp.dhis.dataelement.DataElement"/>
@@ -216,7 +210,6 @@
<property name="sessionFactory" ref="sessionFactory" />
</bean>
-
<!-- Service definitions -->
<bean id="org.hisp.dhis.dataelement.DataElementOperandService"
@@ -225,10 +218,6 @@
ref="org.hisp.dhis.dataelement.DataElementOperandStore" />
</bean>
- <bean id="org.hisp.dhis.customvalue.CustomValueService" class="org.hisp.dhis.customvalue.DefaultCustomValueService">
- <property name="customValueStore" ref="org.hisp.dhis.customvalue.CustomValueStore" />
- </bean>
-
<bean id="org.hisp.dhis.datavalue.DataValueService" class="org.hisp.dhis.datavalue.DefaultDataValueService">
<property name="dataValueStore" ref="org.hisp.dhis.datavalue.DataValueStore" />
<property name="dataValueAuditService"
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue'
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml 2009-05-20 14:35:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.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://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.customvalue.CustomValue" table="customvalue">
-
- <id name="id" column="customvalueid">
- <generator class="native"/>
- </id>
-
- <property name="customValue" not-null="true" length="160"/>
-
- <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" lazy="false"
- column="datasetid" not-null="true" foreign-key="fk_customvalue_datasetid"/>
-
- <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" lazy="false"
- column="dataelementid" not-null="true" foreign-key="fk_customvalue_dataElementid"/>
-
- <many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" lazy="false"
- column="optioncomboid" not-null="true" foreign-key="fk_customvalue_optioncomboid"/>
-
- </class>
-</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java 2011-01-25 22:15:46 +0000
@@ -35,8 +35,6 @@
import java.util.List;
import java.util.Map;
-import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -74,18 +72,6 @@
// Dependencies
// -------------------------------------------------------------------------
- private CustomValueService customValueService;
-
- public CustomValueService getCustomValueService()
- {
- return customValueService;
- }
-
- public void setCustomValueService( CustomValueService customValueService )
- {
- this.customValueService = customValueService;
- }
-
private DataElementService dataElementService;
public void setDataElementService( DataElementService dataElementService )
@@ -175,13 +161,6 @@
// Output
// -------------------------------------------------------------------------
- private List<CustomValue> customValues = new ArrayList<CustomValue>();
-
- public List<CustomValue> getCustomValues()
- {
- return customValues;
- }
-
private Map<DataElementCategoryCombo, List<DataElement>> orderedDataElements = new HashMap<DataElementCategoryCombo, List<DataElement>>();
public Map<DataElementCategoryCombo, List<DataElement>> getOrderedDataElements()
@@ -347,8 +326,6 @@
DataSet dataSet = selectedStateManager.getSelectedDataSet();
- customValues = (List<CustomValue>) customValueService.getCustomValuesByDataSet( dataSet );
-
Period period = selectedStateManager.getSelectedPeriod();
DataSetLock dataSetLock = dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period );
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SectionFormAction.java 2011-01-25 22:15:46 +0000
@@ -34,8 +34,6 @@
import java.util.List;
import java.util.Map;
-import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -69,18 +67,6 @@
// Dependencies
// -------------------------------------------------------------------------
- private CustomValueService customValueService;
-
- public CustomValueService getCustomValueService()
- {
- return customValueService;
- }
-
- public void setCustomValueService( CustomValueService customValueService )
- {
- this.customValueService = customValueService;
- }
-
private DataValueService dataValueService;
public void setDataValueService( DataValueService dataValueService )
@@ -127,13 +113,6 @@
// Input/output
// -------------------------------------------------------------------------
- private List<CustomValue> customValues = new ArrayList<CustomValue>();
-
- public List<CustomValue> getCustomValues()
- {
- return customValues;
- }
-
private List<Section> sections;
public List<Section> getSections()
@@ -300,8 +279,6 @@
DataSet dataSet = selectedStateManager.getSelectedDataSet();
- customValues = (List<CustomValue>) customValueService.getCustomValuesByDataSet( dataSet );
-
Period period = selectedStateManager.getSelectedPeriod();
Collection<DataElement> dataElements = new ArrayList<DataElement>();
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java 2011-01-25 22:15:46 +0000
@@ -29,19 +29,15 @@
import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL;
import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_INT;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_STRING;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.datavalue.DataValue;
@@ -60,17 +56,6 @@
private static final String EMPTY = "";
// -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CustomValueService customValueService;
-
- public void setCustomValueService( CustomValueService customValueService )
- {
- this.customValueService = customValueService;
- }
-
- // -------------------------------------------------------------------------
// DataEntryScreenManager implementation
// -------------------------------------------------------------------------
@@ -78,12 +63,6 @@
Collection<DataValue> dataValues, Map<String, MinMaxDataElement> minMaxMap, String disabled, I18n i18n, DataSet dataSet )
{
// ---------------------------------------------------------------------
- // Populating Custom Value data
- // ---------------------------------------------------------------------
-
- List<CustomValue> customValues = (List<CustomValue>) customValueService.getCustomValuesByDataSet( dataSet );
-
- // ---------------------------------------------------------------------
// Inline Javascript to add to HTML before outputting
// ---------------------------------------------------------------------
@@ -167,10 +146,7 @@
// Insert value of data element in output code
// -------------------------------------------------------------
- boolean customValueExists = customValuesExists( customValues, dataElementId, optionComboId );
-
- if ( dataElement.getType().equals( DataElement.VALUE_TYPE_BOOL )
- || (dataElement.getType().equals( VALUE_TYPE_STRING ) && customValueExists) )
+ if ( dataElement.getType().equals( DataElement.VALUE_TYPE_BOOL ) )
{
dataElementCode = dataElementCode.replace( "input", "select" );
dataElementCode = dataElementCode.replaceAll( "value=\".*?\"", "" );
@@ -259,32 +235,6 @@
appendCode += "</select>";
}
- else if ( dataElement.getType().equals( VALUE_TYPE_STRING ) && customValueExists )
- {
- appendCode += jsCodeForCombos;
-
- appendCode += "<option value=\"\"></option>";
-
- for ( CustomValue customValue : customValues )
- {
- if ( dataElementId == customValue.getDataElement().getId()
- && optionComboId == customValue.getOptionCombo().getId() )
- {
- if ( dataElementValue.equalsIgnoreCase( customValue.getCustomValue() ) )
- {
- appendCode += "<option value=\"" + customValue.getCustomValue() + "\" selected >"
- + customValue.getCustomValue() + "</option>";
- }
- else
- {
- appendCode += "<option value=\"" + customValue.getCustomValue() + "\">"
- + customValue.getCustomValue() + "</option>";
- }
- }
- }
-
- appendCode += "</select>";
- }
else
{
appendCode += jsCodeForInputs;
@@ -330,25 +280,6 @@
// -------------------------------------------------------------------------
/**
- * Tests whether the given Collection of CustomValues contains a CustomValue
- * with the given data element identifier and category option combo id.
- */
- private boolean customValuesExists( Collection<CustomValue> customValues, int dataElementId,
- int categoryOptionComboId )
- {
- for ( CustomValue customValue : customValues )
- {
- if ( dataElementId == customValue.getDataElement().getId()
- && categoryOptionComboId == customValue.getOptionCombo().getId() )
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
* Returns the value of the DataValue in the Collection of DataValues with
* the given data element identifier and category option combo id.
*/
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2011-01-25 22:15:46 +0000
@@ -24,9 +24,7 @@
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
</bean>
- <bean id="org.hisp.dhis.de.screen.DataEntryScreenManager" class="org.hisp.dhis.de.screen.DefaultDataEntryScreenManager">
- <property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService" />
- </bean>
+ <bean id="org.hisp.dhis.de.screen.DataEntryScreenManager" class="org.hisp.dhis.de.screen.DefaultDataEntryScreenManager"/>
<!-- Actions -->
@@ -66,7 +64,6 @@
<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService" />
</bean>
<bean id="org.hisp.dhis.de.action.SectionFormAction" class="org.hisp.dhis.de.action.SectionFormAction" scope="prototype">
@@ -74,7 +71,6 @@
<property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager"/>
<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager"/>
- <property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService"/>
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm 2011-01-25 22:15:46 +0000
@@ -63,24 +63,6 @@
<option value="true" #if( $dataValue.value == "true" ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( $dataValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
- #elseif( $dataElement.type == "string" )
- #set( $coun = 0 )
- #foreach($customValue in $customValues)
- #if($dataElement.id == $customValue.dataElement.id && $optionCombo.id == $customValue.optionCombo.id)
- #set( $coun = $coun +1 )
- #end
- #end
- #if( $coun > 0 )
- <select name="entryselect" id="$dataEntryId" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue" ) ) onchange="saveBoolean($dataElement.id,$optionCombo.id, this )" #else disabled="disabled" #end style="width:100%" tabindex="$tabIndex" #if( $locked ) disabled="disabled"#end>
- #foreach($customValue in $customValues)
- #if($dataElement.id == $customValue.dataElement.id && $optionCombo.id == $customValue.optionCombo.id)
- <option value="$customValue.customValue" #if( $dataValue.value == $customValue.customValue ) selected="selected" #end>$customValue.customValue</option>
- #end
- #end
- </select>
- #else
- <input name="entryfield" id="$dataEntryId" type="text" value="$!encoder.htmlEncode( $dataValue.value )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue") ) onchange="saveVal(${dataElement.id},${optionCombo.id})" ondblclick="viewHist(${dataElement.id},${optionCombo.id})" #else disabled="disabled"#end onkeypress="return keyPress(event,this)" class="entryField #if( $minMaxError ) minmax#end" tabindex="$tabIndex" #if( $locked )disabled="disabled"#end>
- #end
#else
<input name="entryfield" id="$dataEntryId" type="text" value="$!encoder.htmlEncode( $dataValue.value )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue") ) onchange="saveVal(${dataElement.id},${optionCombo.id})" ondblclick="viewHist(${dataElement.id},${optionCombo.id})" #else disabled="disabled"#end onkeypress="return keyPress(event,this)" class="entryField #if( $minMaxError ) minmax#end" tabindex="$tabIndex" #if( $locked )disabled="disabled"#end>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm 2011-01-25 14:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm 2011-01-25 22:15:46 +0000
@@ -83,25 +83,6 @@
<option value="true" #if( $dataValue.value == "true" ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( $dataValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
- #elseif( $dataElement.type == "string" )
- #set( $coun = 0 )
- #foreach($customValue in $customValues)
- #if($dataElement.id == $customValue.dataElement.id && $optionCombo.id == $customValue.optionCombo.id)
- #set( $coun = $coun +1 )
- #end
- #end
- #if( $coun > 0 )
- <select name="entryselect" id="$dataEntryId" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue" ) ) onchange="saveBoolean($dataElement.id,$optionCombo.id, this )" #else disabled="disabled" #end style="width:100%" tabindex="$tabIndex" #if( $locked ) disabled="disabled"#end #if( $greyedField ) disabled="disabled"#end>
- <option value="">[$i18n.getString( "please_select" )] </option>
- #foreach($customValue in $customValues)
- #if($dataElement.id == $customValue.dataElement.id && $optionCombo.id == $customValue.optionCombo.id)
- <option value="$customValue.customValue" #if( $dataValue.value == $customValue.customValue ) selected="selected" #end>$customValue.customValue</option>
- #end
- #end
- </select>
- #else
- <input name="entryfield" id="$dataEntryId" type="text" value="$!encoder.htmlEncode( $dataValue.value )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue") ) onchange="saveVal(${dataElement.id},${optionCombo.id})" ondblclick="viewHist(${dataElement.id},${optionCombo.id})" #else disabled="disabled"#end onkeypress="return keyPress(event,this)" class="entryField #if( $minMaxError ) minmax#end" tabindex="$tabIndex" #if( $locked || $greyedField )disabled="disabled"#end>
- #end
#else
<input name="entryfield" id="$dataEntryId" type="text" value="$!encoder.htmlEncode( $dataValue.value )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue") ) onchange="saveVal(${dataElement.id},${optionCombo.id})" ondblclick="viewHist(${dataElement.id},${optionCombo.id})" #else disabled="disabled"#end onkeypress="return keyPress(event,this)" class="entryField #if( $minMaxError ) minmax#end" tabindex="$tabIndex" #if( $locked || $greyedField )disabled="disabled"#end>
#end
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetCustomValuesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetCustomValuesAction.java 2009-10-18 22:44:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetCustomValuesAction.java 1970-01-01 00:00:00 +0000
@@ -1,257 +0,0 @@
-package org.hisp.dhis.dataset.action.dataentryform;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Latifov Murodillo Abdusamadovich
- *
- * @version $Id$
- */
-public class GetCustomValuesAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataElementCategoryService dataElementCategoryService;
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- private CustomValueService customValueService;
-
- public void setCustomValueService( CustomValueService customValueService )
- {
- this.customValueService = customValueService;
- }
-
- // -------------------------------------------------------------------------
- // Getters & Setters
- // -------------------------------------------------------------------------
-
- private int customValueId;
-
- public int getCustomValueId()
- {
- return customValueId;
- }
-
- public void setCustomValueId( int customValueId )
- {
- this.customValueId = customValueId;
- }
-
- private int dataElementId;
-
- public void setDataElementId( int dataElementId )
- {
- this.dataElementId = dataElementId;
- }
-
- private int dataSetId;
-
- public void setDataSetId( int dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public int getDataSetId()
- {
- return dataSetId;
- }
-
- private int categoryOptionComboId;
-
- public int getCategoryOptionComboId()
- {
- return categoryOptionComboId;
- }
-
- public void setCategoryOptionComboId( int categoryOptionComboId )
- {
- this.categoryOptionComboId = categoryOptionComboId;
- }
-
- private List<String> customValueIds;
-
- public List<String> getCustomValueIds()
- {
- return customValueIds;
- }
-
- private List<String> customValueNames;
-
- public List<String> getCustomValueNames()
- {
- return customValueNames;
- }
-
- private String operation;
-
- public String getOperation()
- {
- return operation;
- }
-
- public void setOperation( String operation )
- {
- this.operation = operation;
- }
-
- private String value;
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue( String value )
- {
- this.value = value;
- }
-
- // -------------------------------------------------------------------------
- // Execute
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- customValueIds = new ArrayList<String>();
- customValueNames = new ArrayList<String>();
-
- DataSet dataSet = dataSetService.getDataSet( dataSetId );
- DataElement dataElement = dataElementService.getDataElement( dataElementId );
- DataElementCategoryOptionCombo dataElementCategoryOptionCombo = dataElementCategoryService
- .getDataElementCategoryOptionCombo( categoryOptionComboId );
-
- CustomValue customValue = new CustomValue();
- customValue.setDataSet( dataSet );
- customValue.setDataElement( dataElement );
- customValue.setOptionCombo( dataElementCategoryOptionCombo );
-
- if ( operation.equalsIgnoreCase( "add" ) )
- {
- customValue.setCustomValue( value );
-
- customValueService.addCustomValue( customValue );
- }
-
- if ( operation.equalsIgnoreCase( "delete" ) )
- {
- customValue = customValueService.getCustomValue( customValueId );
- customValueService.deleteCustomValue( customValue );
- }
-
- List<CustomValue> customValues = null;
-
- if ( operation.equalsIgnoreCase( "find" ) )
- {
- customValues = new ArrayList<CustomValue>( customValueService.findCustomValues( value ) );
- }
- else
- {
- customValues = new ArrayList<CustomValue>( customValueService.getCustomValues( dataSet, dataElement,
- dataElementCategoryOptionCombo ) );
- }
-
- Iterator<CustomValue> customValueIterator = customValues.iterator();
-
- if ( operation.equalsIgnoreCase( "find" ) )
- {
- while ( customValueIterator.hasNext() )
- {
- CustomValue customVal = customValueIterator.next();
-
- if ( !customValueNames.contains( customVal.getCustomValue() ) )
- {
- customValueIds.add( String.valueOf( customVal.getId() ) );
- customValueNames.add( customVal.getCustomValue() );
- }
- }
- }
- else
- {
- while ( customValueIterator.hasNext() )
- {
- CustomValue customVal = customValueIterator.next();
-
- customValueIds.add( String.valueOf( customVal.getId() ) );
- customValueNames.add( customVal.getCustomValue() );
- }
- }
- if ( operation.equalsIgnoreCase( "delete" ) )
- {
- customValueIds.remove( String.valueOf( customValue.getId() ) );
- customValueNames.remove( customValue.getCustomValue() );
- }
-
- if ( operation.equalsIgnoreCase( "add" ) )
- {
- if ( !customValueNames.contains( customValue.getCustomValue() ) )
- {
- customValueIds.remove( String.valueOf( customValue.getId() ) );
- customValueNames.remove( customValue.getCustomValue() );
- }
- }
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-01-25 21:25:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-01-25 22:15:46 +0000
@@ -3,26 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
-
- <!-- Custom Value -->
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.GetCustomValuesAction"
- class="org.hisp.dhis.dataset.action.dataentryform.GetCustomValuesAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataElementCategoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- <property name="customValueService">
- <ref bean="org.hisp.dhis.customvalue.CustomValueService"/>
- </property>
- </bean>
-
+
<!-- Section -->
<bean id="org.hisp.dhis.dataset.action.section.GetSectionAction"
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_PT.properties 2009-04-20 15:12:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_PT.properties 1970-01-01 00:00:00 +0000
@@ -1,1104 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:30:53 CAT 2009
-add_dataset=Adicionar SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:10 CAT 2009
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:19 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:31 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:42 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:47 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-all=Todos
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:48 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-all=Todos
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:31:53 CAT 2009
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-assign=Atribuir
-all=Todos
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:32:08 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_dataset=Adicionar SetDados
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-assign=Atribuir
-all=Todos
-add_new_dataset=Adicionar novo SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:32:20 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-all=Todos
-add_section=Adicionar sec\u00E7\u00E3o
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:32:29 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-all=Todos
-add_section=Adicionar sec\u00E7\u00E3o
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:32:42 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-all=Todos
-add_section=Adicionar sec\u00E7\u00E3o
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:32:49 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:33:12 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:33:30 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-data_set_sort_order=Ordem de sorteio SetDados
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:54:10 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-data_set_sort_order=Ordem de sorteio SetDados
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:54:29 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-dataentryform=Fromul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-data_set_sort_order=Ordem de sorteio SetDados
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:54:37 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-data_set_sort_order=Ordem de sorteio SetDados
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:55:04 CAT 2009
-available_data_elements=Elementos de Dados dispon\u00EDveis
-code=C\u00F3digo
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-category_combo=Combina\u00E7\u00E3o categorias
-add_dataset=Adicionar SetDados
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-add_section=Adicionar sec\u00E7\u00E3o
-all=Todos
-data_set_sort_order=Ordem de sorteio SetDados
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-cancel=Cancelar
-assign=Atribuir
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:55:20 CAT 2009
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-category_combo=Combina\u00E7\u00E3o categorias
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:55:33 CAT 2009
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-category_combo=Combina\u00E7\u00E3o categorias
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:00 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-category_combo=Combina\u00E7\u00E3o categorias
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:17 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:23 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:32 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:41 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:56:50 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:57:10 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:57:10 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:58:07 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:58:20 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:58:39 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:02 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:23 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:29 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-edit=Editar
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:35 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-edit_dataset=Editar SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-edit=Editar
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:44 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-edit_dataset=Editar SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-edit=Editar
-edit_section=Editar Sec\u00E7\u00E3o
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:51 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-edit_dataset=Editar SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-filter=Filtro
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-edit=Editar
-edit_section=Editar Sec\u00E7\u00E3o
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 19:59:52 CAT 2009
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-code=C\u00F3digo
-add_dataset=Adicionar SetDados
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-all=Todos
-cancel=Cancelar
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_details=Detalhes de entrada de dados
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-data_set_sort_order=Ordem de sorteio SetDados
-edit_dataset=Editar SetDados
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-category_combo=Combina\u00E7\u00E3o categorias
-dataset=SetDados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-available_data_elements=Elementos de Dados dispon\u00EDveis
-filter=Filtro
-add_new=Adicionar novo
-dataset_management=Gest\u00E3o SetDados
-add_new_dataset=Adicionar novo SetDados
-dataentryform=Formul\u00E1rio de entrada de dados
-edit=Editar
-edit_section=Editar Sec\u00E7\u00E3o
-dataset_details=Detalhes SetDados
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-delete=Apagar este formul\u00E1rio
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-dataset_menu=Menu SetDados
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-add_section=Adicionar sec\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:00:01 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-assign=Atribuir
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:00:11 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-assign=Atribuir
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:00:17 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-assign=Atribuir
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:00:25 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-group_filter=Filtro de grupo
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-assign=Atribuir
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:00:32 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-id=Id
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-group_filter=Filtro de grupo
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:01:29 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-illegal_associations=Um SetDados n\u00E3o pode ser atribuido a duas unidades organizacionais onde uma delas \u00E9 directa ou indirectamente parente da outra.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-id=Id
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-group_filter=Filtro de grupo
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:01:39 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-illegal_associations=Um SetDados n\u00E3o pode ser atribuido a duas unidades organizacionais onde uma delas \u00E9 directa ou indirectamente parente da outra.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
-confirm_delete=Tem a certeza que quer apagar este SetDados?
-id=Id
-delete=Apagar este formul\u00E1rio
-dataentryform_management=Gest\u00E3o do formul\u00E1rio de entrada de dados
-data_set_sort_order=Ordem de sorteio SetDados
-dataset_menu=Menu SetDados
-dataentryform_details=Detalhes de entrada de dados
-available_data_elements=Elementos de Dados dispon\u00EDveis
-group_filter=Filtro de grupo
-label=R\u00F3tulo
-filter_by_name=Filtrar por nome
-add_dataset_section=Adicionar sec\u00E7\u00E3o de SetDados
-define_dataset_associations=Atribuir SetDados a unidades organizacionais
-assign=Atribuir
-available_sections=Sec\u00E7\u00F5es dispon\u00EDveis
-dataset=SetDados
-define_associations=Atribuir SetDados a unidades organizacionais
-dataentryform_confirm_delete=Tem a certeza que quer apagar este formul\u00E1rio de entrada de dados?
-dataset_management=Gest\u00E3o SetDados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:01:44 CAT 2009
-duplicate_codes=SetDados com este c\u00F3digo j\u00E1 foi registado
-frequency=Frequ\u00EAncia
-duplicate_short_names=SetDados com este nome curto j\u00E1 foi registado
-add_dataset=Adicionar SetDados
-code=C\u00F3digo
-dataentryform_duplicate_names=Formul\u00E1rio de entrada de dados com este nome j\u00E1 existente
-cancel=Cancelar
-level=N\u00EDvel
-edit_section=Editar Sec\u00E7\u00E3o
-duplicate_names=SetDados com este nome j\u00E1 foi registado.
-illegal_associations=Um SetDados n\u00E3o pode ser atribuido a duas unidades organizacionais onde uma delas \u00E9 directa ou indirectamente parente da outra.
-dataentryform_design=Desenho do formul\u00E1rio de entrada de dados
-dataset_details=Detalhes SetDados
-all=Todos
-edit=Editar
-group=Grupo
-category_combo=Combina\u00E7\u00E3o categorias
-dataentryform=Formul\u00E1rio de entrada de dados
-dataelement_count_mismatch=Alguns elementos de dados no SetDados est\u00E3o em falta no formul\u00E1rio customizado de entrada de dados, quer mesmo assim prosseguir?
-add_new=Adicionar novo
-add_section=Adicionar sec\u00E7\u00E3o
-add_new_dataset=Adicionar novo SetDados
-edit_dataset=Editar SetDados
-filter=Filtro
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2011-01-11 17:04:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2011-01-25 22:15:46 +0000
@@ -13,17 +13,7 @@
<param name="page">/dhis-web-maintenance-dataset/index.vm</param>
<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
</action>
-
- <!-- Custom Value -->
-
- <action name="editDataSetFormCustomValues"
- class="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/editCustomValues.vm</param>
- <param name="javascripts">javascript/dataSet.js</param>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
-
+
<!-- Dataset -->
<action name="dataSet" class="org.hisp.dhis.dataset.action.DataSetListAction">
@@ -290,12 +280,6 @@
<result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseOptionCombo.vm</result>
<param name="javascripts">javascript/dataEntryForm.js,javascript/FCK/fckeditor.js</param>
</action>
-
- <action name="getCustomValues"
- class="org.hisp.dhis.dataset.action.dataentryform.GetCustomValuesAction">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseCustomValue.vm</result>
- <param name="javascripts">javascript/dataEntryForm.js,javascript/FCK/fckeditor.js</param>
- </action>
<!-- Compulsory data elements -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2011-01-20 05:24:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2011-01-25 22:15:46 +0000
@@ -14,7 +14,7 @@
</table>
<table class="listTable" id="listTable">
<col/>
- <col width="240"/>
+ <col width="190"/>
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
@@ -29,9 +29,7 @@
<a href="defineDataSetAssociationsForm.action?dataSetId=$dataSet.id" title="$i18n.getString( 'define_associations' )"><img src="../images/assign.png" alt="$i18n.getString( 'define_associations' )"/></a>
<a href="editDataSetForm.action?dataSetId=$dataSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-
- <a href="editDataSetFormCustomValues.action?dataSetId=$dataSet.id&typeTextOnly=true" title="$i18n.getString( 'edit_custom_values' )"><img src="../images/custom_value.png" alt="$i18n.getString( 'edit_custom_values' )"/></a>
-
+
<a href="javascript:translate( 'DataSet', '$dataSet.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
<a href="javascript:viewDataEntryForm( '$dataSet.id' )" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"/></a>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm 2010-09-25 20:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm 1970-01-01 00:00:00 +0000
@@ -1,746 +0,0 @@
-
-<script>
-/**
- * <p>Implements a sortable hashtable which accepts non-<code>null</code> String
- * keys and non-<code>null</code> values.</p>
- *
- * <p>This object is primarily intended to address the shortcomings of using an
- * Object as a hashtable, by managing the names of the properties which are
- * stored in an Object.</p>
- *
- * <p>HashTable does not define a hashing function, as Object's built-in
- * hashing is used for storing and retrieving items.</p>
- *
- * <p>Initial values are taken from any Objects passed into the constructor:
- * if another HashTable is given as an argument, its contents will be taken.</p>
- *
- * @constructor
- */
-var HashTable = function()
-{
- /**
- * Storage object - values are stored as properties whose names are hashtable
- * keys.
- *
- * @type Object
- * @private
- */
- this._store = {};
-
- /**
- * A list of hashtable keys.
- *
- * @type Array
- * @private
- */
- this._keys = [];
-
- for (var i = 0; i < arguments.length; i++)
- {
- this._putFromObject(arguments[i]);
- }
-};
-
-/**
- * Puts all properties from a given HashTable or Object into the hashtable.
- *
- * @param {Object} source an object whose values will be put into the hashtable.
- * @private
- */
-HashTable.prototype._putFromObject = function(source)
-{
- if (source.constructor == HashTable)
- {
- source.forEach(function(k, v)
- {
- this.put(k, v);
- }, this);
- }
- else
- {
- for (property in source)
- {
- if (source.hasOwnProperty(property))
- {
- this.put(property, source[property]);
- }
- }
- }
-};
-
-/**
- * Clears the hashtable.
- */
-HashTable.prototype.clear = function()
-{
- this._store = {};
- this._keys = [];
-};
-
-/**
- * An iterator which calls the given function, passing key, value, item index and a
- * reference to this Hashtable for each item in the hashtable.
- *
- * @param {Function} callback the function to be called for each item.
- * @param {Object} context an optional context object for the calls to block.
- *
- * @see "Enumerating Javascript Objects", http://dean.edwards.name/weblog/2006/07/enum/
- */
-HashTable.prototype.forEach = function(callback, context)
-{
- for (var i = 0, l = this._keys.length; i < l; i++)
- {
- callback.call(context, this._keys[i], this._store[this._keys[i]], i, this);
- }
-};
-
-/**
- * Retrieves the item with the given key.
- *
- * @param {String} key the key for the item to be retrieved.
- * @return the item stored in this HashTable with the given key if one exists,
- * <code>null</code> otherwise.
- */
-HashTable.prototype.get = function(key)
-{
- var result = null;
- if (typeof(this._store[key]) != "undefined")
- {
- result = this._store[key];
- }
- return result;
-};
-
-/**
- * Determines if the hashtable contains the given key.
- *
- * @param {String} key the key to be searched for.
- * @return <code>true</code> if this HashTable contains the given key,
- * <code>false</code> otherwise.
- * @type Boolean
- */
-HashTable.prototype.hasKey = function(key)
-{
- var result = false;
- this.forEach(function(k)
- {
- if (key == k)
- {
- result = true;
- return true;
- }
- });
- return result;
-};
-
-/**
- * Determines if the hashtable contains the given value.
- *
- * @param {Object} value the value to be searched for.
- * @return <code>true</code> if this HashTable contains the given value,
- * <code>false</code> otherwise.
- * @type Boolean
- */
-HashTable.prototype.hasValue = function(value)
-{
- var result = false;
- this.forEach(function(k, v)
- {
- if (value == v)
- {
- result = true;
- return true;
- }
- });
- return result;
-};
-
-/**
- * Creates Object representations of the items in the hashtable.
- *
- * @return the items in the hashtable, represented as Objects with "key"
- * and "value" properties.
- * @type Array
- */
-HashTable.prototype.items = function()
-{
- var items = [];
- this.forEach(function(k, v)
- {
- items.push({"key": k, "value": v});
- });
- return items;
-};
-
-/**
- * Retrieves the hashtable's keys.
- *
- * @return the hashtable's keys.
- * @type Array
- */
-HashTable.prototype.keys = function()
-{
- var keys = [];
- this.forEach(function(key)
- {
- keys.push(key);
- });
- return keys;
-};
-
-/**
- * Puts an item into the hashtable.
- *
- * @param {String} key the key under which the item should be stored.
- * @param {Object} value the item to be stored.
- */
-HashTable.prototype.put = function(key, value)
-{
- if (key == undefined || key == null || typeof(key) != "string"
- || value == undefined || value == null)
- {
- return;
- }
-
- if (typeof(this._store[key]) == "undefined")
- {
- this._keys.push(key);
- }
-
- this._store[key] = value;
-};
-
-/**
- * Removes an item from the hashtable and returns it.
- *
- * @param {String} key the key for the item to be removed.
- * @return the item which was removed, or <code>null</code> if the item did not
- * exist.
- */
-HashTable.prototype.remove = function(key)
-{
- var result = null;
- for (var i = 0, l = this._keys.length; i < l; i++)
- {
- if (key == this._keys[i])
- {
- result = this._store[key];
- delete(this._store[key]);
- this._keys.splice(i, 1);
- break;
- }
- }
- return result;
-};
-
-/**
- * Determines the number of entries in the hashtable.
- *
- * @return the number of entries in this HashTable.
- * @type Number
- */
-HashTable.prototype.size = function()
-{
- return this._keys.length;
-};
-
-/**
- * Sorts the keys of the hashtable.
- *
- * @param {Function} comparator an optional function which will be used to sort
- * the keys - if not provided, they will be sorted
- * lexographically (in dictionary order).
- */
-HashTable.prototype.sort = function(comparator)
-{
- if (typeof(comparator) == "function")
- {
- this._keys.sort(comparator);
- }
- else
- {
- this._keys.sort();
- }
-};
-
-/**
- * Creates a String representation of the hashtable.
- *
- * @return a String representation of this {@link HashTable}.
- * @type String
- */
-HashTable.prototype.toString = function()
-{
- var result = "{";
- this.forEach(function(key, value, index)
- {
- if (index != 0)
- {
- result += ", ";
- }
- result += key + ": " + value;
- });
- result += "}";
- return result;
-};
-
-/**
- * Updates the hashtable with the values contained in a given {@link HashTable}
- * or Object.
- *
- * @param {Object} source an object whose values will be put into the hashtable.
- */
-HashTable.prototype.update = function(source)
-{
- this._putFromObject(source);
-};
-
-/**
- * Retrieves the hashtable's values.
- *
- * @return the hashtable's values.
- * @type Array
- */
-HashTable.prototype.values = function()
-{
- var values = [];
- this.forEach(function(key, value)
- {
- values.push(value);
- });
- return values;
-};
-</script>
-
-<script type="text/javascript">
-
-// -----------------------------------------------------------------------------
-// Find Selected DataElement Count in the DataEntryForm
-// -----------------------------------------------------------------------------
-
-function findDataElementCount()
-{
- var request = new Request();
- request.setResponseTypeXML( 'dataSet' );
- request.setCallbackSuccess( findDataElementCountCompleted );
-
- // Clear the list
- var dataElementList = document.getElementById( 'dataElementSelector' );
- dataElementList.options.length = 0;
-
- var requestString = 'getSelectedDataElements.action';
-
- var params = 'dataSetId=' + document.getElementById( 'dataSetIdField' ).value;
-
- request.sendAsPost( params );
- request.send( requestString );
-
- return false;
-}
-
-function findDataElementCountCompleted( dataSetElement )
-{
- var dataElements = dataSetElement.getElementsByTagName( 'dataElements' )[0];
- var dataElementList = dataElements.getElementsByTagName( 'dataElement' );
-
- var dataElementSelector = document.getElementById( 'dataElementSelector' );
-
- for ( var i = 0; i < dataElementList.length; i++ )
- {
- var dataElement = dataElementList[i];
- var name = dataElement.firstChild.nodeValue;
- var id = dataElement.getAttribute( 'id' );
-
- var option = new Option( name, id );
-
- dataElementSelector.add( option, null );
- }
-
- if( dataElementList.length <=0 )
- {
- setMessage( "No more elements to select" ); //?
-// window.parent.SetOkButton( false ) ;
- }
- else
- {
- hideMessage();
-// window.parent.SetOkButton( true ) ;
- }
-}
-
-// -----------------------------------------------------------------------------
-// Get OptionCombos of a selected DataElement
-// -----------------------------------------------------------------------------
-function getOptionCombos()
-{
- var request = new Request();
- request.setResponseTypeXML( 'optionCombo' );
- request.setCallbackSuccess( getOptionCombosCompleted );
-
- var dataElementSelector = document.getElementById( 'dataElementSelector' );
- var dataElementId = dataElementSelector.options[dataElementSelector.selectedIndex].value;
-
- // Clear the OptionCombo list
- var optionComboList = document.getElementById( 'optionComboSelector' );
- optionComboList.options.length = 0;
-
- // Clear the customValue list
- var customValueList = document.getElementById( 'customValueSelector' );
- customValueList.options.length = 0;
-
- var requestString = 'getOptionCombos.action';
-
- var params = 'dataElementId=' + dataElementId;
-
- request.sendAsPost( params );
- request.send( requestString );
-
- return false;
-}
-
-function getOptionCombosCompleted( optionComboElement )
-{
- var categoryOptions = optionComboElement.getElementsByTagName( 'categoryOptions' )[0];
- var optionsList = optionComboElement.getElementsByTagName( 'categoryOption' );
-
- var optionComboSelector = document.getElementById( 'optionComboSelector' );
-
- for ( var i = 0; i < optionsList.length; i++ )
- {
- var categoryOption = optionsList[i];
- var name = categoryOption.firstChild.nodeValue;
- var id = categoryOption.getAttribute( 'id' );
-
- var option = new Option( name, id );
-
- optionComboSelector.add( option, null );
- }
-
- var messageContainer = document.getElementById('message');
- if( (optionsList.length ==1 && optionsList[0]=="NULL") || (optionsList.length ==0) )
- {
- setMessage( "No more categories to select" ); //?
- //window.parent.SetOkButton( false ) ;
- }
- else
- {
- hideMessage();
-// window.parent.SetOkButton( true ) ;
- }
-}
-
-
-
-// -----------------------------------------------------------------------------
-// Set CustomValues of a selected OptionCombo
-// -----------------------------------------------------------------------------
-
-function getCustomValuesCompleted( customValueElement )
-{
- var custom_Values = customValueElement.getElementsByTagName( 'customValues' )[0];
- var custom_ValueList = customValueElement.getElementsByTagName( 'customValue' );
-
- var customValueSelector = document.getElementById( 'customValueSelector' );
-
- for ( var i = 0; i < custom_ValueList.length; i++ )
- {
- var custom_ValueOption = custom_ValueList[i];
- var name = custom_ValueOption.firstChild.nodeValue;
- var id = custom_ValueOption.getAttribute( 'id' );
-
- var option = new Option( name, id );
-
- customValueSelector.add( option, null );
- }
-
- //here add if single value dissable and make the only element selected
-
- if( (custom_ValueList.length ==1 && custom_ValueList[0]=="NULL") || (custom_ValueList.length ==0) )
- {
- setMessage( "No more categories to select" ); //?
- }
- else
- {
- hideMessage();
- }
-}
-
-// -----------------------------------------------------------------------------
-// Add/Delete/Get CustomValues of a selected OptionCombo
-// -----------------------------------------------------------------------------
-function getCustomValues(operation)
-{
- var request = new Request();
- request.setResponseTypeXML( 'customValue' );
- request.setCallbackSuccess( getCustomValuesCompleted );
-
- var dataElementSelector = document.getElementById( 'dataElementSelector' );
- var dataElementId = dataElementSelector.options[dataElementSelector.selectedIndex].value;
-
- var optionComboSelector = document.getElementById( 'optionComboSelector' );
- var categoryoptioncomboid = optionComboSelector.options[optionComboSelector.selectedIndex].value;
-
- if(operation=='delete')
- {
- var customValueSelector = document.getElementById( 'customValueSelector' );
- var customValueId = customValueSelector.options[customValueSelector.selectedIndex].value;
- }
-
- // Clear the customValue list
- var customValueList = document.getElementById( 'customValueSelector' );
- customValueList.options.length = 0;
-
- var requestString = 'getCustomValues.action';
-
- var params = 'dataElementId=' + dataElementId;
- var params = params + '&categoryOptionComboId='+categoryoptioncomboid;
- var params = params + '&dataSetId='+ document.getElementById( 'dataSetIdField' ).value;
- var params = params + '&operation='+operation;
- var params = params + '&value='+ document.getElementById( 'newCustomValue' ).value;
-
- if(operation=='delete')
- {
- var params = params + '&customValueId='+customValueId;
- }
-
- request.sendAsPost( params );
- request.send( requestString );
-
- return false;
-}
-
-
-//get suggestions for custom value
-function getSuggestedCustomValuesCompleted( customValueElement )
-{
- var custom_Values = customValueElement.getElementsByTagName( 'customValues' )[0];
- var custom_ValueList = customValueElement.getElementsByTagName( 'customValue' );
-
- var availableCustomValue = document.getElementById( 'availableCustomValue' );
-
- for ( var i = 0; i < custom_ValueList.length; i++ )
- {
- var custom_ValueOption = custom_ValueList[i];
- var name = custom_ValueOption.firstChild.nodeValue;
- var id = custom_ValueOption.getAttribute( 'id' );
-
- var option = new Option( name, name );
-
- availableCustomValue.add( option, null );
- }
-
- //here add if single value dissable and make the only element selected
-
- if( (custom_ValueList.length ==1 && custom_ValueList[0]=="NULL") || (custom_ValueList.length ==0) )
- {
- hideMessage();
- }
- else
- {
- hideMessage();
- }
-}
-
-// -----------------------------------------------------------------------------
-// Get Suggested CustomValues for typed chars
-// -----------------------------------------------------------------------------
-function getSuggestedCustomValues(operation)
-{
- var request = new Request();
- request.setResponseTypeXML( 'customValue' );
- request.setCallbackSuccess( getSuggestedCustomValuesCompleted );
-
- var dataElementSelector = document.getElementById( 'dataElementSelector' );
- var dataElementId = dataElementSelector.options[dataElementSelector.selectedIndex].value;
-
- var optionComboSelector = document.getElementById( 'optionComboSelector' );
- var categoryoptioncomboid = optionComboSelector.options[optionComboSelector.selectedIndex].value;
-
- if(operation=='delete')
- {
- var customValueSelector = document.getElementById( 'customValueSelector' );
- var customValueId = customValueSelector.options[customValueSelector.selectedIndex].value;
- }
-
- // Clear the suggestedcustomValue list
- var availableCustomValueList = document.getElementById( 'availableCustomValue' );
- availableCustomValueList.options.length = 0;
-
- var requestString = 'getCustomValues.action';
-
- var params = 'dataElementId=' + dataElementId;
- var params = params + '&categoryOptionComboId='+categoryoptioncomboid;
- var params = params + '&dataSetId='+ document.getElementById( 'dataSetIdField' ).value;
- var params = params + '&operation='+operation;
- var params = params + '&value='+ document.getElementById( 'newCustomValue' ).value;
-
- if(operation=='delete')
- {
- var params = params + '&customValueId='+customValueId;
- }
-
- request.sendAsPost( params );
- request.send( requestString );
-
- return false;
-}
-
-function addNew()
-{
- if (document.getElementById( 'optionComboSelector' ).selectedIndex==-1 || document.getElementById( 'dataElementSelector' )==-1)
- {
- setMessage("You must make a selection from the Data element and Combo options panels first");
- }
- else if(document.getElementById( 'newCustomValue' ).value=='')
- {
- setMessage("Custom value must be entered" );
- }
- else
- {
- var isDuplicate='false';
- var selectobject=document.getElementById( 'customValueSelector' );
- var newValue = document.getElementById( 'newCustomValue' ).value;
-
- for (var i=0; i<selectobject.length; i++)
- {
- if(selectobject.options[i].text==newValue)
- {
- isDuplicate='true';
- }
- }
-
- if(isDuplicate=='true')
- {
- setMessage("Duplicates are not allowed");
- }
- else
- {
- getCustomValues('add');
- }
- }
-}
-
-function remove()
-{
- if (document.getElementById( 'dataElementSelector' )==-1)
- {
- setMessage("You must make a selection from the data element panel first");
- }
- else if (document.getElementById( 'optionComboSelector' ).selectedIndex==-1)
- {
- setMessage("You must make a selection from the Combo options panel first");
- }
- else if (document.getElementById( 'customValueSelector' ).selectedIndex==-1)
- {
- setMessage("You must make a selection from the Custom values panel first");
- }
- else
- {
- getCustomValues('delete');
- }
-}
-
-function findSimilar()
-{
- if(document.getElementById( 'newCustomValue' ).value.length>1)
- {
- getSuggestedCustomValues('find');
- }
- else
- {
- // Clear the suggestedcustomValue list
- var availableCustomValueList = document.getElementById( 'availableCustomValue' );
- availableCustomValueList.options.length = 0;
- }
-}
-
-function setSuggestedCustomValue()
-{
- var availableCustomValue = document.getElementById( 'availableCustomValue' );
- var availableCustomValueSelected = availableCustomValue.options[availableCustomValue.selectedIndex].value;
-
- document.getElementById( 'newCustomValue' ).value = availableCustomValueSelected;
-}
-
-</script>
-
-<style type="text/css">
-h4 {
- font-family: arial, sans-serif;
- font-size: 12px;
- margin: 15px 0 5px 0;
- }
-</style>
-
-<h3>$i18n.getString( "manage_custom_values" )</h3>
-
-<table>
- <col/> ## selectdataelement
- <col/> ## select_optioncombo
-<thead>
- <tr>
- <th>$i18n.getString( "selectdataelement" )</th>
- <th>$i18n.getString( "select_optioncombo" )</th>
- </tr>
-</thead>
-<tbody>
- <tr>
- <td>
- <select name="dataElementSelector" id="dataElementSelector" onchange="getOptionCombos()" style="min-width:25em" size="10">
- #foreach($dataElement in $dataElements)
- <option value="$dataElement.id">$dataElement.name</option>
- #end
- </select>
-
- </td>
- <td>
- <select name="optionComboSelector" id="optionComboSelector" onchange="getCustomValues('get')" style="min-width:25em" size="10">
- </select>
- </td>
- </tr>
- <tr>
- <td><input type="text" name="newCustomValue" id="newCustomValue" onkeydown="findSimilar()" maxlength="160" style="min-width:25em" size="60"/>
- </td>
- <td>
- <button type="button" onclick="addNew()">$i18n.getString( "add_new_custom_value" )</button>
- </td>
- </tr>
- </tbody>
- </table>
-
-<table>
- <col/> ## available_customvalue
- <col/> ## select_customvalue
-<thead>
- <tr>
- <th>$i18n.getString( "available_customvalue" )</th>
- <th>$i18n.getString( "select_customvalue" )</th>
- </tr>
-</thead>
-<tbody>
- <tr>
- <td>
- <select name="availableCustomValue" id="availableCustomValue" onchange="setSuggestedCustomValue()" style="min-width:25em" size="10">
- </select>
- </td>
- <td>
- <select name="customValueSelector" id="customValueSelector" style="min-width:25em" size="10">
- </select>
- </td>
- </tr>
-</tbody>
-</table>
-
-<table>
-<tbody>
- <tr>
- <td>
- <input type="button" onclick="remove()" value="$i18n.getString( 'delete_custom_value' )" style="width:10em"/>
- <input type="button" onclick="window.location.href='dataSet.action'" value="$i18n.getString( 'done_custom_value' )" style="width:10em"/>
- </td>
- </tr>
-</tbody>
-</table>
-
-<span id="message"></span>
-<input type="hidden" name="dataSetIdField" id="dataSetIdField" value="$dataSet.id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-01-21 04:51:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-01-25 22:15:46 +0000
@@ -9,26 +9,19 @@
});
checkValueIsExist( "name", "validateDataSet.action", {dataSetId: function(){return jQuery("#dataSetId").val()}});
-
checkValueIsExist( "shortName", "validateDataSet.action", {dataSetId: function(){return jQuery("#dataSetId").val()}} );
-
checkValueIsExist( "code", "validateDataSet.action", {dataSetId: function(){return jQuery("#dataSetId").val()}});
});
var previousName = '';
-
</script>
<h3>$i18n.getString( "edit_dataset" )</h3>
<form id="editDataSetForm" name="editDataSetForm" action="updateDataSet.action" method="post" >
- <div style="display:inline">
<input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/>
- </div>
<table id="detailsList">
- <col/> ## Labels
- <col/> ## Input
<thead>
<tr>
<th colspan="2">$i18n.getString( "dataset_details" )</th>
@@ -50,9 +43,6 @@
<tr>
<td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <!--
- Combobox with all available period types (registration frequencies.
- -->
<select id="frequencySelect" name="frequencySelect" style="min-width:20em">
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name" #if( $dataSet.periodType.name.equals( $periodType.name ) ) selected="selected" #end>$i18n.getString( $periodType.name )</option>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCustomValue.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCustomValue.vm 2009-05-03 23:04:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCustomValue.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-#set($count = 0)
-<customValue>
- <customValues>
- #foreach( $customValueId in $customValueIds )
- #set($customValueName = $customValueNames.get($count))
- <customValue id="$customValueId">$encoder.xmlEncode( $customValueName )</customValue>
- #set($count = $count + 1)
- #end
- </customValues>
-</customValue>
\ No newline at end of file
