dhis2-devs team mailing list archive

[Knut Staring <knutst@xxxxxxxxx>]

We need linelisting in trunk also...

On Wed, Sep 1, 2010 at 11:06 AM,  <noreply@xxxxxxxxxxxxx> wrote:
> ------------------------------------------------------------
> revno: 2033
> committer: Bharath <chbharathk@xxxxxxxxx>
> branch nick: trunk
> timestamp: Wed 2010-09-01 14:35:14 +0530
> message:
>  Fixed Linelisting module according to changes in expressionservice adn dataentryfromservice
> modified:
>  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/CalculateCDEsAction.java
>  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java
>  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java
>
>
> --
> 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 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/CalculateCDEsAction.java'
> --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/CalculateCDEsAction.java     2010-06-15 11:26:37 +0000
> +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/CalculateCDEsAction.java     2010-09-01 09:05:14 +0000
> @@ -35,8 +35,8 @@
>  import org.hisp.dhis.dataelement.CalculatedDataElement;
>  import org.hisp.dhis.dataelement.DataElement;
>  import org.hisp.dhis.dataelement.DataElementCategoryCombo;
> +import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
>  import org.hisp.dhis.dataelement.DataElementCategoryService;
> -import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
>  import org.hisp.dhis.dataelement.DataElementService;
>  import org.hisp.dhis.den.state.SelectedStateManager;
>  import org.hisp.dhis.den.state.StatefulDataValueSaver;
> @@ -137,8 +137,8 @@
>                String value = null;
>
>                for ( CalculatedDataElement cde : cdes )
> -               {
> -                       value = expressionService.getExpressionValue( cde.getExpression(), period, organisationUnit, false ).toString();
> +               {
> +                       value = expressionService.getExpressionValue( cde.getExpression(), period, organisationUnit, false, false ).toString();
>
>                        if ( value == null )
>                        {
>
> === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java'
> --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java      2010-08-31 07:51:06 +0000
> +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java      2010-09-01 09:05:14 +0000
> @@ -457,7 +457,10 @@
>         // ---------------------------------------------------------------------
>
>         // Locate custom data entry form belonging to dataset, if any.
> -        dataEntryForm = dataEntryFormService.getDataEntryFormByDataSet( dataSet );
> +
> +
> +        dataEntryForm = dataSet.getDataEntryForm();
> +        //dataEntryFormService.getDataEntryFormByDataSet( dataSet );
>         cdeFormExists = (dataEntryForm != null);
>
>         // Add JS and meta data to dynamically persist values of form.
>
> === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java'
> --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java    2010-08-31 07:51:06 +0000
> +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java    2010-09-01 09:05:14 +0000
> @@ -429,7 +429,8 @@
>         // ---------------------------------------------------------------------
>
>         // Locate custom data entry form belonging to dataset, if any.
> -        DataEntryForm dataEntryForm = dataEntryFormService.getDataEntryFormByDataSet( selectedDataSet );
> +        DataEntryForm dataEntryForm = selectedDataSet.getDataEntryForm();
> +        //dataEntryFormService.getDataEntryFormByDataSet( selectedDataSet );
>
>         customDataEntryFormExists = ( dataEntryForm != null);
>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>



-- 
Cheers,
Knut Staring