=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm 2012-10-15 12:37:39 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm 2012-10-18 08:27:37 +0000 @@ -1,5 +1,6 @@ - + + DHIS2 === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm 2012-10-15 12:37:39 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm 2012-10-18 08:27:37 +0000 @@ -133,17 +133,78 @@ $.mobile.showPageLoadingMsg(); - var form = fm.form(Selected.dataSet); - - var tmpl = jQuery('#data-entry-template').html(); - - jQuery('#data-entry-page section[data-role="content"]').html( - _.template( tmpl, form ) - ); - - jQuery('#data-entry-page').trigger('pagecreate') - jQuery('#data-entry-list').listview('refresh'); - $.mobile.hidePageLoadingMsg(); + function renderFormTemplate(form) { + + var tmpl = jQuery('#data-entry-template').html(); + + jQuery('#data-entry-page section[data-role="content"]').html( + _.template( tmpl, form ) + ); + + jQuery('#data-entry-page').trigger('pagecreate') + jQuery('#data-entry-list').listview('refresh'); + jQuery('#send_button').bind('click', saveValues); + } + + $.ajax({ + url: '../api/dataSets/' + Selected.dataSet + '/form', + data: { + ou: Selected.orgUnit, + pe: Selected.period + }, + dataType: 'json' + }).success(function(form) { + console.log("rendering fresh form"); + console.log(form); + renderFormTemplate(form); + $.mobile.hidePageLoadingMsg(); + }).error(function() { + var form = fm.form(Selected.dataSet); + renderFormTemplate(form); + $.mobile.hidePageLoadingMsg(); + }); + } + + function saveValues() { + $.mobile.showPageLoadingMsg(); + + var fields = $('#data-entry-form :input[name]'); + + var dataValueSet = { + dataSet: Selected.dataSet, + orgUnit: Selected.orgUnit, + period: Selected.period.toString() + }; + + var dataValues = []; + + _.each(fields, function(field) { + var field = $(field); + + var dataValue = { + dataElement: field.data('dataelement'), + categoryOptionCombo: field.data('categoryoptioncombo'), + value: field.val() + }; + + dataValues.push(dataValue); + }); + + dataValueSet.dataValues = dataValues; + + console.log(dataValueSet); + + $.ajax({ + url: '../api/dataValueSets', + type: 'POST', + contentType: 'application/json', + data: JSON.stringify(dataValueSet) + }).success(function() { + $.mobile.hidePageLoadingMsg(); + }).error(function() { + console.log("error when saving datavalues") + $.mobile.hidePageLoadingMsg(); + }); } jQuery(document).bind('pagechange', function (event, data) { @@ -185,7 +246,7 @@ @@ -198,27 +259,29 @@
  • <%= group.label %>
    • <% _( group.fields ).each( function(field, idx) { %> + <% var fieldId = _.uniqueId('field'); %> + <% var value = field.value === undefined ? '' : field.value; %>
  • - + <% if( field.type == 'TEXT' ) { %> - + <% } else if( field.type == 'DATE' ) { %> - + <% } else if( field.type == 'BOOLEAN' ) { %> - + + + <% } else if( field.type == 'INTEGER' ) { %> - + <% } else if( field.type == 'INTEGER_POSITIVE' ) { %> - + <% } else if( field.type == 'INTEGER_NEGATIVE' ) { %> - + <% } else if( field.type == 'NUMBER' ) { %> - + <% } %>
    • <% }); %> === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm 2012-10-15 12:37:39 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm 2012-10-18 08:27:37 +0000 @@ -27,7 +27,7 @@ === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm 2012-10-10 17:15:59 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm 2012-10-18 08:27:37 +0000 @@ -46,19 +46,19 @@
    - + - + - + - + - +