← Back to team overview

dhis2-devs team mailing list archive

Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2029: fixed some bugs in Survey module

 

I would be interested to see this Survey module in trunk.

I think there could also be lessons for us to learn from Limesurvey,
which is already in use by HISP South Africa:
http://www.limesurvey.org/

Together with Limesurvey, there is an XML format, QueXML:
http://quexml.sourceforge.net/

Knut

On Wed, Sep 1, 2010 at 9:03 AM,  <noreply@xxxxxxxxxxxxx> wrote:
> ------------------------------------------------------------
> revno: 2029
> committer: dev ratan <dev-hisp@xxxxxxxxx>
> branch nick: trunk
> timestamp: Wed 2010-09-01 12:31:26 +0530
> message:
>  fixed some bugs in Survey module
> added:
>  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/responseInput.vm
> modified:
>  local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties
>  local/in/dhis-web-survey/src/main/resources/struts.xml
>  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/form.js
>  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js
>
>
> --
> 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-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties'
> --- local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties     2010-06-04 11:50:05 +0000
> +++ local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties     2010-09-01 07:01:26 +0000
> @@ -15,7 +15,7 @@
>  confirm_delete         =       Confirm Delete
>  required                       =       Required
>  short_name                     =       Short Name
> -description                    =       Description
> +description                    = Description
>  filter                         =       Filter
>  save                           =       Save
>  cancel                         =       Cancel
> @@ -41,7 +41,8 @@
>  organisation_unit = Organisation Unit
>  select = select
>  survey = Survey
> +specify_name = specify name
>  define_survey_associations = Define Survey Associations
> -
> +value_must_integer  = value must be integer
>
>
>
> === modified file 'local/in/dhis-web-survey/src/main/resources/struts.xml'
> --- local/in/dhis-web-survey/src/main/resources/struts.xml      2010-06-04 11:50:05 +0000
> +++ local/in/dhis-web-survey/src/main/resources/struts.xml      2010-09-01 07:01:26 +0000
> @@ -53,10 +53,8 @@
>
>                <action name="validateSurvey"
>                        class="org.hisp.dhis.survey.action.ValidateSurveyAction">
> -                       <result name="success" type="velocity-xml">
> -                               /dhis-web-survey/responseSuccess.vm</result>
> -                       <result name="input" type="velocity-xml">
> -                               /dhis-web-survey/responseInput.vm</result>
> +                       <result name="success" type="velocity-xml">/dhis-web-survey/responseSuccess.vm</result>
> +                       <result name="input" type="velocity-xml">/dhis-web-survey/responseInput.vm</result>
>                        <param name="onExceptionReturn">plainTextError</param>
>                </action>
>
>
> === modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/form.js'
> --- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/form.js 2010-06-04 11:50:05 +0000
> +++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/form.js 2010-09-01 07:01:26 +0000
> @@ -300,7 +300,7 @@
>
>  function registerReceived( messageElement )
>  {
> -       document.getElementById( "completeButton" ).disabled = true;
> +completeButton" ).disabled = tr        document.getElementById( "ue;
>        document.getElementById( "undoButton" ).disabled = false;
>     document.getElementById( "dateField" ).disabled = true;
>     document.getElementById( "dateDiv" ).style.display = "none";
>
> === modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js'
> --- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js       2010-06-04 11:50:05 +0000
> +++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js       2010-09-01 07:01:26 +0000
> @@ -48,9 +48,10 @@
>
>  function validateAddSurvey()
>  {
> -  var request = new Request();
> -  request.setResponseTypeXML( 'message' );
> -  request.setCallbackSuccess( addSurveyValidationCompleted );
> +
> +       var request = new Request();
> +       request.setResponseTypeXML( 'message' );
> +       request.setCallbackSuccess( addSurveyValidationCompleted );
>
>   var requestString = 'validateSurvey.action?name=' + document.getElementById( 'name' ).value +
>                       '&shortName=' + document.getElementById( 'shortName' ).value;
>
> === added file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/responseInput.vm'
> --- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/responseInput.vm   1970-01-01 00:00:00 +0000
> +++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/responseInput.vm   2010-09-01 07:01:26 +0000
> @@ -0,0 +1,2 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<message type="input">$!encoder.xmlEncode( $message )</message>
>
>
> _______________________________________________
> 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



References