dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15091
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5313: WIP improved validation of dataset
------------------------------------------------------------
revno: 5313
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-12-06 19:59:26 +0100
message:
WIP improved validation of dataset
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2011-05-30 15:17:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2011-12-06 18:59:26 +0000
@@ -36,7 +36,6 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.user.UserService;
@@ -60,13 +59,6 @@
this.dataSetService = dataSetService;
}
- private PeriodService periodService;
-
- public void setPeriodService( PeriodService periodService )
- {
- this.periodService = periodService;
- }
-
private DataElementService dataElementService;
public void setDataElementService( DataElementService dataElementService )
@@ -162,7 +154,7 @@
code = null;
}
- PeriodType periodType = periodService.getPeriodTypeByName( frequencySelect );
+ PeriodType periodType = PeriodType.getPeriodTypeByName( frequencySelect );
DataSet dataSet = new DataSet( name, shortName, code, periodType );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java 2011-10-03 15:14:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java 2011-12-06 18:59:26 +0000
@@ -27,9 +27,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.period.PeriodType;
import com.opensymphony.xwork2.Action;
@@ -68,6 +75,20 @@
this.code = code;
}
+ private String periodType;
+
+ public void setPeriodType( String periodType )
+ {
+ this.periodType = periodType;
+ }
+
+ private Collection<String> dataElementId = new HashSet<String>();
+
+ public void setDataElementsSelectedList( Collection<String> dataElementsSelectedList )
+ {
+ this.dataElementId = dataElementsSelectedList;
+ }
+
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -78,6 +99,13 @@
{
this.dataSetService = dataSetService;
}
+
+ private DataElementService dataElementService;
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
// -------------------------------------------------------------------------
// I18n
@@ -156,6 +184,27 @@
}
}
+ // ---------------------------------------------------------------------
+ // Data element members
+ // ---------------------------------------------------------------------
+
+ if ( periodType != null && dataElementId != null )
+ {
+ PeriodType pType = PeriodType.getPeriodTypeByName( periodType );
+
+ for ( String id : dataElementId )
+ {
+ DataElement dataElement = dataElementService.getDataElement( Integer.parseInt( id ) );
+
+ if ( dataElement != null && pType != null && !pType.equals( dataElement.getPeriodType() ) )
+ {
+ message = i18n.getString( "data_element_has_other_period_type_than_data_set" ) + ": " + StringEscapeUtils.escapeHtml( dataElement.getName() );
+
+ return ERROR;
+ }
+ }
+ }
+
message = "OK";
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-10-31 11:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-12-06 18:59:26 +0000
@@ -213,9 +213,6 @@
<property name="dataSetService">
<ref bean="org.hisp.dhis.dataset.DataSetService" />
</property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService" />
- </property>
<property name="dataElementService">
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
</property>