dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21841
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10438: load anonymous program meta-data from server if they can not be found in sessionStorage
------------------------------------------------------------
revno: 10438
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-03-30 17:45:13 +0700
message:
load anonymous program meta-data from server if they can not be found in sessionStorage
added:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dhis2.storage.anonymous.js
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.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 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-03-21 04:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-03-30 10:45:13 +0000
@@ -127,6 +127,7 @@
,javascript/commons.js
,javascript/anonymousRegistration.js
,javascript/entry.js
+ ,javascript/dhis2.storage.anonymous.js
,../dhis-web-commons/javascripts/date.js
</param>
<param name="stylesheets">style/style.css</param>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-27 10:37:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-30 10:45:13 +0000
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# 2.12-SNAPSHOT V4
+# 2.12-SNAPSHOT V5
NETWORK:
*
CACHE:
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2013-03-27 12:21:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2013-03-30 10:45:13 +0000
@@ -8,10 +8,10 @@
setHeaderMessage( "Loading.. please wait" );
- $( "#orgUnitTree" ).one("ouwtLoaded", function() {
+ $( "#orgUnitTree" ).one( "ouwtLoaded", function () {
// initialize the stores, and then try and add the data
- DAO.programs = new dhis2.storage.Store( {name: 'programs'}, function ( store ) {
- DAO.programAssociations = new dhis2.storage.Store( {name: 'programAssociations'}, function ( store ) {
+ DAO.programs = new dhis2.storage.Store( {name: 'programs', adapter: 'dom-ss'}, function ( store ) {
+ DAO.programAssociations = new dhis2.storage.Store( {name: 'programAssociations', adapter: 'dom-ss'}, function ( store ) {
jQuery.getJSON( "getProgramMetaData.action", {},function ( data ) {
var keys = _.keys( data.metaData.programs );
var objs = _.values( data.metaData.programs );
@@ -26,662 +26,621 @@
} );
} );
} ).fail( function () {
- selection.setListenerFunction( organisationUnitSelected );
- hideHeaderMessage();
- } );
+ selection.setListenerFunction( organisationUnitSelected );
+ hideHeaderMessage();
+ } );
} );
} );
- });
+ } );
} );
-function organisationUnitSelected( orgUnits, orgUnitNames )
-{
- showById('dataEntryMenu');
- hideById('eventActionMenu');
- hideById('dataEntryInfor');
- hideById('advanced-search');
- hideById('minimized-advanced-search');
- hideById('listDiv');
- hideById('programName');
- setFieldValue("listAll", true);
- setFieldValue("startDate", '');
- setFieldValue("endDate", '');
- jQuery('#advancedSearchTB [name=searchText]').val('');
+function organisationUnitSelected( orgUnits, orgUnitNames ) {
+ showById( 'dataEntryMenu' );
+ hideById( 'eventActionMenu' );
+ hideById( 'dataEntryInfor' );
+ hideById( 'advanced-search' );
+ hideById( 'minimized-advanced-search' );
+ hideById( 'listDiv' );
+ hideById( 'programName' );
+ setFieldValue( "listAll", true );
+ setFieldValue( "startDate", '' );
+ setFieldValue( "endDate", '' );
+ jQuery( '#advancedSearchTB [name=searchText]' ).val( '' );
setFieldValue( 'orgunitId', orgUnits[0] );
- setFieldValue( 'orgunitName', orgUnitNames[0] );
- hideById('listDiv');
- hideById('dataEntryInfor');
+ setFieldValue( 'orgunitName', orgUnitNames[0] );
+ hideById( 'listDiv' );
+ hideById( 'dataEntryInfor' );
DAO.programAssociations.fetch( orgUnits[0], function ( store, arr ) {
- DAO.programs.fetch( arr[0], function ( store, arr ) {
- jQuery( '#searchingAttributeIdTD [id=searchObjectId] option' ).remove();
- jQuery( '#advancedSearchTB [id=searchObjectId] option' ).remove();
+ if ( arr.length > 0 ) {
+ DAO.programs.fetch( arr[0], function ( store, arr ) {
+ updateProgramList( arr )
+ } );
+ } else {
+ dhis2.storage.Store.plugins['anonymous-online'].call( {}, function ( arr ) {
+ updateProgramList( arr );
+ } );
+ }
+ } );
+}
+
+function updateProgramList( arr ) {
+ jQuery( '#searchingAttributeIdTD [id=searchObjectId] option' ).remove();
+ jQuery( '#advancedSearchTB [id=searchObjectId] option' ).remove();
+ clearListById( 'displayInReports' );
+ clearListById( 'programId' );
+
+ jQuery( '#programId' ).append( '<option value="" psid="" reportDateDes="' + i18n_report_date + '">[' + i18n_please_select + ']</option>' );
+
+ for ( var i = 0; i < arr.length; i++ ) {
+ jQuery( '#programId' ).append( '<option value="' + arr[i].key + '" psid="' + arr[i].programStages[0].id + '" reportDateDes="' +
+ arr[i].programStages[0].reportDateDescription + '">' + arr[i].name + '</option>' );
+ }
+
+ disableCriteriaDiv();
+ showById( 'selectDiv' );
+}
+
+function disableCriteriaDiv() {
+ disable( 'listBtn' );
+ disable( 'addBtn' );
+ disable( 'filterBtn' );
+ disable( 'removeBtn' );
+ jQuery( '#criteriaDiv :input' ).each( function ( idx, item ) {
+ disable( this.id );
+ } );
+}
+
+function enableCriteriaDiv() {
+ enable( 'listBtn' );
+ enable( 'addBtn' );
+ enable( 'filterBtn' );
+ enable( 'removeBtn' );
+ jQuery( '#criteriaDiv :input' ).each( function ( idx, item ) {
+ enable( this.id );
+ } );
+}
+
+function getDataElements() {
+ hideById( 'dataEntryInfor' );
+ hideById( 'listDiv' );
+ jQuery( '#searchingAttributeIdTD [id=searchObjectId] option' ).remove();
+ jQuery( '#advancedSearchTB [id=searchObjectId] option' ).remove();
+ programStageId = jQuery( '#programId option:selected' ).attr( 'psid' );
+ setFieldValue( 'programStageId', programStageId );
+ setInnerHTML( 'reportDateDescriptionField', jQuery( '#programId option:selected' ).attr( 'reportDateDes' ) );
+ setInnerHTML( 'reportDateDescriptionField2', jQuery( '#programId option:selected' ).attr( 'reportDateDes' ) );
+
+ if ( programStageId == '' ) {
+ removeAllAttributeOption();
+ disableCriteriaDiv();
+ enable( 'orgunitName' );
+ enable( 'programId' );
+ hideById( 'listDiv' );
+ setFieldValue( 'searchText' );
+ return;
+ }
+
+ jQuery.getJSON( "getProgramStageDataElementList.action",
+ {
+ programStageId: getFieldValue( 'programStageId' )
+ },
+ function ( json ) {
+ jQuery( '#advancedSearchTB [name=searchText]' ).val( '' );
+ jQuery( '.stage-object-selected' ).attr( 'psid', jQuery( '#programId option:selected' ).attr( "psid" ) );
+
+ clearListById( 'searchObjectId' );
clearListById( 'displayInReports' );
- clearListById( 'programId' );
-
- jQuery( '#programId' ).append( '<option value="" psid="" reportDateDes="' + i18n_report_date + '">[' + i18n_please_select + ']</option>' );
-
- for ( var i = 0; i < arr.length; i++ ) {
- jQuery( '#programId' ).append( '<option value="' + arr[i].key + '" psid="' + arr[i].programStages[0].id + '" reportDateDes="' +
- arr[i].programStages[0].reportDateDescription + '">' + arr[i].name + '</option>' );
- }
-
- disableCriteriaDiv();
- showById( 'selectDiv' );
- } );
- } );
-}
-
-function disableCriteriaDiv()
-{
- disable('listBtn');
- disable('addBtn');
- disable('filterBtn');
- disable('removeBtn');
- jQuery('#criteriaDiv :input').each( function( idx, item ){
- disable(this.id);
- });
-}
-
-function enableCriteriaDiv()
-{
- enable('listBtn');
- enable('addBtn');
- enable('filterBtn');
- enable('removeBtn');
- jQuery('#criteriaDiv :input').each( function( idx, item ){
- enable(this.id);
- });
-}
-
-function getDataElements()
-{
- hideById('dataEntryInfor');
- hideById('listDiv');
- jQuery('#searchingAttributeIdTD [id=searchObjectId] option').remove();
- jQuery('#advancedSearchTB [id=searchObjectId] option').remove();
- programStageId = jQuery('#programId option:selected').attr('psid');
- setFieldValue('programStageId', programStageId );
- setInnerHTML('reportDateDescriptionField', jQuery('#programId option:selected').attr('reportDateDes'));
- setInnerHTML('reportDateDescriptionField2', jQuery('#programId option:selected').attr('reportDateDes'));
-
- if( programStageId == '')
- {
- removeAllAttributeOption();
- disableCriteriaDiv();
- enable('orgunitName');
- enable('programId');
- hideById('listDiv');
- setFieldValue('searchText');
- return;
- }
-
- jQuery.getJSON( "getProgramStageDataElementList.action",
- {
- programStageId: getFieldValue('programStageId')
- },
- function( json )
- {
- jQuery('#advancedSearchTB [name=searchText]').val('');
- jQuery('.stage-object-selected').attr('psid', jQuery('#programId option:selected').attr("psid"));
-
- clearListById('searchObjectId');
- clearListById('displayInReports');
-
- jQuery( '[name=searchObjectId]').append( '<option value="" >[' + i18n_please_select + ']</option>' );
- for ( i in json.programStageDataElements ) {
- jQuery( '[name=searchObjectId]').append( '<option value="' + json.programStageDataElements[i].id + '" type="' + json.programStageDataElements[i].type +'">' + json.programStageDataElements[i].name + '</option>' );
- if( json.programStageDataElements[i].displayInReports=='true' ){
- jQuery( '#displayInReports').append( '<option value="' + json.programStageDataElements[i].id + '"></option>');
- }
- }
-
- enableCriteriaDiv();
- validateSearchEvents( true );
- });
-}
-
-function dataElementOnChange( this_ )
-{
- var container = jQuery(this_).parent().parent().attr('id');
- var element = jQuery('#' + container + ' [id=searchText]');
- var valueType = jQuery('#' + container+ ' [id=searchObjectId] option:selected').attr('type');
-
- if( valueType == 'date' ){
- element.replaceWith( getDateField( container ) );
- datePickerValid( 'searchText_' + container );
- return;
- }
- else
- {
- $( '#searchText_' + container ).datepicker("destroy");
- $('#' + container + ' [id=dateOperator]').replaceWith("");
-
- if( valueType == 'bool' ){
- element.replaceWith( getTrueFalseBox() );
- }
- else if ( valueType=='optionset' ){
- element.replaceWith( searchTextBox );
- autocompletedFilterField( container + " [id=searchText]" , jQuery(this_).val() );
- }
- else if( valueType== 'username' )
- {
- autocompletedUsernameField(jQuery(this).attr('id'));
- }
- else{
- element.replaceWith( searchTextBox );
- }
- }
-}
-
-function autocompletedFilterField( idField, searchObjectId )
-{
- var input = jQuery( "#" + idField );
- input.css("width","237px");
- input.autocomplete({
- delay: 0,
- minLength: 0,
- source: function( request, response ){
- $.ajax({
- url: "getOptions.action?id=" + searchObjectId + "&query=" + input.val(),
- dataType: "json",
- success: function(data) {
- response($.map(data.options, function(item) {
- return {
- label: item.o,
- id: item.o
- };
- }));
- }
- });
- },
- select: function( event, ui ) {
- input.val(ui.item.value);
- input.autocomplete( "close" );
- }
- })
- .addClass( "ui-widget" );
-
- input.data( "autocomplete" )._renderItem = function( ul, item ) {
- return $( "<li></li>" )
- .data( "item.autocomplete", item )
- .append( "<a>" + item.label + "</a>" )
- .appendTo( ul );
- };
-
- var wrapper = this.wrapper = $( "<span style='width:200px'>" )
- .addClass( "ui-combobox" )
- .insertAfter( input );
-
- var button = $( "<a style='width:20px; margin-bottom:-5px;height:20px;'>" )
- .attr( "tabIndex", -1 )
- .attr( "title", i18n_show_all_items )
- .appendTo( wrapper )
- .button({
- icons: {
- primary: "ui-icon-triangle-1-s"
- },
- text: false
- })
- .addClass('small-button')
- .click(function() {
- if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
- input.autocomplete( "close" );
- return;
- }
- $( this ).blur();
- input.autocomplete( "search", "" );
- input.focus();
- });
-}
-
-function autocompletedUsernameField( idField )
-{
- var input = jQuery( "#" + idField );
- input.parent().width( input.width() + 200 );
- var dataElementId = input.attr('id').split('-')[1];
-
- input.autocomplete({
- delay: 0,
- minLength: 0,
- source: function( request, response ){
- $.ajax({
- url: "getUsernameList.action?query=" + input.val(),
- dataType: "json",
- cache: true,
- success: function(data) {
- response($.map(data.usernames, function(item) {
- return {
- label: item.u,
- id: item.u
- };
- }));
- }
- });
- },
- minLength: 0,
- select: function( event, ui ) {
- var fieldValue = ui.item.value;
-
- if ( !dhis2.trigger.invoke( "caseentry-value-selected", [dataElementId, fieldValue] ) ) {
- input.val( "" );
- return false;
- }
-
- input.val( fieldValue );
- if ( !unSave ) {
- saveVal( dataElementId );
- }
- input.autocomplete( "close" );
- },
- change: function( event, ui ) {
- if ( !ui.item ) {
- var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
- valid = false;
- if ( !valid ) {
- $( this ).val( "" );
- if(!unSave)
- saveVal( dataElementId );
- input.data( "autocomplete" ).term = "";
- return false;
- }
- }
- }
- })
- .addClass( "ui-widget" );
-
- input.data( "autocomplete" )._renderItem = function( ul, item ) {
- return $( "<li></li>" )
- .data( "item.autocomplete", item )
- .append( "<a>" + item.label + "</a>" )
- .appendTo( ul );
- };
-
- var wrapper = this.wrapper = $( "<span style='width:200px'>" )
- .addClass( "ui-combobox" )
- .insertAfter( input );
-
- var button = $( "<a style='width:20px; margin-bottom:-5px;height:20px;'>" )
- .attr( "tabIndex", -1 )
- .attr( "title", i18n_show_all_items )
- .appendTo( wrapper )
- .button({
- icons: {
- primary: "ui-icon-triangle-1-s"
- },
- text: false
- })
- .addClass('small-button')
- .click(function() {
- if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
- input.autocomplete( "close" );
- return;
- }
- $( this ).blur();
- input.autocomplete( "search", "" );
- input.focus();
- });
-}
-
-function removeAllAttributeOption()
-{
- jQuery( '#advancedSearchTB tbody tr' ).each( function( i, item )
- {
- if(i>0){
- jQuery( item ).remove();
- }
- })
-}
-
-function validateSearchEvents( listAll )
-{
- listAll = eval(listAll);
- setFieldValue('listAll', listAll );
-
- var flag = true;
- if( !listAll )
- {
- if( getFieldValue('startDate')=="" || getFieldValue('endDate')=="" ){
- showWarningMessage( i18n_specify_a_date );
- flag = false;
- }
-
- if(flag && !listAll && jQuery('#filterBtn').attr("disabled")=="disabled" )
- {
- jQuery( '#advancedSearchTB tr' ).each( function( index, row ){
- if( index>1 )
- {
- jQuery( row ).find(':input').each( function( idx, item ){
- var input = jQuery( item );
- if( input.attr('type') != 'button' && idx==0 && input.val()=='' ){
- showWarningMessage( i18n_specify_data_element );
- flag = false;
- }
- })
- }
- });
- }
- }
-
- if(flag){
- searchEvents( listAll );
- }
-}
-
-function searchEvents( listAll )
-{
- hideById('dataEntryInfor');
- hideById('listDiv');
-
- var params = '';
- jQuery( '#displayInReports option' ).each( function( i, item ){
- var input = jQuery( item );
- params += '&searchingValues=de_' + input.val() + '_false_';
- });
-
- if(listAll){
- params += '&startDate=';
- params += '&endDate=';
- }
- else{
- var value = '';
- var searchingValue = '';
- params += '&startDate=' + getFieldValue('startDate');
- params += '&endDate=' + getFieldValue('endDate');
- if(byId("incompleted").checked)
- {
- params += '&useCompletedEvents=false';
- }
- jQuery( '#advancedSearchTB tr' ).each( function(index, row){
- if( index>1 )
- {
- jQuery( row ).find(':input').each( function( idx, item ){
- var input = jQuery( item );
- if( input.attr('type') != 'button' ){
- if( idx==0 && input.val()!=''){
- searchingValue = 'de_' + input.val() + '_false_';
- }
- else if( input.val()!='' ){
- value += jQuery.trim(input.val()).toLowerCase();
- }
- }
- });
-
- if( value !=''){
- searchingValue += getValueFormula(value);
- params += '&searchingValues=' + searchingValue;
- }
- searchingValue = '';
- value = '';
- }
- })
- }
-
- params += '&facilityLB=selected';
- params += '&level=0';
- params += '&orgunitIds=' + getFieldValue('orgunitId');
- params += '&programStageId=' + jQuery('#programId option:selected').attr('psid');
- params += '&orderByOrgunitAsc=false';
- params += '&userOrganisationUnit=false';
- params += '&userOrganisationUnitChildren=false';
-
- contentDiv = 'listDiv';
- showLoader();
-
- $.ajax({
- type: "POST",
- url: 'searchProgramStageInstances.action',
- data: params,
- success: function( html ){
- hideById('dataEntryInfor');
- setInnerHTML( 'listDiv', html );
-
- var searchInfor = (listAll) ? i18n_list_all_events : i18n_search_events_by_dataelements;
- setInnerHTML( 'searchInforTD', searchInfor);
-
- if(!listAll && jQuery('#filterBtn').attr("disabled")=="disabled")
- {
- showById('minimized-advanced-search');
- hideById('advanced-search');
- }
- else
- {
- hideById('minimized-advanced-search');
- hideById('advanced-search');
- showById('filterBtn');
- }
-
- showById('listDiv');
- hideById('loaderDiv');
- }
- });
-}
-
-function getValueFormula( value )
-{
- if( value.indexOf('"') != value.lastIndexOf('"') )
- {
- value = value.replace(/"/g,"'");
- }
- // if key is [xyz] && [=xyz]
- if( value.indexOf("'")==-1 ){
- var flag = value.match(/[>|>=|<|<=|=|!=]+[ ]*/);
-
- if( flag == null )
- {
- value = "='"+ value + "'";
- }
- else
- {
- value = value.replace( flag, flag + "'");
- value += "'";
- }
- }
- // if key is ['xyz'] && [='xyz']
- // if( value.indexOf("'") != value.lastIndexOf("'") )
- else
- {
- var flag = value.match(/[>|>=|<|<=|=|!=]+[ ]*/);
-
- if( flag == null )
- {
- value = "="+ value;
- }
- }
-
- return value;
-}
-
-function removeEvent( programStageId )
-{
- removeItem( programStageId, '', i18n_comfirm_delete_event, 'removeCurrentEncounter.action' );
-}
-
-function showUpdateEvent( programStageInstanceId )
-{
- hideById('dataEntryMenu');
- showById('eventActionMenu');
- jQuery("[name=eventActionLink]").hide();
- hideById('selectDiv');
- hideById('searchDiv');
- hideById('listDiv');
- setFieldValue('programStageInstanceId', programStageInstanceId);
- setInnerHTML('dataEntryFormDiv','');
- showLoader();
-
- $( '#dataEntryFormDiv' ).load( "dataentryform.action",
- {
- programStageInstanceId: programStageInstanceId
- },function()
- {
- jQuery('#inputCriteriaDiv').remove();
- showById('programName');
- showById('actionDiv');
- var programName = jQuery('#programId option:selected').text();
- var programStageId = jQuery('#programId option:selected').attr('psid');
- jQuery('.stage-object-selected').attr('psid',programStageId);
- setInnerHTML('programName', programName );
- if( getFieldValue('completed')=='true' ){
- disable("completeBtn");
- enable("uncompleteBtn");
- }
- else{
- enable("completeBtn");
- disable("uncompleteBtn");
- }
- hideById('loaderDiv');
- showById('dataEntryInfor');
- showById('entryFormContainer');
-
- jQuery("#entryForm :input").each(function()
- {
- if(( jQuery(this).attr( 'options' )!= null && jQuery(this).attr( 'options' )== 'true' )
- || ( jQuery(this).attr( 'username' )!= null && jQuery(this).attr( 'username' )== 'true' ))
- {
- var input = jQuery(this);
- input.parent().width( input.width() + 200 );
- }
- });
- });
-}
-
-function backEventList()
-{
- showById('dataEntryMenu');
- hideById('eventActionMenu');
- hideById('dataEntryInfor');
- hideById('programName');
- showById('selectDiv');
- showById('searchDiv');
- showById('listDiv');
- searchEvents( eval(getFieldValue('listAll')) );
-}
-
-function showAddEventForm()
-{
- showById('eventActionMenu');
- jQuery("[name=eventActionLink]").hide();
- hideById('dataEntryMenu');
- setInnerHTML('dataEntryFormDiv','');
- setFieldValue('executionDate','');
- hideById('selectDiv');
- hideById('searchDiv');
- hideById('listDiv');
- showById('programName');
- hideById('actionDiv');
- showById('dataEntryInfor');
- setFieldValue('programStageInstanceId','0');
- byId('executionDate').style.backgroundColor = "#ffffff";
- setInnerHTML('programName', jQuery('#programId option:selected').text());
-}
-
-function addNewEvent()
-{
- var programStageInstanceId = getFieldValue('programStageInstanceId');
- var programId = jQuery('#programId option:selected').val();
- var executionDate = getFieldValue('executionDate');
- jQuery("#executionDate").css('background-color', SAVING_COLOR);
- jQuery.postJSON( "saveExecutionDate.action",
- {
- programStageInstanceId:programStageInstanceId,
- programId:programId,
- executionDate:executionDate
- },
- function( json )
- {
- if(json.response=='success')
- {
- jQuery("#executionDate").css('background-color', SUCCESS_COLOR);
- setFieldValue('programStageInstanceId',json.message);
- if(programStageInstanceId != json.message){
- showUpdateEvent( json.message );
- }
- }
- else
- {
- jQuery("#executionDate").css('background-color', ERROR_COLOR);
- showWarningMessage( json.message );
- }
- });
-}
-
-function completedAndAddNewEvent()
-{
- doComplete( true );
-}
-
-function removeEmptyEvents()
-{
- var result = window.confirm( i18n_confirm_remove_empty_events );
-
- if ( result )
- {
- jQuery.getJSON( "removeEmptyEvents.action",
- {
- programStageId: jQuery('#selectDiv [id=programId] option:selected').attr('psid')
- },
- function( json )
- {
- if(json.response=='success')
- {
- showSuccessMessage( i18n_remove_empty_events_success );
- validateSearchEvents( true )
- }
- });
- }
-}
-
-function removeCurrentEvent()
-{
+
+ jQuery( '[name=searchObjectId]' ).append( '<option value="" >[' + i18n_please_select + ']</option>' );
+ for ( i in json.programStageDataElements ) {
+ jQuery( '[name=searchObjectId]' ).append( '<option value="' + json.programStageDataElements[i].id + '" type="' + json.programStageDataElements[i].type + '">' + json.programStageDataElements[i].name + '</option>' );
+ if ( json.programStageDataElements[i].displayInReports == 'true' ) {
+ jQuery( '#displayInReports' ).append( '<option value="' + json.programStageDataElements[i].id + '"></option>' );
+ }
+ }
+
+ enableCriteriaDiv();
+ validateSearchEvents( true );
+ } );
+}
+
+function dataElementOnChange( this_ ) {
+ var container = jQuery( this_ ).parent().parent().attr( 'id' );
+ var element = jQuery( '#' + container + ' [id=searchText]' );
+ var valueType = jQuery( '#' + container + ' [id=searchObjectId] option:selected' ).attr( 'type' );
+
+ if ( valueType == 'date' ) {
+ element.replaceWith( getDateField( container ) );
+ datePickerValid( 'searchText_' + container );
+ return;
+ }
+ else {
+ $( '#searchText_' + container ).datepicker( "destroy" );
+ $( '#' + container + ' [id=dateOperator]' ).replaceWith( "" );
+
+ if ( valueType == 'bool' ) {
+ element.replaceWith( getTrueFalseBox() );
+ }
+ else if ( valueType == 'optionset' ) {
+ element.replaceWith( searchTextBox );
+ autocompletedFilterField( container + " [id=searchText]", jQuery( this_ ).val() );
+ }
+ else if ( valueType == 'username' ) {
+ autocompletedUsernameField( jQuery( this ).attr( 'id' ) );
+ }
+ else {
+ element.replaceWith( searchTextBox );
+ }
+ }
+}
+
+function autocompletedFilterField( idField, searchObjectId ) {
+ var input = jQuery( "#" + idField );
+ input.css( "width", "237px" );
+ input.autocomplete( {
+ delay: 0,
+ minLength: 0,
+ source: function ( request, response ) {
+ $.ajax( {
+ url: "getOptions.action?id=" + searchObjectId + "&query=" + input.val(),
+ dataType: "json",
+ success: function ( data ) {
+ response( $.map( data.options, function ( item ) {
+ return {
+ label: item.o,
+ id: item.o
+ };
+ } ) );
+ }
+ } );
+ },
+ select: function ( event, ui ) {
+ input.val( ui.item.value );
+ input.autocomplete( "close" );
+ }
+ } )
+ .addClass( "ui-widget" );
+
+ input.data( "autocomplete" )._renderItem = function ( ul, item ) {
+ return $( "<li></li>" )
+ .data( "item.autocomplete", item )
+ .append( "<a>" + item.label + "</a>" )
+ .appendTo( ul );
+ };
+
+ var wrapper = this.wrapper = $( "<span style='width:200px'>" )
+ .addClass( "ui-combobox" )
+ .insertAfter( input );
+
+ var button = $( "<a style='width:20px; margin-bottom:-5px;height:20px;'>" )
+ .attr( "tabIndex", -1 )
+ .attr( "title", i18n_show_all_items )
+ .appendTo( wrapper )
+ .button( {
+ icons: {
+ primary: "ui-icon-triangle-1-s"
+ },
+ text: false
+ } )
+ .addClass( 'small-button' )
+ .click( function () {
+ if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
+ input.autocomplete( "close" );
+ return;
+ }
+ $( this ).blur();
+ input.autocomplete( "search", "" );
+ input.focus();
+ } );
+}
+
+function autocompletedUsernameField( idField ) {
+ var input = jQuery( "#" + idField );
+ input.parent().width( input.width() + 200 );
+ var dataElementId = input.attr( 'id' ).split( '-' )[1];
+
+ input.autocomplete( {
+ delay: 0,
+ minLength: 0,
+ source: function ( request, response ) {
+ $.ajax( {
+ url: "getUsernameList.action?query=" + input.val(),
+ dataType: "json",
+ cache: true,
+ success: function ( data ) {
+ response( $.map( data.usernames, function ( item ) {
+ return {
+ label: item.u,
+ id: item.u
+ };
+ } ) );
+ }
+ } );
+ },
+ minLength: 0,
+ select: function ( event, ui ) {
+ var fieldValue = ui.item.value;
+
+ if ( !dhis2.trigger.invoke( "caseentry-value-selected", [dataElementId, fieldValue] ) ) {
+ input.val( "" );
+ return false;
+ }
+
+ input.val( fieldValue );
+ if ( !unSave ) {
+ saveVal( dataElementId );
+ }
+ input.autocomplete( "close" );
+ },
+ change: function ( event, ui ) {
+ if ( !ui.item ) {
+ var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $( this ).val() ) + "$", "i" ),
+ valid = false;
+ if ( !valid ) {
+ $( this ).val( "" );
+ if ( !unSave )
+ saveVal( dataElementId );
+ input.data( "autocomplete" ).term = "";
+ return false;
+ }
+ }
+ }
+ } )
+ .addClass( "ui-widget" );
+
+ input.data( "autocomplete" )._renderItem = function ( ul, item ) {
+ return $( "<li></li>" )
+ .data( "item.autocomplete", item )
+ .append( "<a>" + item.label + "</a>" )
+ .appendTo( ul );
+ };
+
+ var wrapper = this.wrapper = $( "<span style='width:200px'>" )
+ .addClass( "ui-combobox" )
+ .insertAfter( input );
+
+ var button = $( "<a style='width:20px; margin-bottom:-5px;height:20px;'>" )
+ .attr( "tabIndex", -1 )
+ .attr( "title", i18n_show_all_items )
+ .appendTo( wrapper )
+ .button( {
+ icons: {
+ primary: "ui-icon-triangle-1-s"
+ },
+ text: false
+ } )
+ .addClass( 'small-button' )
+ .click( function () {
+ if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
+ input.autocomplete( "close" );
+ return;
+ }
+ $( this ).blur();
+ input.autocomplete( "search", "" );
+ input.focus();
+ } );
+}
+
+function removeAllAttributeOption() {
+ jQuery( '#advancedSearchTB tbody tr' ).each( function ( i, item ) {
+ if ( i > 0 ) {
+ jQuery( item ).remove();
+ }
+ } )
+}
+
+function validateSearchEvents( listAll ) {
+ listAll = eval( listAll );
+ setFieldValue( 'listAll', listAll );
+
+ var flag = true;
+ if ( !listAll ) {
+ if ( getFieldValue( 'startDate' ) == "" || getFieldValue( 'endDate' ) == "" ) {
+ showWarningMessage( i18n_specify_a_date );
+ flag = false;
+ }
+
+ if ( flag && !listAll && jQuery( '#filterBtn' ).attr( "disabled" ) == "disabled" ) {
+ jQuery( '#advancedSearchTB tr' ).each( function ( index, row ) {
+ if ( index > 1 ) {
+ jQuery( row ).find( ':input' ).each( function ( idx, item ) {
+ var input = jQuery( item );
+ if ( input.attr( 'type' ) != 'button' && idx == 0 && input.val() == '' ) {
+ showWarningMessage( i18n_specify_data_element );
+ flag = false;
+ }
+ } )
+ }
+ } );
+ }
+ }
+
+ if ( flag ) {
+ searchEvents( listAll );
+ }
+}
+
+function searchEvents( listAll ) {
+ hideById( 'dataEntryInfor' );
+ hideById( 'listDiv' );
+
+ var params = '';
+ jQuery( '#displayInReports option' ).each( function ( i, item ) {
+ var input = jQuery( item );
+ params += '&searchingValues=de_' + input.val() + '_false_';
+ } );
+
+ if ( listAll ) {
+ params += '&startDate=';
+ params += '&endDate=';
+ }
+ else {
+ var value = '';
+ var searchingValue = '';
+ params += '&startDate=' + getFieldValue( 'startDate' );
+ params += '&endDate=' + getFieldValue( 'endDate' );
+ if ( byId( "incompleted" ).checked ) {
+ params += '&useCompletedEvents=false';
+ }
+ jQuery( '#advancedSearchTB tr' ).each( function ( index, row ) {
+ if ( index > 1 ) {
+ jQuery( row ).find( ':input' ).each( function ( idx, item ) {
+ var input = jQuery( item );
+ if ( input.attr( 'type' ) != 'button' ) {
+ if ( idx == 0 && input.val() != '' ) {
+ searchingValue = 'de_' + input.val() + '_false_';
+ }
+ else if ( input.val() != '' ) {
+ value += jQuery.trim( input.val() ).toLowerCase();
+ }
+ }
+ } );
+
+ if ( value != '' ) {
+ searchingValue += getValueFormula( value );
+ params += '&searchingValues=' + searchingValue;
+ }
+ searchingValue = '';
+ value = '';
+ }
+ } )
+ }
+
+ params += '&facilityLB=selected';
+ params += '&level=0';
+ params += '&orgunitIds=' + getFieldValue( 'orgunitId' );
+ params += '&programStageId=' + jQuery( '#programId option:selected' ).attr( 'psid' );
+ params += '&orderByOrgunitAsc=false';
+ params += '&userOrganisationUnit=false';
+ params += '&userOrganisationUnitChildren=false';
+
+ contentDiv = 'listDiv';
+ showLoader();
+
+ $.ajax( {
+ type: "POST",
+ url: 'searchProgramStageInstances.action',
+ data: params,
+ success: function ( html ) {
+ hideById( 'dataEntryInfor' );
+ setInnerHTML( 'listDiv', html );
+
+ var searchInfor = (listAll) ? i18n_list_all_events : i18n_search_events_by_dataelements;
+ setInnerHTML( 'searchInforTD', searchInfor );
+
+ if ( !listAll && jQuery( '#filterBtn' ).attr( "disabled" ) == "disabled" ) {
+ showById( 'minimized-advanced-search' );
+ hideById( 'advanced-search' );
+ }
+ else {
+ hideById( 'minimized-advanced-search' );
+ hideById( 'advanced-search' );
+ showById( 'filterBtn' );
+ }
+
+ showById( 'listDiv' );
+ hideById( 'loaderDiv' );
+ }
+ } );
+}
+
+function getValueFormula( value ) {
+ if ( value.indexOf( '"' ) != value.lastIndexOf( '"' ) ) {
+ value = value.replace( /"/g, "'" );
+ }
+ // if key is [xyz] && [=xyz]
+ if ( value.indexOf( "'" ) == -1 ) {
+ var flag = value.match( /[>|>=|<|<=|=|!=]+[ ]*/ );
+
+ if ( flag == null ) {
+ value = "='" + value + "'";
+ }
+ else {
+ value = value.replace( flag, flag + "'" );
+ value += "'";
+ }
+ }
+ // if key is ['xyz'] && [='xyz']
+ // if( value.indexOf("'") != value.lastIndexOf("'") )
+ else {
+ var flag = value.match( /[>|>=|<|<=|=|!=]+[ ]*/ );
+
+ if ( flag == null ) {
+ value = "=" + value;
+ }
+ }
+
+ return value;
+}
+
+function removeEvent( programStageId ) {
+ removeItem( programStageId, '', i18n_comfirm_delete_event, 'removeCurrentEncounter.action' );
+}
+
+function showUpdateEvent( programStageInstanceId ) {
+ hideById( 'dataEntryMenu' );
+ showById( 'eventActionMenu' );
+ jQuery( "[name=eventActionLink]" ).hide();
+ hideById( 'selectDiv' );
+ hideById( 'searchDiv' );
+ hideById( 'listDiv' );
+ setFieldValue( 'programStageInstanceId', programStageInstanceId );
+ setInnerHTML( 'dataEntryFormDiv', '' );
+ showLoader();
+
+ $( '#dataEntryFormDiv' ).load( "dataentryform.action",
+ {
+ programStageInstanceId: programStageInstanceId
+ }, function () {
+ jQuery( '#inputCriteriaDiv' ).remove();
+ showById( 'programName' );
+ showById( 'actionDiv' );
+ var programName = jQuery( '#programId option:selected' ).text();
+ var programStageId = jQuery( '#programId option:selected' ).attr( 'psid' );
+ jQuery( '.stage-object-selected' ).attr( 'psid', programStageId );
+ setInnerHTML( 'programName', programName );
+ if ( getFieldValue( 'completed' ) == 'true' ) {
+ disable( "completeBtn" );
+ enable( "uncompleteBtn" );
+ }
+ else {
+ enable( "completeBtn" );
+ disable( "uncompleteBtn" );
+ }
+ hideById( 'loaderDiv' );
+ showById( 'dataEntryInfor' );
+ showById( 'entryFormContainer' );
+
+ jQuery( "#entryForm :input" ).each( function () {
+ if ( ( jQuery( this ).attr( 'options' ) != null && jQuery( this ).attr( 'options' ) == 'true' )
+ || ( jQuery( this ).attr( 'username' ) != null && jQuery( this ).attr( 'username' ) == 'true' ) ) {
+ var input = jQuery( this );
+ input.parent().width( input.width() + 200 );
+ }
+ } );
+ } );
+}
+
+function backEventList() {
+ showById( 'dataEntryMenu' );
+ hideById( 'eventActionMenu' );
+ hideById( 'dataEntryInfor' );
+ hideById( 'programName' );
+ showById( 'selectDiv' );
+ showById( 'searchDiv' );
+ showById( 'listDiv' );
+ searchEvents( eval( getFieldValue( 'listAll' ) ) );
+}
+
+function showAddEventForm() {
+ showById( 'eventActionMenu' );
+ jQuery( "[name=eventActionLink]" ).hide();
+ hideById( 'dataEntryMenu' );
+ setInnerHTML( 'dataEntryFormDiv', '' );
+ setFieldValue( 'executionDate', '' );
+ hideById( 'selectDiv' );
+ hideById( 'searchDiv' );
+ hideById( 'listDiv' );
+ showById( 'programName' );
+ hideById( 'actionDiv' );
+ showById( 'dataEntryInfor' );
+ setFieldValue( 'programStageInstanceId', '0' );
+ byId( 'executionDate' ).style.backgroundColor = "#ffffff";
+ setInnerHTML( 'programName', jQuery( '#programId option:selected' ).text() );
+}
+
+function addNewEvent() {
+ var programStageInstanceId = getFieldValue( 'programStageInstanceId' );
+ var programId = jQuery( '#programId option:selected' ).val();
+ var executionDate = getFieldValue( 'executionDate' );
+ jQuery( "#executionDate" ).css( 'background-color', SAVING_COLOR );
+ jQuery.postJSON( "saveExecutionDate.action",
+ {
+ programStageInstanceId: programStageInstanceId,
+ programId: programId,
+ executionDate: executionDate
+ },
+ function ( json ) {
+ if ( json.response == 'success' ) {
+ jQuery( "#executionDate" ).css( 'background-color', SUCCESS_COLOR );
+ setFieldValue( 'programStageInstanceId', json.message );
+ if ( programStageInstanceId != json.message ) {
+ showUpdateEvent( json.message );
+ }
+ }
+ else {
+ jQuery( "#executionDate" ).css( 'background-color', ERROR_COLOR );
+ showWarningMessage( json.message );
+ }
+ } );
+}
+
+function completedAndAddNewEvent() {
+ doComplete( true );
+}
+
+function removeEmptyEvents() {
+ var result = window.confirm( i18n_confirm_remove_empty_events );
+
+ if ( result ) {
+ jQuery.getJSON( "removeEmptyEvents.action",
+ {
+ programStageId: jQuery( '#selectDiv [id=programId] option:selected' ).attr( 'psid' )
+ },
+ function ( json ) {
+ if ( json.response == 'success' ) {
+ showSuccessMessage( i18n_remove_empty_events_success );
+ validateSearchEvents( true )
+ }
+ } );
+ }
+}
+
+function removeCurrentEvent() {
var result = window.confirm( i18n_comfirm_delete_event );
- if ( result )
- {
- $.postJSON(
- "removeCurrentEncounter.action",
- {
- "id": getFieldValue('programStageInstanceId')
- },
- function( json )
- {
- if ( json.response == "success" )
- {
- backEventList();
- }
- else if ( json.response == "error" )
- {
- showWarningMessage( json.message );
- }
- });
- }
-}
-
-function showFilterForm()
-{
- showById('advanced-search');
- hideById('minimized-advanced-search');
- disable('filterBtn');
- setFieldValue('listAll', false);
-}
-
-function removeAllOption()
-{
- enable('filterBtn');
- jQuery( '#advancedSearchTB tr' ).each( function( i, row ){
- if(i>2){
- jQuery(this).remove();
- }
- else if(i==2){
- jQuery( this ).find(':input').each( function( idx, item ){
- var input = jQuery( item );
- if( input.attr('type') != 'button'){
- input.val('');
- }
- });
- }
- });
- jQuery('#searchObjectId').val("");
- jQuery('#searchText').val("");
- searchEvents( eval(getFieldValue("listAll")) );
+ if ( result ) {
+ $.postJSON(
+ "removeCurrentEncounter.action",
+ {
+ "id": getFieldValue( 'programStageInstanceId' )
+ },
+ function ( json ) {
+ if ( json.response == "success" ) {
+ backEventList();
+ }
+ else if ( json.response == "error" ) {
+ showWarningMessage( json.message );
+ }
+ } );
+ }
+}
+
+function showFilterForm() {
+ showById( 'advanced-search' );
+ hideById( 'minimized-advanced-search' );
+ disable( 'filterBtn' );
+ setFieldValue( 'listAll', false );
+}
+
+function removeAllOption() {
+ enable( 'filterBtn' );
+ jQuery( '#advancedSearchTB tr' ).each( function ( i, row ) {
+ if ( i > 2 ) {
+ jQuery( this ).remove();
+ }
+ else if ( i == 2 ) {
+ jQuery( this ).find( ':input' ).each( function ( idx, item ) {
+ var input = jQuery( item );
+ if ( input.attr( 'type' ) != 'button' ) {
+ input.val( '' );
+ }
+ } );
+ }
+ } );
+ jQuery( '#searchObjectId' ).val( "" );
+ jQuery( '#searchText' ).val( "" );
+ searchEvents( eval( getFieldValue( "listAll" ) ) );
}
=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dhis2.storage.anonymous.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dhis2.storage.anonymous.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dhis2.storage.anonymous.js 2013-03-30 10:45:13 +0000
@@ -0,0 +1,30 @@
+dhis2.storage.Store.plugin( 'anonymous-online', (function () {
+ return {
+ call: function ( args, callback ) {
+ $.ajax( {
+ type: 'POST',
+ url: "anonymousPrograms.action",
+ data: args,
+ dataType: 'json'
+ } ).success( function ( data ) {
+ var arr = data.programs;
+
+ for ( var i = 0; i < arr.length; i++ ) {
+ arr[i].key = arr[i].id;
+ arr[i].programStages = [];
+ arr[i].programStages[0] = {
+ id: arr[i].programStageId,
+ reportDateDescription: arr[i].reportDateDescription
+ };
+
+ delete arr[i].id;
+ delete arr[i].programStageId;
+ delete arr[i].reportDateDescription;
+ delete arr[i].type;
+ }
+
+ if ( callback ) callback( arr );
+ } );
+ }
+ };
+})() );
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.dom.js 2013-03-27 10:32:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.dom.js 2013-03-30 10:45:13 +0000
@@ -72,7 +72,11 @@
var key = keys.pop();
var obj = objs.pop();
- that.add( key, obj );
+ try {
+ that.add( key, obj );
+ } catch ( e ) {
+ break;
+ }
}
if ( callback ) callback.call( that, that );
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.js 2013-02-20 08:03:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.js 2013-03-30 10:45:13 +0000
@@ -70,3 +70,25 @@
obj['id'] = id;
Store.adapters.splice( 0, 0, obj );
};
+
+dhis2.storage.Store.plugins = {};
+
+dhis2.storage.Store.plugin = function ( id, obj ) {
+ var Store = dhis2.storage.Store;
+ var plugin_interface = "call".split( ' ' );
+
+ var missing_functions = [];
+ // verify plugin
+ for ( var i in plugin_interface ) {
+ if ( !obj.hasOwnProperty( plugin_interface[i] ) || typeof obj[plugin_interface[i]] !== 'function' ) {
+ missing_functions.push( plugin_interface[i] );
+ }
+ }
+
+ if ( missing_functions.length > 0 ) {
+ throw 'Plugin\'' + id + '\' does not meet interface requirements, missing: ' + missing_functions.join( ' ' );
+ }
+
+ obj['id'] = id;
+ Store.plugins[id] = obj;
+};
