+ +

$i18n.getString( "name" ):

$i18n.getString( "operator" ):

$i18n.getString( "aggregation_data_element" ):

$i18n.getString( "name" ):

$i18n.getString( "operator" ):

$i18n.getString( "aggregation_data_element" ):

$i18n.getString( "option_combo" ):

$i18n.getString( "data_element_for_sum_avg_min_max" ):

$i18n.getString( "aggregation_expression" ):

$i18n.getString( "data_element_for_sum_avg_min_max" ):

$i18n.getString( "aggregation_expression" ):

+ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationList.vm 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationList.vm 2013-12-16 04:39:49 +0000 @@ -1,10 +1,13 @@ - +#set($mark=false) #foreach( $aggregationCondition in $aggregationConditions ) - - $encoder.htmlEncode( $!aggregationCondition.displayName ) + + $encoder.htmlEncode( $aggregationCondition.displayName ) + +

$i18n.getString( 'translation_translate' )

+ -#end + #set($mark=!$mark) +#end \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2013-12-16 04:39:49 +0000 @@ -1,502 +1,552 @@ + //------------------------------------------------------------------------------ // Get dataelements by dataset //------------------------------------------------------------------------------ -function getDataElementsByDataset() { - var dataSets = document.getElementById('dataSets'); - var dataSetId = dataSets.options[ dataSets.selectedIndex ].value; - setFieldValue('aggregationDataElementId', ''); - setFieldValue('aggregationDataElementInput', ''); - - if( dataSetId == "" ) { - disable('dataElementsButton'); - setFieldValue('aggregationDataElementInput', ''); - return; - } - autoCompletedField(); +function getDataElementsByDataset() +{ + var dataSets = document.getElementById( 'dataSets' ); + var dataSetId = dataSets.options[ dataSets.selectedIndex ].value; + setFieldValue('aggregationDataElementId',''); + setFieldValue('aggregationDataElementInput',''); + + if( dataSetId == "" ){ + disable( 'dataElementsButton' ); + setFieldValue( 'aggregationDataElementInput',''); + return; + } + autoCompletedField(); } -function autoCompletedField() { - $("#dataElementsButton").unbind('click'); - enable('dataElementsButton'); - - var input = jQuery("#aggregationDataElementInput") - .autocomplete({ - delay: 0, - minLength: 0, - source: function( request, response ) { - $.ajax({ - url: "getDataElementsByDataset.action?id=" + getFieldValue('dataSets') + "&query=" + input.val(), - dataType: "json", - success: function( data ) { - response($.map(data.dataElements, function( item ) { - return { - label: item.name, - id: item.id - }; - })); - } - }); - }, - select: function( event, ui ) { - input.val(ui.item.value); - setFieldValue('aggregationDataElementId', ui.item.id); - input.autocomplete("close"); - }, - change: function( event, ui ) { - if( !ui.item ) { - var matcher = new RegExp("^" + $.ui.autocomplete.escapeRegex($(this).val()) + "$", "i"), - valid = false; - select.children("option").each(function() { - if( $(this).text().match(matcher) ) { - this.selected = valid = true; - return false; - } - }); - if( !valid ) { - // remove invalid value, as it didn't match anything - $(this).val(""); - select.val(""); - input.data("autocomplete").term = ""; - return false; - } - } - } - }).addClass("ui-widget"); - - input.data("autocomplete")._renderItem = function( ul, item ) { - return $("

") - .data("item.autocomplete", item) - .append("" + item.label + "") - .appendTo(ul); - }; - - var wrapper = this.wrapper = $("") - .addClass("ui-combobox") - .insertAfter(input); - - var button = $("#dataElementsButton") - .attr("tabIndex", -1) - .attr("title", i18n_show_all_items) - .appendTo(wrapper) - .button({ - icons: { - primary: "ui-icon-triangle-1-s" - }, - text: false - }) - .click(function() { - // close if already visible - if( input.autocomplete("widget").is(":visible") ) { - input.autocomplete("close"); - return; - } - // work around a bug (likely same cause as #5265) - $(this).blur(); - // pass empty string as value to search for, displaying all results - input.autocomplete("search", ""); - input.focus(); - }); +function autoCompletedField() +{ + $( "#dataElementsButton" ).unbind('click'); + enable( 'dataElementsButton' ); + + var input = jQuery( "#aggregationDataElementInput" ) + .autocomplete({ + delay: 0, + minLength: 0, + source: function( request, response ){ + $.ajax({ + url: "getDataElementsByDataset.action?id=" + getFieldValue('dataSets') + "&query=" + input.val(), + dataType: "json", + success: function(data) { + response($.map(data.dataElements, function(item) { + return { + label: item.name, + id: item.id + }; + })); + } + }); + }, + select: function( event, ui ) { + input.val(ui.item.value); + setFieldValue('aggregationDataElementId',ui.item.id); + input.autocomplete( "close" ); + }, + change: function( event, ui ) { + if ( !ui.item ) { + var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ), + valid = false; + select.children( "option" ).each(function() { + if ( $( this ).text().match( matcher ) ) { + this.selected = valid = true; + return false; + } + }); + if ( !valid ) { + // remove invalid value, as it didn't match anything + $( this ).val( "" ); + select.val( "" ); + input.data( "autocomplete" ).term = ""; + return false; + } + } + } + }).addClass( "ui-widget" ); + + input.data( "autocomplete" )._renderItem = function( ul, item ) { + return $( "

" ) + .data( "item.autocomplete", item ) + .append( "" + item.label + "" ) + .appendTo( ul ); + }; + + var wrapper = this.wrapper = $( "" ) + .addClass( "ui-combobox" ) + .insertAfter( input ); + + var button = $( "#dataElementsButton" ) + .attr( "tabIndex", -1 ) + .attr( "title", i18n_show_all_items ) + .appendTo( wrapper ) + .button({ + icons: { + primary: "ui-icon-triangle-1-s" + }, + text: false + }) + .click(function() { + // close if already visible + if ( input.autocomplete( "widget" ).is( ":visible" ) ) { + input.autocomplete( "close" ); + return; + } + // work around a bug (likely same cause as #5265) + $( this ).blur(); + // pass empty string as value to search for, displaying all results + input.autocomplete( "search", "" ); + input.focus(); + }); } //------------------------------------------------------------------------------ // Get Program Stages //------------------------------------------------------------------------------ -function getParams() { - clearListById('programStageId'); - clearListById('dataElements'); - clearListById('caseProperty'); - var programId = getFieldValue('programId'); - if( programId == '' ) { - var caseProperty = jQuery('#caseProperty'); - caseProperty.append(''); - caseProperty.append(''); - caseProperty.append(''); - caseProperty.append(''); - - disable('programProperty'); - disable('programStageProperty'); - } - - if( jQuery('#programId option:selected').attr('programType') == 3 ) { - jQuery("[name=multiProgram]").remove(); - if( jQuery("[value=times]").attr('checked') != undefined - && jQuery("[value=times]").attr('checked') != 'true' ) { - jQuery("[value=times]").attr('checked', true); - } - } - - jQuery.getJSON('getParamsByProgram.action', { programId: programId } - , function( json ) { - enable('programProperty'); - var programstage = jQuery('#programStageId'); - - for( i in json.programStages ) { - var id = json.programStages[i].id; - var formularId = "[PS:" + id + "]"; - var name = json.programStages[i].name; - - programstage.append(""); - } - - if( json.programStages.length > 1 ) { - programstage.prepend(""); - } - byId('programStageId').options[0].selected = true; - getPatientDataElements(); - - clearListById('caseProperty'); - var type = jQuery('#programId option:selected').attr('programType'); - if( type != '3' ) { - var caseProperty = jQuery('#caseProperty'); - for( i in json.fixedAttributes ) { - var id = json.fixedAttributes[i].id; - var name = json.fixedAttributes[i].name; - - caseProperty.append(""); - } - - for( i in json.patientAttributes ) { - var id = json.patientAttributes[i].id; - var name = json.patientAttributes[i].name; - var suggested = json.patientAttributes[i].suggested; - - caseProperty.append(""); - } - } - }); +function getParams() +{ + clearListById( 'programStageId' ); + clearListById( 'dataElements' ); + clearListById('caseProperty'); + var programId = getFieldValue( 'programId' ); + if( programId == ''){ + var caseProperty = jQuery( '#caseProperty' ); + caseProperty.append( '' ); + caseProperty.append( '' ); + caseProperty.append( '' ); + caseProperty.append( '' ); + + disable('programProperty'); + disable('programStageProperty'); + } + + if(jQuery('#programId option:selected').attr('programType')==3){ + jQuery("[name=multiProgram]").remove(); + if( jQuery("[value=times]").attr('checked')!=undefined + && jQuery("[value=times]").attr('checked')!='true' ) + { + jQuery("[value=times]").attr('checked',true); + } + } + + jQuery.getJSON( 'getParamsByProgram.action',{ programId:programId } + ,function( json ) + { + enable('programProperty'); + var programstage = jQuery('#programStageId'); + + for ( i in json.programStages ) + { + var id = json.programStages[i].id; + var formularId = "[PS:" + id + "]"; + var name = json.programStages[i].name; + + programstage.append( "" ); + } + + if( json.programStages.length > 1 ) + { + programstage.prepend( "" ); + } + byId('programStageId').options[0].selected = true; + getPatientDataElements(); + + clearListById( 'caseProperty' ); + var type = jQuery('#programId option:selected').attr('programType'); + if( type!='3') + { + var caseProperty = jQuery( '#caseProperty' ); + for ( i in json.fixedAttributes ) + { + var id = json.fixedAttributes[i].id; + var name = json.fixedAttributes[i].name; + + caseProperty.append( "" ); + } + + for ( i in json.patientAttributes ) + { + var id = json.patientAttributes[i].id; + var name = json.patientAttributes[i].name; + var suggested = json.patientAttributes[i].suggested; + + caseProperty.append( "" ); + } + } + }); } -function getProgramStages() { - var programId = getFieldValue('orgunitProgramId'); - if( programId == '' ) return; - - clearListById('orgunitProgramStageId'); - - jQuery.getJSON('getProgramStages.action', { id: programId } - , function( json ) { - enable('programProperty'); - var programstage = jQuery('#orgunitProgramStageId'); - - for( i in json.programStages ) { - var id = json.programStages[i].id; - var formularId = "[PSIC:" + id + "]"; - var name = json.programStages[i].name; - - programstage.append(""); - } - }); +function getProgramStages() +{ + var programId = getFieldValue( 'orgunitProgramId' ); + if(programId=='') return; + + clearListById( 'orgunitProgramStageId' ); + + jQuery.getJSON( 'getProgramStages.action',{ id:programId } + ,function( json ) + { + enable('programProperty'); + var programstage = jQuery('#orgunitProgramStageId'); + + for ( i in json.programStages ) + { + var id = json.programStages[i].id; + var formularId = "[PSIC:" + id + "]"; + var name = json.programStages[i].name; + + programstage.append( "" ); + } + }); } //------------------------------------------------------------------------------ // Get DataElements of Program-Stage //------------------------------------------------------------------------------ -function getPatientDataElements() { - clearListById('dataElements'); - clearListById('dataElementBackups'); - clearListById('deSumId'); - var programStageId = getFieldValue('programStageId'); - - jQuery.getJSON('getPatientDataElements.action', - { - programId: getFieldValue('programId'), - programStageId: programStageId - } - , function( json ) { - if( programStageId != '' ) { - enable('programStageProperty'); - } - else { - disable('programStageProperty'); - } - - var dataElements = jQuery('#dataElements'); - var dataElementBackups = jQuery('#dataElementBackups'); - clearListById('dataElements'); - clearListById('dataElementBackups'); - var deSumId = jQuery('#deSumId'); - deSumId.append(""); - for( i in json.dataElements ) { - dataElements.append(""); - dataElementBackups.append(""); - if( json.dataElements[i].type == 'int' ) { - deSumId.append(""); - } - } - - }); +function getPatientDataElements() +{ + clearListById( 'dataElements' ); + clearListById( 'dataElementBackups' ); + clearListById( 'deSumId' ); + var programStageId = getFieldValue('programStageId'); + + jQuery.getJSON( 'getPatientDataElements.action', + { + programId:getFieldValue( 'programId' ), + programStageId:programStageId + } + ,function( json ) + { + if( programStageId!='' ){ + enable('programStageProperty'); + } + else{ + disable('programStageProperty'); + } + + var dataElements = jQuery('#dataElements'); + var dataElementBackups = jQuery('#dataElementBackups'); + clearListById( 'dataElements' ); + clearListById( 'dataElementBackups' ); + var deSumId = jQuery('#deSumId'); + deSumId.append( "" ); + for ( i in json.dataElements ) + { + dataElements.append( "" ); + dataElementBackups.append( "" ); + if( json.dataElements[i].type=='int') + { + deSumId.append( "" ); + } + } + + }); } //----------------------------------------------------------------- // Insert items into Condition //----------------------------------------------------------------- -function insertDataElement( element ) { - var progamId = getFieldValue('programId'); - var programStageId = getFieldValue('programStageId'); - programStageId = ( programStageId == "" ) ? "*" : programStageId; - var dataElementId = element.options[element.selectedIndex].value; - - insertTextCommon('aggregationCondition', "[DE:" + progamId + "." + programStageId + "." + dataElementId + "]"); - getConditionDescription(); -} - -function insertInfo( element, isProgramStageProperty ) { - var id = ""; - if( isProgramStageProperty ) { - id = getFieldValue('programStageId'); - } - else { - id = getFieldValue('programId'); - } - - value = element.options[element.selectedIndex].value.replace('*', id); - insertTextCommon('aggregationCondition', value); - getConditionDescription(); -} - -function insertOperator( value ) { - insertTextCommon('aggregationCondition', ' ' + value + ' '); - getConditionDescription(); -} - -function insertBoolValue( value ) { - insertTextCommon("aggregationCondition", " ='" + value + "' "); - getConditionDescription(); +function insertDataElement( element ) +{ + var progamId = getFieldValue('programId'); + var programStageId = getFieldValue('programStageId'); + programStageId = ( programStageId == "" ) ? "*" : programStageId; + var dataElementId = element.options[element.selectedIndex].value; + + insertTextCommon( 'aggregationCondition', "[DE:" + progamId + "." + programStageId + "." + dataElementId + "]" ); + getConditionDescription(); +} + +function insertInfo( element, isProgramStageProperty ) +{ + var id = ""; + if( isProgramStageProperty ) + { + id = getFieldValue('programStageId'); + } + else + { + id = getFieldValue('programId'); + } + + value = element.options[element.selectedIndex].value.replace( '*', id ); + insertTextCommon('aggregationCondition', value ); + getConditionDescription(); +} + +function insertOperator( value ) +{ + insertTextCommon('aggregationCondition', ' ' + value + ' ' ); + getConditionDescription(); +} + +function insertBoolValue( value ) +{ + insertTextCommon("aggregationCondition", " ='" + value + "' " ); + getConditionDescription(); } // ----------------------------------------------------------------------------- // Remove Case Aggregation Condition // ----------------------------------------------------------------------------- -function removeCaseAggregation( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeCaseAggregation.action'); -} - -// ----------------------------------------------------------------------------- -// View details -// ----------------------------------------------------------------------------- - -function showUpdateCaseAggregationForm( context ) { - location.href = 'showUpdateCaseAggregationForm.action?id=' + context.id; -} - -function showCaseAggregationDetails( context ) { - jQuery.getJSON('getCaseAggregation.action', { id: context.id }, function( json ) { - setInnerHTML('nameField', json.caseAggregation.name); - setInnerHTML('operatorField', json.caseAggregation.operator); - setInnerHTML('aggregationDataElementField', json.caseAggregation.aggregationDataElement); - setInnerHTML('optionComboField', json.caseAggregation.optionCombo); - setInnerHTML('aggregationExpressionField', json.caseAggregation.aggregationExpression); - setInnerHTML('deSumField', json.caseAggregation.deSum); - showDetails(); - }); -} - -// ----------------------------------------------------------------------------- -// View details -// ----------------------------------------------------------------------------- - -function getConditionDescription() { - $.postUTF8('getCaseAggregationDescription.action', - { - condition: getFieldValue('aggregationCondition') - }, function( data ) { - byId('aggregationDescription').innerHTML = data; - }, 'html'); +function removeCaseAggregation( caseAggregationId, caseAggregationName ) +{ + removeItem( caseAggregationId, caseAggregationName, i18n_confirm_delete, 'removeCaseAggregation.action' ); +} + +// ----------------------------------------------------------------------------- +// View details +// ----------------------------------------------------------------------------- + +function showCaseAggregationDetails( caseAggregationId ) +{ + jQuery.getJSON( 'getCaseAggregation.action', { id:caseAggregationId }, function ( json ) + { + setInnerHTML( 'nameField', json.caseAggregation.name ); + setInnerHTML( 'operatorField', json.caseAggregation.operator ); + setInnerHTML( 'aggregationDataElementField', json.caseAggregation.aggregationDataElement ); + setInnerHTML( 'optionComboField', json.caseAggregation.optionCombo ); + setInnerHTML( 'aggregationExpressionField', json.caseAggregation.aggregationExpression ); + setInnerHTML( 'deSumField', json.caseAggregation.deSum ); + showDetails(); + }); +} + +// ----------------------------------------------------------------------------- +// View details +// ----------------------------------------------------------------------------- + +function getConditionDescription() +{ + $.postUTF8( 'getCaseAggregationDescription.action', + { + condition:getFieldValue('aggregationCondition') + },function (data) + { + byId('aggregationDescription').innerHTML = data; + },'html'); } // ----------------------------------------------------------------------------- // Test condition // ----------------------------------------------------------------------------- -function testCaseAggregationCondition() { - var operator = jQuery('[name=operator]:checked').val(); - $.postUTF8('testCaseAggregationCondition.action', - { - condition: getFieldValue('aggregationCondition'), - deSumId: getFieldValue('deSumId'), - operator: operator - }, function( json ) { - var type = json.response; - - if( type == "input" ) { - showWarningMessage(i18n_run_fail); - } - else { - showSuccessMessage(i18n_run_success); - } - }); -} - -function getSuggestedValues( sourceId, targetId ) { - clearListById(targetId); - - var suggestedValues = jQuery('select[id=' + sourceId + '] option:selected').attr('suggested'); - if( suggestedValues ) { - var arrValues = new Array(); - arrValues = suggestedValues.replace(/[//[]+/g, '').replace(/]/g, '').split(', '); - - var suggestedValueSelector = byId(targetId); - for( var i = 0; i < arrValues.length; i++ ) { - var option = document.createElement("option"); - var value = jQuery.trim(arrValues[i]); - option.value = "'" + value + "'"; - option.text = value; - option.title = value; - - suggestedValueSelector.add(option, null); - } - } -} - -function insertSingleValue( elementId ) { - var element = byId(elementId); - insertTextCommon('aggregationCondition', "=" + element.options[element.selectedIndex].value); - getConditionDescription(); -} - -function insertMultiValues( elementId ) { - var list = jQuery('select[id=' + elementId + '] option:selected') - if( list.length == 0 ) { - return; - } - if( list.length > 1 ) { - var selectedValues = ""; - list.each(function() { - selectedValues += jQuery(this).val() + ", "; - }); - selectedValues = " IN @ " + selectedValues.substring(0, selectedValues.length - 2) + " #"; - - insertTextCommon('aggregationCondition', selectedValues); - getConditionDescription(); - } - else { - insertSingleValue(elementId); - } -} - -function getCaseAggConditionByDataset() { - $.get('getCaseAggConditionByDataset.action', - { - dataSetId: getFieldValue('dataSetId') - } - , function( html ) { - setTableStyles(); - setInnerHTML('list', html); - }); -} - -function showAddCaseAggregationForm() { - window.location.href = 'showAddCaseAggregationForm.action?dataSetId=' + getFieldValue('dataSetId'); -} - -function operatorOnchange( operator ) { - if( operator == 'sum' || operator == 'avg' - || operator == 'min' || operator == 'max' ) { - enable('deSumId'); - } - else { - disable('deSumId'); - } -} - -function filterDataElement( event, value, fieldName, backupFieldsName ) { - // Remove all options in data element fields - var field = jQuery('#' + fieldName + " option ").remove(); - var valueType = getFieldValue('deValueType'); - - jQuery('#' + backupFieldsName + " option ").each(function() { - var option = jQuery(this); - if( valueType == '' || valueType == option.attr('valueType') ) { - if( value.length == 0 ) { - jQuery('#' + fieldName).append(""); - } - else if( option.text().toLowerCase().indexOf(value.toLowerCase()) != -1 ) { - jQuery('#' + fieldName).append(""); - } - } - }); - -} - -function sortByOnChange( sortBy ) { - if( sortBy == 1 ) { - jQuery('#dataElements').each(function() { - - // Keep track of the selected option. - var selectedValue = $(this).val(); - - // sort it out - $(this).html($("option", $(this)).sort(function( a, b ) { - return $(a).attr('dename') == $(b).attr('dename') ? 0 : $(a).attr('dename') < $(b).attr('dename') ? -1 : 1 - })); - - // Select one option. - $(this).val(selectedValue); - - }); - } - else { - jQuery('#dataElements').each(function() { - - // Keep track of the selected option. - var selectedValue = $(this).val(); - - // sort it out - $(this).html($("option", $(this)).sort(function( a, b ) { - return $(a).attr('decode') == $(b).attr('decode') ? 0 : $(a).attr('decode') < $(b).attr('decode') ? -1 : 1 - })); - - // Select one option. - $(this).val(selectedValue); - - }); - } -} - -function displayNameOnChange( displayName ) { - // display - name - if( displayName == '1' ) { - jQuery('#dataElements option').each(function() { - var item = jQuery(this); - item[0].text = item.attr('dename'); - item[0].title = item[0].text; - }); - jQuery('#dataElementBackups option').each(function() { - var item = jQuery(this); - item[0].text = item.attr('dename'); - }); - } - // display - code - else if( displayName == '2' ) { - jQuery('#dataElements option').each(function() { - var item = jQuery(this); - item[0].text = item.attr('decode'); - item[0].title = item[0].text; - }); - jQuery('#dataElementBackups option').each(function() { - var item = jQuery(this); - item[0].text = item.attr('decode'); - }); - } - // display - code and name - else { - jQuery('#dataElements option').each(function() { - var item = jQuery(this); - item[0].text = "(" + item.attr('decode') + ") " + item.attr('dename'); - item[0].title = item[0].text; - }); - jQuery('#dataElementBackups option').each(function() { - var item = jQuery(this); - item[0].text = "(" + item.attr('decode') + ") " + item.attr('dename'); - }); - } -} - -function cancelOnClick() { - var dataSetId = getFieldValue("dataSets"); - window.location.href = 'caseAggregation.action?dataSetId=' + dataSetId; +function testCaseAggregationCondition() +{ + var operator = jQuery('[name=operator]:checked').val(); + $.postUTF8( 'testCaseAggregationCondition.action', + { + condition: getFieldValue('aggregationCondition'), + deSumId: getFieldValue('deSumId'), + operator: operator + },function (json) + { + var type = json.response; + + if ( type == "input" ) + { + showWarningMessage( i18n_run_fail ); + } + else + { + showSuccessMessage( i18n_run_success ); + } + }); +} + +function getSuggestedValues( sourceId, targetId ) +{ + clearListById( targetId ); + + var suggestedValues = jQuery('select[id=' + sourceId + '] option:selected').attr('suggested'); + if( suggestedValues ) + { + var arrValues = new Array(); + arrValues = suggestedValues.replace(/[//[]+/g,'').replace(/]/g, '').split(', '); + + var suggestedValueSelector = byId( targetId ); + for( var i=0; i< arrValues.length; i++ ) + { + var option = document.createElement("option"); + var value = jQuery.trim( arrValues[i] ); + option.value = "'" + value + "'"; + option.text = value; + option.title = value; + + suggestedValueSelector.add(option, null); + } + } +} + +function insertSingleValue( elementId ) +{ + var element = byId( elementId ); + insertTextCommon('aggregationCondition', "=" + element.options[element.selectedIndex].value ); + getConditionDescription(); +} + +function insertMultiValues( elementId ) +{ + var list = jQuery('select[id=' + elementId + '] option:selected') + if( list.length == 0 ) + { + return; + } + if( list.length > 1 ) + { + var selectedValues = ""; + list.each(function(){ + selectedValues += jQuery(this).val() + ", "; + }); + selectedValues = " IN @ " + selectedValues.substring( 0, selectedValues.length - 2) + " #"; + + insertTextCommon('aggregationCondition', selectedValues ); + getConditionDescription(); + } + else + { + insertSingleValue( elementId ); + } +} + +function getCaseAggConditionByDataset() +{ + $.get( 'getCaseAggConditionByDataset.action', + { + dataSetId: getFieldValue( 'dataSetId' ) + } + , function( html ) + { + setTableStyles(); + setInnerHTML('list', html ); + } ); +} + +function showAddCaseAggregationForm() +{ + window.location.href='showAddCaseAggregationForm.action?dataSetId=' + getFieldValue( 'dataSetId' ); +} + +function operatorOnchange(operator) +{ + if( operator=='sum' || operator=='avg' + || operator=='min' || operator=='max' ){ + enable('deSumId'); + } + else{ + disable('deSumId'); + } +} + +function filterDataElement( event, value, fieldName, backupFieldsName ) +{ + // Remove all options in data element fields + var field = jQuery('#' + fieldName + " option " ).remove(); + var valueType = getFieldValue('deValueType'); + + jQuery('#' + backupFieldsName + " option ").each( function(){ + var option = jQuery(this); + if (valueType=='' || valueType == option.attr('valueType') ) + { + if(value.length == 0 ) + { + jQuery('#' + fieldName ).append( "" ); + } + else if (option.text().toLowerCase().indexOf( value.toLowerCase() ) != -1 ) + { + jQuery('#' + fieldName ).append( "" ); + } + } + }); + +} + +function sortByOnChange( sortBy ) +{ + if( sortBy == 1) + { + jQuery('#dataElements').each(function() { + + // Keep track of the selected option. + var selectedValue = $(this).val(); + + // sort it out + $(this).html($("option", $(this)).sort(function(a, b) { + return $(a).attr('dename') == $(b).attr('dename') ? 0 : $(a).attr('dename') < $(b).attr('dename') ? -1 : 1 + })); + + // Select one option. + $(this).val(selectedValue); + + }); + } + else + { + jQuery('#dataElements').each(function() { + + // Keep track of the selected option. + var selectedValue = $(this).val(); + + // sort it out + $(this).html($("option", $(this)).sort(function(a, b) { + return $(a).attr('decode') == $(b).attr('decode') ? 0 : $(a).attr('decode') < $(b).attr('decode') ? -1 : 1 + })); + + // Select one option. + $(this).val(selectedValue); + + }); + } +} + +function displayNameOnChange( displayName ) +{ + // display - name + if(displayName=='1'){ + jQuery('#dataElements option').each(function(){ + var item = jQuery(this); + item[0].text = item.attr('dename'); + item[0].title = item[0].text; + }); + jQuery('#dataElementBackups option').each(function(){ + var item = jQuery(this); + item[0].text = item.attr('dename'); + }); + } + // display - code + else if(displayName=='2'){ + jQuery('#dataElements option').each(function(){ + var item = jQuery(this); + item[0].text = item.attr('decode'); + item[0].title = item[0].text; + }); + jQuery('#dataElementBackups option').each(function(){ + var item = jQuery(this); + item[0].text = item.attr('decode'); + }); + } + // display - code and name + else{ + jQuery('#dataElements option').each(function(){ + var item = jQuery(this); + item[0].text = "(" + item.attr('decode') + ") " + item.attr('dename'); + item[0].title = item[0].text; + }); + jQuery('#dataElementBackups option').each(function(){ + var item = jQuery(this); + item[0].text = "(" + item.attr('decode') + ") " + item.attr('dename'); + }); + } +} + +function cancelOnClick() +{ + var dataSetId = getFieldValue("dataSets"); + window.location.href='caseAggregation.action?dataSetId=' + dataSetId; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-12-05 11:31:19 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-12-16 04:39:49 +0000 @@ -1,21 +1,10 @@ - -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdatePatientAttributeForm( context ) { - location.href = 'showUpdatePatientAttributeForm.action?id=' + context.id; -} - -function showPatientAttributeDetails( context ) { - jQuery.getJSON( 'getPatientAttribute.action', { id: context.id }, +function showPatientAttributeDetails( patientAttributeId ) +{ + jQuery.getJSON( 'getPatientAttribute.action', { id: patientAttributeId }, function ( json ) { setInnerHTML( 'nameField', json.patientAttribute.name ); setInnerHTML( 'descriptionField', json.patientAttribute.description ); @@ -48,9 +37,9 @@ // Remove Patient Attribute // ----------------------------------------------------------------------------- -function removePatientAttribute( context ) +function removePatientAttribute( patientAttributeId, name ) { - removeItem( context.id, context.name, i18n_confirm_delete, 'removePatientAttribute.action' ); + removeItem( patientAttributeId, name, i18n_confirm_delete, 'removePatientAttribute.action' ); } ATTRIBUTE_OPTION = === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2013-12-05 11:31:19 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2013-12-16 04:39:49 +0000 @@ -1,33 +1,24 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdatePatientAttributeGroupForm( context ) { - location.href = 'showUpdatePatientAttributeGroupForm.action?id=' + context.id; -} - -function showPatientAttributeGroupDetails( context ) { - jQuery.getJSON('getPatientAttributeGroup.action', { id: context.id }, - function( json ) { - setInnerHTML('nameField', json.patientAttributeGroup.name); - setInnerHTML('descriptionField', json.patientAttributeGroup.description); - setInnerHTML('noAttributeField', json.patientAttributeGroup.noAttribute); - - showDetails(); - }); +function showPatientAttributeGroupDetails( patientAttributeGroupId ) +{ + jQuery.getJSON( 'getPatientAttributeGroup.action', { id: patientAttributeGroupId }, + function ( json ) { + setInnerHTML( 'nameField', json.patientAttributeGroup.name ); + setInnerHTML( 'descriptionField', json.patientAttributeGroup.description ); + setInnerHTML( 'noAttributeField', json.patientAttributeGroup.noAttribute ); + + showDetails(); + }); } // ----------------------------------------------------------------------------- // Remove Patient Attribute // ----------------------------------------------------------------------------- -function removePatientAttributeGroup( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removePatientAttributeGroup.action'); -} +function removePatientAttributeGroup( patientAttributeGroupId, name ) +{ + removeItem( patientAttributeGroupId, name, i18n_confirm_delete, 'removePatientAttributeGroup.action' ); +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2013-12-05 12:21:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2013-12-16 04:39:49 +0000 @@ -1,54 +1,48 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdatePatientIdentifierTypeForm( context ) { - location.href = 'showUpdatePatientIdentifierTypeForm.action?id=' + context.id; -} - -function showPatientIdentifierTypeDetails( context ) { - jQuery.getJSON('getPatientIdentifierType.action', { id: context.id }, - function( json ) { - setInnerHTML('nameField', json.patientIdentifierType.name); - setInnerHTML('descriptionField', json.patientIdentifierType.description); - - var boolValueMap = { 'true': i18n_yes, 'false': i18n_no }; - var boolType = json.patientIdentifierType.mandatory; - setInnerHTML('mandatoryField', boolValueMap[boolType]); - - boolType = json.patientIdentifierType.related; - setInnerHTML('relatedField', boolValueMap[boolType]); - setInnerHTML('noCharsField', json.patientIdentifierType.noChars); - - var valueTypeMap = { 'string': i18n_string, 'number': i18n_number, 'letter': i18n_letter_only, 'orgunitCount': i18n_orgunit_count }; - var valueType = json.patientIdentifierType.type; - setInnerHTML('typeField', valueTypeMap[valueType]); - - showDetails(); - }); +function showPatientIdentifierTypeDetails( patientIdentifierTypeId ) +{ + jQuery.getJSON( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId }, + function ( json ) { + setInnerHTML( 'nameField', json.patientIdentifierType.name ); + setInnerHTML( 'descriptionField', json.patientIdentifierType.description ); + + var boolValueMap = { 'true':i18n_yes, 'false':i18n_no }; + var boolType = json.patientIdentifierType.mandatory; + setInnerHTML( 'mandatoryField', boolValueMap[boolType] ); + + boolType = json.patientIdentifierType.related; + setInnerHTML( 'relatedField', boolValueMap[boolType] ); + setInnerHTML( 'noCharsField', json.patientIdentifierType.noChars ); + + var valueTypeMap = { 'string':i18n_string, 'number':i18n_number, 'letter':i18n_letter_only, 'orgunitCount': i18n_orgunit_count }; + var valueType = json.patientIdentifierType.type; + setInnerHTML( 'typeField', valueTypeMap[valueType] ); + + showDetails(); + }); } // ----------------------------------------------------------------------------- // Remove Patient Identifier Type // ----------------------------------------------------------------------------- -function removePatientIdentifierType( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removePatientIdentifierType.action'); +function removePatientIdentifierType( patientIdentifierTypeId, name ) +{ + removeItem( patientIdentifierTypeId, name, i18n_confirm_delete, 'removePatientIdentifierType.action' ); } -function typeOnChange() { - var type = getFieldValue('type'); - if( type == 'localId' ) { - jQuery('[name=localIdField]').show(); - } - else { - jQuery('[name=localIdField]').hide(); - } -} +function typeOnChange() +{ + var type = getFieldValue('type'); + if(type=='localId') + { + jQuery('[name=localIdField]').show(); + } + else + { + jQuery('[name=localIdField]').hide(); + } +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-12-06 08:54:56 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-12-16 04:39:49 +0000 @@ -1,454 +1,456 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function programIndicatorManagementForm( context ) { - location.href = 'programIndicator.action?programId=' + context.id; -} - -function showProgramUserRoleForm( context ) { - location.href = 'showProgramUserroleForm.action?id=' + context.id; -} - -function showUpdateProgramForm( context ) { - location.href = 'showUpdateProgramForm.action?id=' + context.id; -} - -function programStageManagement( context ) { - location.href = 'programStage.action?id=' + context.id; -} - -function programValidationManagement( context ) { - location.href = 'programValidation.action?programId=' + context.id; -} - -function defineProgramAssociationsForm( context ) { - location.href = 'defineProgramAssociationsForm.action?id=' + context.id; -} - -function showProgramDetails( context ) { - jQuery.getJSON("getProgram.action", { - id: context.id - }, function( json ) { - setInnerHTML('nameField', json.program.name); - setInnerHTML('descriptionField', json.program.description); - - var type = i18n_multiple_events_with_registration; - if( json.program.type == "2" ) - type = i18n_single_event_with_registration; - else if( json.program.type == "3" ) - type = i18n_single_event_without_registration; - setInnerHTML('typeField', type); - - var displayIncidentDate = ( json.program.displayIncidentDate == 'true') ? i18n_yes : i18n_no; - setInnerHTML('displayIncidentDateField', displayIncidentDate); - - var ignoreOverdueEvents = ( json.program.ignoreOverdueEvents == 'true') ? i18n_yes : i18n_no; - setInnerHTML('ignoreOverdueEventsField', ignoreOverdueEvents); - - var onlyEnrollOnce = ( json.program.onlyEnrollOnce == 'true') ? i18n_yes : i18n_no; - setInnerHTML('onlyEnrollOnceField', onlyEnrollOnce); - - var displayOnAllOrgunit = ( json.program.displayOnAllOrgunit == 'true') ? i18n_yes : i18n_no; - setInnerHTML('displayOnAllOrgunitField', displayOnAllOrgunit); - - var useBirthDateAsIncidentDate = ( json.program.useBirthDateAsIncidentDate == 'true') ? i18n_yes : i18n_no; - setInnerHTML('useBirthDateAsIncidentDateField', useBirthDateAsIncidentDate); - - var useBirthDateAsEnrollmentDate = ( json.program.useBirthDateAsEnrollmentDate == 'true') ? i18n_yes : i18n_no; - setInnerHTML('useBirthDateAsEnrollmentDateField', useBirthDateAsEnrollmentDate); - - var selectEnrollmentDatesInFuture = ( json.program.selectEnrollmentDatesInFuture == 'true') ? i18n_yes : i18n_no; - setInnerHTML('selectEnrollmentDatesInFutureField', selectEnrollmentDatesInFuture); - - var selectIncidentDatesInFuture = ( json.program.selectIncidentDatesInFuture == 'true') ? i18n_yes : i18n_no; - setInnerHTML('selectIncidentDatesInFutureField', selectIncidentDatesInFuture); - - var dataEntryMethod = ( json.program.dataEntryMethod == 'true') ? i18n_yes : i18n_no; - setInnerHTML('dataEntryMethodField', dataEntryMethod); - - setInnerHTML('dateOfEnrollmentDescriptionField', json.program.dateOfEnrollmentDescription); - setInnerHTML('dateOfIncidentDescriptionField', json.program.dateOfIncidentDescription); - setInnerHTML('programStageCountField', json.program.programStageCount); - setInnerHTML('noAttributesField', json.program.noAttributes); - setInnerHTML('noIdentifierTypesField', json.program.noIdentifierTypes); - - showDetails(); - }); +function showProgramDetails( programId ) +{ + jQuery.getJSON( "getProgram.action", { + id:programId + }, function(json){ + setInnerHTML( 'nameField', json.program.name ); + setInnerHTML( 'descriptionField', json.program.description ); + + var type = i18n_multiple_events_with_registration; + if( json.program.type == "2" ) + type = i18n_single_event_with_registration; + else if( json.program.type == "3" ) + type = i18n_single_event_without_registration; + setInnerHTML( 'typeField', type ); + + var displayIncidentDate = ( json.program.displayIncidentDate == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'displayIncidentDateField', displayIncidentDate ); + + var ignoreOverdueEvents = ( json.program.ignoreOverdueEvents == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'ignoreOverdueEventsField', ignoreOverdueEvents ); + + var onlyEnrollOnce = ( json.program.onlyEnrollOnce == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'onlyEnrollOnceField', onlyEnrollOnce ); + + var displayOnAllOrgunit= ( json.program.displayOnAllOrgunit == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'displayOnAllOrgunitField', displayOnAllOrgunit ); + + var useBirthDateAsIncidentDate = ( json.program.useBirthDateAsIncidentDate == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'useBirthDateAsIncidentDateField', useBirthDateAsIncidentDate ); + + var useBirthDateAsEnrollmentDate = ( json.program.useBirthDateAsEnrollmentDate == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'useBirthDateAsEnrollmentDateField', useBirthDateAsEnrollmentDate ); + + var selectEnrollmentDatesInFuture= ( json.program.selectEnrollmentDatesInFuture == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'selectEnrollmentDatesInFutureField', selectEnrollmentDatesInFuture ); + + var selectIncidentDatesInFuture= ( json.program.selectIncidentDatesInFuture == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'selectIncidentDatesInFutureField', selectIncidentDatesInFuture ); + + var dataEntryMethod= ( json.program.dataEntryMethod == 'true') ? i18n_yes : i18n_no; + setInnerHTML( 'dataEntryMethodField', dataEntryMethod ); + + setInnerHTML( 'dateOfEnrollmentDescriptionField', json.program.dateOfEnrollmentDescription ); + setInnerHTML( 'dateOfIncidentDescriptionField', json.program.dateOfIncidentDescription ); + setInnerHTML( 'programStageCountField', json.program.programStageCount ); + setInnerHTML( 'noAttributesField', json.program.noAttributes ); + setInnerHTML( 'noIdentifierTypesField', json.program.noIdentifierTypes ); + + showDetails(); + }); } // ----------------------------------------------------------------------------- // Remove Program // ----------------------------------------------------------------------------- -function removeProgram( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeProgram.action'); -} - -function relationshipTypeOnchange() { - clearListById('relationshipSide'); - var relationshipType = jQuery('#relationshipTypeId option:selected'); - if( relationshipType.val() != "" ) { - var aIsToB = relationshipType.attr('aIsToB'); - var bIsToA = relationshipType.attr('bIsToA'); - - var relationshipSide = jQuery("#relationshipFromA"); - relationshipSide.append(''); - relationshipSide.append(''); - } -} - -function programOnChange() { - var type = getFieldValue('type'); - - // anonymous - if( type == "3" ) { - disable('onlyEnrollOnce'); - disable('dateOfEnrollmentDescription'); - disable("displayIncidentDate"); - disable("dateOfIncidentDescription"); - disable("generatedByEnrollmentDate"); - disable("availablePropertyIds"); - disable('ignoreOverdueEvents'); - hideById('selectedList'); - hideById('programMessageTB'); - - jQuery("[name=displayed]").attr("disabled", true); - jQuery("[name=displayed]").removeAttr("checked"); - - jQuery("[name=nonAnonymous]").hide(); - } - else { - enable('onlyEnrollOnce'); - jQuery("[name=displayed]").prop("disabled", false); - enable("availablePropertyIds"); - enable("generatedByEnrollmentDate"); - enable('dateOfEnrollmentDescription'); - enable("displayIncidentDate"); - enable('ignoreOverdueEvents'); - showById('programMessageTB'); - showById("selectedList"); - - jQuery("[name=nonAnonymous]").show(); - if( type == 2 ) { - disable('ignoreOverdueEvents'); - disable('onlyEnrollOnce'); - disable('generatedByEnrollmentDate'); - } - - if( byId('displayIncidentDate').checked ) { - enable("dateOfIncidentDescription"); - } - else { - disable("dateOfIncidentDescription"); - } - } +function removeProgram( programId, name ) +{ + removeItem( programId, name, i18n_confirm_delete, 'removeProgram.action' ); +} + +function relationshipTypeOnchange() +{ + clearListById( 'relationshipSide' ); + var relationshipType = jQuery('#relationshipTypeId option:selected'); + if( relationshipType.val() != "") + { + var aIsToB = relationshipType.attr('aIsToB'); + var bIsToA = relationshipType.attr('bIsToA'); + + var relationshipSide = jQuery("#relationshipFromA"); + relationshipSide.append( '' ); + relationshipSide.append( '' ); + } +} + +function programOnChange() +{ + var type = getFieldValue('type'); + + // anonymous + if(type == "3") + { + disable('onlyEnrollOnce'); + disable('dateOfEnrollmentDescription'); + disable("displayIncidentDate"); + disable("dateOfIncidentDescription"); + disable("generatedByEnrollmentDate"); + disable("availablePropertyIds"); + disable('ignoreOverdueEvents'); + hideById('selectedList'); + hideById('programMessageTB'); + + jQuery("[name=displayed]").attr("disabled", true); + jQuery("[name=displayed]").removeAttr("checked"); + + jQuery("[name=nonAnonymous]").hide(); + } + else{ + enable('onlyEnrollOnce'); + jQuery("[name=displayed]").prop("disabled", false); + enable("availablePropertyIds"); + enable("generatedByEnrollmentDate"); + enable('dateOfEnrollmentDescription'); + enable("displayIncidentDate"); + enable('ignoreOverdueEvents'); + showById('programMessageTB'); + showById("selectedList"); + + jQuery("[name=nonAnonymous]").show(); + if( type == 2 ){ + disable('ignoreOverdueEvents'); + disable('onlyEnrollOnce'); + disable('generatedByEnrollmentDate'); + } + + if(byId('displayIncidentDate').checked){ + enable("dateOfIncidentDescription"); + } + else { + disable("dateOfIncidentDescription"); + } + } } // ----------------------------------------------------------------------------- // select identifiers / attributes // ----------------------------------------------------------------------------- -function selectProperties() { - var selectedList = jQuery("#selectedList"); - jQuery("#availablePropertyIds").children().each(function( i, item ) { - if( item.selected ) { - html = "" + item.text + ""; - html += "" + item.text + ""; - html += "" + item.find("td:first").text() + ""); - item.remove(); - } - }); -} - -function unSelectAllProperties() { - var availableList = jQuery("#availablePropertyIds"); - jQuery("#selectedList").find("tr").each(function( i, item ) { - item = jQuery(item); - availableList.append(""); - item.remove(); - }); -} - -function select( event, element ) { - if( !getKeyCode(event) )// Ctrl - { - jQuery("#selectedList .selected").removeClass('selected'); - } - - element = jQuery(element).parent(); - if( element.hasClass('selected') ) element.removeClass('selected'); - else element.addClass('selected'); -} - -function getKeyCode( e ) { - var ctrlPressed = 0; - - if( parseInt(navigator.appVersion) > 3 ) { - - var evt = e ? e : window.event; - - if( document.layers && navigator.appName == "Netscape" - && parseInt(navigator.appVersion) == 4 ) { - // NETSCAPE 4 CODE - var mString = (e.modifiers + 32).toString(2).substring(3, 6); - ctrlPressed = (mString.charAt(1) == "1"); - } - else { - // NEWER BROWSERS [CROSS-PLATFORM] - ctrlPressed = evt.ctrlKey; - } - } - return ctrlPressed; +function selectProperties() +{ + var selectedList = jQuery("#selectedList"); + jQuery("#availablePropertyIds").children().each(function(i, item){ + if( item.selected ){ + html = "" + item.text + ""; + html += "" + item.text + ""; + html += "" + item.find("td:first").text() + "" ); + item.remove(); + } + }); +} + +function unSelectAllProperties() +{ + var availableList = jQuery("#availablePropertyIds"); + jQuery("#selectedList").find("tr").each( function( i, item ){ + item = jQuery(item); + availableList.append( "" ); + item.remove(); + }); +} + +function select( event, element ) +{ + if ( !getKeyCode( event ) )// Ctrl + { + jQuery("#selectedList .selected").removeClass( 'selected' ); + } + + element = jQuery( element ).parent(); + if( element.hasClass( 'selected') ) element.removeClass( 'selected' ); + else element.addClass( 'selected' ); +} + +function getKeyCode(e) +{ + var ctrlPressed=0; + + if (parseInt(navigator.appVersion)>3) { + + var evt = e ? e:window.event; + + if (document.layers && navigator.appName=="Netscape" + && parseInt(navigator.appVersion)==4) { + // NETSCAPE 4 CODE + var mString =(e.modifiers+32).toString(2).substring(3,6); + ctrlPressed =(mString.charAt(1)=="1"); + } + else { + // NEWER BROWSERS [CROSS-PLATFORM] + ctrlPressed=evt.ctrlKey; + } + } + return ctrlPressed; } //----------------------------------------------------------------------------- //Move Table Row Up and Down //----------------------------------------------------------------------------- -function moveUpPropertyList() { - var selectedList = jQuery("#selectedList"); +function moveUpPropertyList() +{ + var selectedList = jQuery("#selectedList"); - jQuery("#selectedList").find("tr").each(function( i, item ) { - item = jQuery(item); - if( item.hasClass("selected") ) { - var prev = item.prev('#selectedList tr'); - if( prev.length == 1 ) { - prev.before(item); - } - } - }); + jQuery("#selectedList").find("tr").each( function( i, item ){ + item = jQuery(item); + if( item.hasClass("selected") ) + { + var prev = item.prev('#selectedList tr'); + if (prev.length == 1) + { + prev.before(item); + } + } + }); } -function moveDownPropertyList() { - var selectedList = jQuery("#selectedList"); - var items = new Array(); - jQuery("#selectedList").find("tr").each(function( i, item ) { - items.push(jQuery(item)); - }); - - for( var i = items.length - 1; i >= 0; i-- ) { - var item = items[i]; - if( item.hasClass("selected") ) { - var next = item.next('#selectedList tr'); - if( next.length == 1 ) { - next.after(item); - } - } - } +function moveDownPropertyList() +{ + var selectedList = jQuery("#selectedList"); + var items = new Array(); + jQuery("#selectedList").find("tr").each( function( i, item ){ + items.push(jQuery(item)); + }); + + for( var i=items.length-1;i>=0;i--) + { + var item = items[i]; + if( item.hasClass("selected") ) + { + var next = item.next('#selectedList tr'); + if (next.length == 1) + { + next.after(item); + } + } + } } // -------------------------------------------------------------------- // Generate template message form // -------------------------------------------------------------------- -function generateTemplateMessageForm() { - var rowId = jQuery('.daysAllowedSendMessage').length + 1; - var contend = '' - + '' + i18n_reminder + ' ' + rowId + ' ( ' + i18n_remove_reminder + ' )' - + '' - + '' - + '' + i18n_send_when_to + '' - + '' - + '' - + '' - + '' - + '' - + '' + i18n_date_to_compare + '' - + '' - + '' - + '' - + '' - + '' - + '' + i18n_send_message + '' - + '' - + ' ' - + i18n_days - + ' ' - + i18n_scheduled_date - + ' ' - + '' - + '' - + '' + i18n_recipients + '' - + '' - + '' - + '' - + '/' - + '' - + '' + i18n_user_group + '' - + '' - + program_SMS_reminder_form - + '' - + '/' - + '' - + ' ' + i18n_message_type + '' - + ' ' - + ' ' - + ' ' - + '' - + '' - + '' + i18n_params + '' - + '' - + '' - + '' - + '' - + '' - + '' + i18n_message + '' - + '' - + '' - + '' - + '' - + '' - + ''; - - jQuery('#programStageMessage').append(contend); - showHideUserGroup(); -} - -function showHideUserGroup() { - jQuery(".sendTo").each(function( i, item ) { - var numb = i + 1; - if( item.value == 5 ) { - showById('tr' + numb); - } - else - hideById('tr' + numb); - }); -} - -function removeTemplateMessageForm( rowId ) { - jQuery("[name=tr" + rowId + "]").remove(); -} - -function insertParams( paramValue, rowId ) { - var templateMessage = paramValue; - insertTextCommon('templateMessage' + rowId, templateMessage); - getMessageLength(rowId); -} - -function whenToSendOnChange( index ) { - var whenToSend = getFieldValue('whenToSend' + index); - if( whenToSend == "" ) { - enable('dateToCompare' + index); - enable('daysAllowedSendMessage' + index); - enable('time' + index); - } - else { - disable('dateToCompare' + index); - disable('daysAllowedSendMessage' + index); - disable('time' + index); - } -} - -function getMessageLength( rowId ) { - var message = getFieldValue('templateMessage' + rowId); - var length = 0; - var idx = message.indexOf('{'); - while( idx >= 0 ) { - length += message.substr(0, idx).length; - var end = message.indexOf('}'); - if( end >= 0 ) { - message = message.substr(end + 1, message.length); - idx = message.indexOf('{'); - } - } - length += message.length; - setInnerHTML('messageLengthTD' + rowId, length + " " + i18n_characters_without_params); - if( length >= 160 ) { - jQuery('#templateMessage' + rowId).attr('maxlength', 160); - } - else { - jQuery('#templateMessage' + rowId).removeAttr('maxlength'); - } -} - -function setRealDays( rowId ) { - var daysAllowedSendMessage = jQuery("#daysAllowedSendMessage" + rowId); - var time = jQuery("#time" + rowId + " option:selected ").val(); - daysAllowedSendMessage.attr("realvalue", time * eval(daysAllowedSendMessage).val()); - var aasdf = 0; -} - -function onchangeUserGroup( id ) { - var value = document.getElementById('sendTo' + id).value; - hideById('tr' + id); - - if( value == "1" || value == "3" ) { - setFieldValue('messageType' + id, '1'); - disable('messageType' + id); - } - else { - if( value == "5" ) { - showById('tr' + id); - } - enable('messageType' + id); - } +function generateTemplateMessageForm() +{ + var rowId = jQuery('.daysAllowedSendMessage').length + 1; + var contend = '' + + '' + i18n_reminder + ' ' + rowId + ' ( '+ i18n_remove_reminder + ' )' + + '' + + '' + + '' + i18n_send_when_to + '' + + '' + + '' + + '' + + '' + + '' + + '' + i18n_date_to_compare + '' + + '' + + '' + + '' + + '' + + '' + + '' + i18n_send_message + '' + + '' + + ' ' + + i18n_days + + ' ' + + i18n_scheduled_date + + ' ' + + '' + + '' + + '' + i18n_recipients + '' + + '' + + '' + + '' + + '/' + + '' + + '' + i18n_user_group + '' + + '' + + program_SMS_reminder_form + + '' + + '/' + + '' + + ' ' + i18n_message_type + '' + + ' ' + + ' ' + + ' ' + + '' + + '' + + '' + i18n_params + '' + + '' + + '' + + '' + + '' + + '' + + '' + i18n_message + '' + + '' + + '' + + '' + + '' + + '' + + ''; + + jQuery('#programStageMessage').append( contend ); + showHideUserGroup(); +} + +function showHideUserGroup() +{ + jQuery(".sendTo").each( function( i, item ){ + var numb = i+1; + if( item.value == 5){ + showById( 'tr'+numb ); + } + else + hideById ( 'tr'+numb ); + }); +} + +function removeTemplateMessageForm( rowId ) +{ + jQuery("[name=tr" + rowId + "]").remove(); +} + +function insertParams( paramValue, rowId ) +{ + var templateMessage = paramValue; + insertTextCommon('templateMessage' + rowId, templateMessage); + getMessageLength(rowId ); +} + +function whenToSendOnChange(index) +{ + var whenToSend = getFieldValue('whenToSend' + index ); + if(whenToSend==""){ + enable('dateToCompare' + index ); + enable('daysAllowedSendMessage' + index ); + enable('time' + index ); + } + else{ + disable('dateToCompare' + index ); + disable('daysAllowedSendMessage' + index ); + disable('time' + index ); + } +} + +function getMessageLength(rowId) +{ + var message = getFieldValue( 'templateMessage' + rowId ); + var length = 0; + var idx = message.indexOf('{'); + while( idx >=0 ){ + length += message.substr(0,idx).length; + var end = message.indexOf('}'); + if(end>=0){ + message = message.substr(end + 1, message.length); + idx = message.indexOf('{'); + } + } + length += message.length; + setInnerHTML('messageLengthTD' + rowId, length + " " + i18n_characters_without_params); + if( length>=160 ) + { + jQuery('#templateMessage' + rowId ).attr('maxlength', 160); + } + else + { + jQuery('#templateMessage' + rowId ).removeAttr('maxlength'); + } +} + +function setRealDays(rowId) +{ + var daysAllowedSendMessage = jQuery("#daysAllowedSendMessage" + rowId); + var time = jQuery("#time" + rowId + " option:selected ").val(); + daysAllowedSendMessage.attr("realvalue", time * eval(daysAllowedSendMessage).val()); + var aasdf= 0; +} + +function onchangeUserGroup( id ) +{ + var value = document.getElementById( 'sendTo' + id ).value; + hideById( 'tr'+id ); + + if( value=="1" || value=="3" ){ + setFieldValue('messageType' + id , '1'); + disable('messageType' + id ); + } + else{ + if ( value == "5") { + showById( 'tr' + id ); + } + enable ('messageType' + id ); + } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programIndicator.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programIndicator.js 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programIndicator.js 2013-12-16 04:39:49 +0000 @@ -1,118 +1,119 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdateProgramIndicator( context ) { - location.href = 'showUpdateProgramIndicator.action?id=' + context.id; -} - -function removeIndicator( context ) { - removeItem( context.id, context.name, i18n_confirm_delete , 'removeProgramIndicator.action' ); -} - -function showProgramIndicatorDetails( context ) { - jQuery.getJSON('getProgramIndicator.action', { id: context.id }, function( json ) { - setInnerHTML('nameField', json.programIndicator.name); - setInnerHTML('codeField', json.programIndicator.code); - setInnerHTML('descriptionField', json.programIndicator.description); - setInnerHTML('valueTypeField', json.programIndicator.valueType); - setInnerHTML('rootDateField', json.programIndicator.rootDate); - setInnerHTML('expressionField', json.programIndicator.expression); - - showDetails(); - }); +function showProgramIndicatorDetails( programIndicatorId ) +{ + jQuery.getJSON( 'getProgramIndicator.action', { id: programIndicatorId }, function ( json ) { + setInnerHTML( 'nameField', json.programIndicator.name ); + setInnerHTML( 'codeField', json.programIndicator.code ); + setInnerHTML( 'descriptionField', json.programIndicator.description ); + setInnerHTML( 'valueTypeField', json.programIndicator.valueType ); + setInnerHTML( 'rootDateField', json.programIndicator.rootDate ); + setInnerHTML( 'expressionField', json.programIndicator.expression ); + + showDetails(); + }); } // ----------------------------------------------------------------------------- // Remove Program Indicator // ----------------------------------------------------------------------------- -function removeProgramIndicator( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeProgramIndicator.action'); -} - -function getPatientDataElements() { - clearListById('dataElements'); - clearListById('deSumId'); - var programStageId = getFieldValue('programStageId'); - - jQuery.getJSON('getPatientDataElements.action', - { - programId: getFieldValue('programId'), - programStageId: programStageId - } - , function( json ) { - if( programStageId != '' ) { - enable('programStageProperty'); - } - else { - disable('programStageProperty'); - } - var dataElements = jQuery('#dataElements'); - var deSumId = jQuery('#deSumId'); - for( i in json.dataElements ) { - if( json.dataElements[i].type == 'int' || json.dataElements[i].type == 'date' ) { - dataElements.append(""); - if( json.dataElements[i].type == 'int' ) { - deSumId.append(""); - } - } - } - - }); -} - -function insertDataElement( element ) { - var programStageId = getFieldValue('programStageId'); - var dataElementId = element.options[element.selectedIndex].value; - - insertTextCommon('expression', "[DE:" + programStageId + "." + dataElementId + "]"); - getConditionDescription(); -} - -function insertInfo( element, isProgramStageProperty ) { - var id = ""; - if( isProgramStageProperty ) { - id = getFieldValue('programStageId'); - } - else { - id = getFieldValue('programId'); - } - - value = element.options[element.selectedIndex].value.replace('*', id); - insertTextCommon('expression', value); - getConditionDescription(); -} - -function insertOperator( value ) { - insertTextCommon('expression', ' ' + value + ' '); - getConditionDescription(); -} - -function getConditionDescription() { - $.postJSON('getProgramIndicatorDescripttion.action', - { - expression: getFieldValue('expression') - }, function( json ) { - byId('aggregationDescription').innerHTML = json.message; - }) -} - -function programIndicatorOnChange() { - var valueType = getFieldValue('valueType'); - if( valueType == 'int' ) { - hideById('rootDateTR'); - disable('rootDate'); - } - else { - showById('rootDateTR'); - enable('rootDate'); - } +function removeProgramIndicator( programIndicatorId, name ) +{ + removeItem( programIndicatorId, name, i18n_confirm_delete, 'removeProgramIndicator.action' ); +} + +function getPatientDataElements() +{ + clearListById( 'dataElements' ); + clearListById( 'deSumId' ); + var programStageId = getFieldValue('programStageId'); + + jQuery.getJSON( 'getPatientDataElements.action', + { + programId:getFieldValue( 'programId' ), + programStageId:programStageId + } + ,function( json ) + { + if( programStageId!='' ){ + enable('programStageProperty'); + } + else{ + disable('programStageProperty'); + } + var dataElements = jQuery('#dataElements'); + var deSumId = jQuery('#deSumId'); + for ( i in json.dataElements ) + { + if( json.dataElements[i].type=='int' || json.dataElements[i].type=='date' ) + { + dataElements.append( "" ); + if( json.dataElements[i].type=='int') + { + deSumId.append( "" ); + } + } + } + + }); +} + +function insertDataElement( element ) +{ + var programStageId = getFieldValue('programStageId'); + var dataElementId = element.options[element.selectedIndex].value; + + insertTextCommon( 'expression', "[DE:" + programStageId + "." + dataElementId + "]" ); + getConditionDescription(); +} + +function insertInfo( element, isProgramStageProperty ) +{ + var id = ""; + if( isProgramStageProperty ) + { + id = getFieldValue('programStageId'); + } + else + { + id = getFieldValue('programId'); + } + + value = element.options[element.selectedIndex].value.replace( '*', id ); + insertTextCommon('expression', value ); + getConditionDescription(); +} + +function insertOperator( value ) +{ + insertTextCommon('expression', ' ' + value + ' ' ); + getConditionDescription(); +} + +function getConditionDescription () +{ + $.postJSON( 'getProgramIndicatorDescripttion.action', + { + expression:getFieldValue('expression') + },function (json) + { + byId('aggregationDescription').innerHTML = json.message; + }) +} + +function programIndicatorOnChange() +{ + var valueType = getFieldValue('valueType'); + if(valueType=='int'){ + hideById('rootDateTR'); + disable('rootDate'); + } + else{ + showById('rootDateTR'); + enable('rootDate'); + } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2013-12-06 08:54:56 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2013-12-16 04:39:49 +0000 @@ -1,25 +1,3 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - -function removeProgramStage( context ) { - removeItem( context.id, context.name, i18n_confirm_delete , 'removeProgramStage.action' ); -} - -function showUpdateProgramStageForm( context ) { - location.href = 'showUpdateProgramStageForm.action?id=' + context.id; -} - -function viewDataEntryForm( context ) { - location.href = 'viewDataEntryForm.action?programStageId=' + context.id; -} - -function programStageSectionList( context ) { - location.href = 'programStageSectionList.action?id=' + context.id; -} function getStageByProgram( programId ) { @@ -71,9 +49,9 @@ // View details // ----------------------------------------------------------------------------- -function showProgramStageDetails( context ) +function showProgramStageDetails( programStageId ) { - jQuery.getJSON( 'getProgramStage.action', { id: context.id }, function ( json ) { + jQuery.getJSON( 'getProgramStage.action', { id: programStageId }, function ( json ) { setInnerHTML( 'nameField', json.programStage.name ); setInnerHTML( 'descriptionField', json.programStage.description ); setInnerHTML( 'scheduledDaysFromStartField', json.programStage.minDaysFromStart ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2013-12-16 04:39:49 +0000 @@ -1,209 +1,224 @@ var COLOR_GREEN = '#b9ffb9'; var COLOR_WHITE = '#ffffff' -jQuery(document).ready(function() { - validation('programValidationForm', function( form ) { - form.submit(); - }); - - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); +jQuery(document).ready( function(){ + validation( 'programValidationForm', function( form ){ + form.submit(); + }); }); // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdateSingleProgramValidationForm( context ) { - location.href = 'showUpdateSingleProgramValidationForm.action?validationId=' + context.id; -} - -function showProgramValidationDetails( context ) { - jQuery.getJSON('getProgramValidation.action', { validationId: context.id }, function( json ) { - setInnerHTML('descriptionField', json.validation.description); - - var operator = json.validation.operator; - setInnerHTML('operatorField', i18nalizeOperator(operator)); - - setInnerHTML('leftSideDescriptionField', json.validation.leftSideDescription); - setInnerHTML('leftSideExpressionField', json.validation.leftSideExpression); - setInnerHTML('rightSideDescriptionField', json.validation.rightSideDescription); - setInnerHTML('rightSideExpressionField', json.validation.rightSideExpression); - - showDetails(); - }); -} - -function i18nalizeOperator( operator ) { - if( operator == "equal_to" ) { - return i18n_equal_to; - } - else if( operator == "not_equal_to" ) { - return i18n_not_equal_to; - } - else if( operator == "greater_than" ) { - return i18n_greater_than; - } - else if( operator == "greater_than_or_equal_to" ) { - return i18n_greater_than_or_equal_to; - } - else if( operator == "less_than" ) { - return i18n_less_than; - } - else if( operator == "less_than_or_equal_to" ) { - return i18n_less_than_or_equal_to; - } - - return null; +function showProgramValidationDetails ( programValidationId ) +{ + jQuery.getJSON( 'getProgramValidation.action', { validationId: programValidationId }, function ( json ) { + setInnerHTML( 'descriptionField', json.validation.description ); + + var operator = json.validation.operator; + setInnerHTML( 'operatorField', i18nalizeOperator( operator ) ); + + setInnerHTML( 'leftSideDescriptionField', json.validation.leftSideDescription ); + setInnerHTML( 'leftSideExpressionField', json.validation.leftSideExpression ); + setInnerHTML( 'rightSideDescriptionField', json.validation.rightSideDescription ); + setInnerHTML( 'rightSideExpressionField', json.validation.rightSideExpression ); + + showDetails(); + }); +} + +function i18nalizeOperator( operator ) +{ + if ( operator == "equal_to" ) + { + return i18n_equal_to; + } + else if ( operator == "not_equal_to" ) + { + return i18n_not_equal_to; + } + else if ( operator == "greater_than" ) + { + return i18n_greater_than; + } + else if ( operator == "greater_than_or_equal_to" ) + { + return i18n_greater_than_or_equal_to; + } + else if ( operator == "less_than" ) + { + return i18n_less_than; + } + else if ( operator == "less_than_or_equal_to" ) + { + return i18n_less_than_or_equal_to; + } + + return null; } // ----------------------------------------------------------------------------- // Remove ProgramValidation // ----------------------------------------------------------------------------- -function removeProgramValidation( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeProgramValidation.action'); +function removeProgramValidation( programValidationId, name ) +{ + removeItem( programValidationId, name, i18n_confirm_delete, 'removeProgramValidation.action' ); } //------------------------------------------------------------------------------ // Load data-elements of each program-stage //------------------------------------------------------------------------------ -function getLeftPrgramStageDataElements() { - clearListById('dataElementId'); - - var programStage = document.getElementById('leftStage'); - var programStageId = programStage.options[ programStage.selectedIndex ].value; - if( programStageId == '' ) return; - - jQuery.getJSON("getPatientDataElements.action", { - programStageId: programStageId - }, function( json ) { - jQuery('#dataElementId').append(''); - jQuery('#dataElementId').append(''); - for( i in json.dataElements ) { - var id = '[DE:' + programStageId + '.' + json.dataElements[i].id + ']'; - jQuery('#dataElementId').append(''); - } - }); +function getLeftPrgramStageDataElements() +{ + clearListById( 'dataElementId' ); + + var programStage = document.getElementById( 'leftStage' ); + var programStageId = programStage.options[ programStage.selectedIndex ].value; + if( programStageId == '') return; + + jQuery.getJSON( "getPatientDataElements.action", { + programStageId:programStageId + }, function(json){ + jQuery( '#dataElementId').append( '' ); + jQuery( '#dataElementId').append( '' ); + for ( i in json.dataElements ) { + var id = '[DE:' + programStageId + '.' + json.dataElements[i].id + ']'; + jQuery( '#dataElementId').append( '' ); + } + }); } -function getRightPrgramStageDataElements() { - clearListById('rightSideDE'); - - var programStage = document.getElementById('rightStage'); - var programStageId = programStage.options[ programStage.selectedIndex ].value; - if( programStageId == '' ) return; - - jQuery.getJSON("getPatientDataElements.action", { - programStageId: programStageId - }, function( json ) { - jQuery('#dataElementId').append(''); - jQuery('#dataElementId').append(''); - for( i in json.dataElements ) { - var id = '[DE:' + programStageId + '.' + json.dataElements[i].id + ']'; - jQuery('#rightSideDE').append(''); - } - }); - +function getRightPrgramStageDataElements() +{ + clearListById( 'rightSideDE' ); + + var programStage = document.getElementById( 'rightStage' ); + var programStageId = programStage.options[ programStage.selectedIndex ].value; + if( programStageId == '') return; + + jQuery.getJSON( "getPatientDataElements.action", { + programStageId:programStageId + }, function(json){ + jQuery( '#dataElementId').append( '' ); + jQuery( '#dataElementId').append( '' ); + for ( i in json.dataElements ) { + var id = '[DE:' + programStageId + '.' + json.dataElements[i].id + ']'; + jQuery( '#rightSideDE').append( '' ); + } + }); + } //------------------------------------------------------------------------------ // Show Left side form for designing //------------------------------------------------------------------------------ -function editLeftExpression() { - left = true; - - $('#expression').val($('#leftSideExpression').val()); - $('#expression-container [id=description]').val($('#leftSideDescription').val()); - $('#formulaText').text($('#leftSideTextualExpression').val()); - $('#nullIfBlank').attr('checked', ( $('#leftSideNullIfBlank').val() == 'true' || $('#leftSideNullIfBlank').val() == '' )); - setInnerHTML("exp-descriptionInfo", ""); - setInnerHTML("exp-expressionInfo", ""); - $("#expression-container [id=description]").css("background-color", "#ffffff"); - $("#expression-container [id=expression]").css("background-color", "#ffffff"); - - dialog.dialog("open"); +function editLeftExpression() +{ + left = true; + + $( '#expression' ).val( $( '#leftSideExpression' ).val() ); + $( '#expression-container [id=description]' ).val( $( '#leftSideDescription' ).val() ); + $( '#formulaText' ).text( $( '#leftSideTextualExpression' ).val() ); + $( '#nullIfBlank' ).attr( 'checked', ( $( '#leftSideNullIfBlank' ).val() == 'true' || $( '#leftSideNullIfBlank' ).val() == '' ) ); + setInnerHTML( "exp-descriptionInfo", "" ); + setInnerHTML( "exp-expressionInfo", "" ); + $("#expression-container [id=description]" ).css( "background-color", "#ffffff" ); + $("#expression-container [id=expression]" ).css( "background-color", "#ffffff" ); + + dialog.dialog("open"); } -function editRightExpression() { - left = false; - - $('#expression').val($('#rightSideExpression').val()); - $('#expression-container [id=description]').val($('#rightSideDescription').val()); - $('#formulaText').text($('#rightSideTextualExpression').val()); - $('#nullIfBlank').attr('checked', ( $('#rightSideNullIfBlank').val() == 'true' || $('#rightSideNullIfBlank').val() == '' )); - - dialog.dialog("open"); +function editRightExpression() +{ + left = false; + + $( '#expression' ).val( $( '#rightSideExpression' ).val() ); + $( '#expression-container [id=description]' ).val( $( '#rightSideDescription' ).val() ); + $( '#formulaText' ).text( $( '#rightSideTextualExpression' ).val() ); + $( '#nullIfBlank' ).attr( 'checked', ( $( '#rightSideNullIfBlank' ).val() == 'true' || $( '#rightSideNullIfBlank' ).val() == '' ) ); + + dialog.dialog("open"); } //------------------------------------------------------------------------------ // Insert formulas //------------------------------------------------------------------------------ -function insertText( inputAreaName, inputText ) { - insertTextCommon(inputAreaName, inputText); - - getExpressionText(); +function insertText( inputAreaName, inputText ) +{ + insertTextCommon( inputAreaName, inputText ); + + getExpressionText(); } -function getExpressionText() { - $.postUTF8("getProgramExpressionDescription.action", - { - programExpression: $('#expression').val() - }, - function( data ) { - setInnerHTML("formulaText", data); - }, 'html'); +function getExpressionText() +{ + $.postUTF8("getProgramExpressionDescription.action", + { + programExpression: $( '#expression' ).val() + }, + function (data) + { + setInnerHTML( "formulaText", data ); + },'html'); } var left = true; -function insertExpression() { - var expression = $('#expression').val(); - var description = $('#expression-container [id=description]').val(); - - if( left ) { - $('#leftSideExpression').val(expression); - $('#leftSideDescription').val(description); - $('#leftSideTextualExpression').val($('#formulaText').text()); - $('#leftSideNullIfBlank').val($('#nullIfBlank').is(':checked')); - } - else { - $('#rightSideExpression').val(expression); - $('#rightSideDescription').val(description); - $('#rightSideTextualExpression').val($('#formulaText').text()); - $('#rightSideNullIfBlank').val($('#nullIfBlank').is(':checked')); - } - - dialog.dialog("close"); -} - -function validateExpression() { - if( checkNotEmpty(jQuery("#expression-container [id=description]"), i18n_description_not_null) == false ) - return; - if( checkNotEmpty(jQuery("#expression-container [id=expression]"), i18n_expression_not_null) == false ) - return; - insertExpression(); -} - -function checkNotEmpty( field, message ) { - if( field.val().length == 0 ) { - setInnerHTML("exp-" + field.attr("name") + "Info", message); - $('#expression-container [id=' + field.attr("name") + "]").css("background-color", "#ffc5c5"); - return false; - } else { - setInnerHTML("exp-" + field.attr("name") + "Info", ''); - $('#expression-container [id=' + field.attr("name") + "]").css("background-color", "#ffffff"); - } - - return true; -} - -function clearSearchText() { - setFieldValue('filter', ''); - filterList('', 'dataElementId') +function insertExpression() +{ + var expression = $( '#expression' ).val(); + var description = $( '#expression-container [id=description]' ).val(); + + if ( left ) + { + $( '#leftSideExpression' ).val( expression ); + $( '#leftSideDescription' ).val( description ); + $( '#leftSideTextualExpression' ).val( $( '#formulaText' ).text() ); + $( '#leftSideNullIfBlank' ).val( $( '#nullIfBlank' ).is( ':checked' ) ); + } + else + { + $( '#rightSideExpression' ).val( expression ); + $( '#rightSideDescription' ).val( description ); + $( '#rightSideTextualExpression' ).val( $( '#formulaText' ).text() ); + $( '#rightSideNullIfBlank' ).val( $( '#nullIfBlank' ).is( ':checked' ) ); + } + + dialog.dialog( "close" ); +} + +function validateExpression() +{ + if ( checkNotEmpty( jQuery( "#expression-container [id=description]" ), i18n_description_not_null ) == false ) + return; + if ( checkNotEmpty( jQuery( "#expression-container [id=expression]" ), i18n_expression_not_null ) == false ) + return; + insertExpression(); +} + +function checkNotEmpty( field, message ) +{ + if ( field.val().length == 0 ) + { + setInnerHTML( "exp-" + field.attr("name") + "Info", message ); + $('#expression-container [id=' + field.attr("name") + "]" ).css( "background-color", "#ffc5c5" ); + return false; + } else + { + setInnerHTML( "exp-" + field.attr("name") + "Info", '' ); + $('#expression-container [id=' + field.attr("name") + "]" ).css( "background-color", "#ffffff" ); + } + + return true; +} + +function clearSearchText() +{ + setFieldValue('filter', ''); + filterList( '', 'dataElementId' ) } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2013-12-05 12:21:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2013-12-16 04:39:49 +0000 @@ -1,83 +1,84 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showUpdateRelationshipTypeForm( context ) { - location.href = 'showUpdateRelationshipTypeForm.action?id=' + context.id; -} - -function showRelationshipTypeDetails( context ) { - jQuery.getJSON('getRelationshipType.action', { id: context.id }, function( json ) { - setInnerHTML('aIsToBField', json.relationshipType.aIsToB); - setInnerHTML('bIsToAField', json.relationshipType.bIsToA); - setInnerHTML('descriptionField', json.relationshipType.description); - - showDetails(); - }); +function showRelationshipTypeDetails( relationshipTypeId ) +{ + jQuery.getJSON( 'getRelationshipType.action', { id: relationshipTypeId }, function ( json ) { + setInnerHTML( 'aIsToBField', json.relationshipType.aIsToB ); + setInnerHTML( 'bIsToAField', json.relationshipType.bIsToA ); + setInnerHTML( 'descriptionField', json.relationshipType.description ); + + showDetails(); + }); } // ----------------------------------------------------------------------------- // Add RelationshipType // ----------------------------------------------------------------------------- -function validateAddRelationshipType() { - $.postUTF8( - 'validateRelationshipType.action', - { - "aIsToB": getFieldValue('aIsToB'), - "bIsToA": getFieldValue('bIsToA') - }, - function( json ) { - if( json.response == "success" ) { - var form = document.getElementById('addRelationshipTypeForm'); - form.submit(); - } else if( json.response == "input" ) { - setHeaderMessage(json.message); - } - else if( json.response == "error" ) { - setHeaderMessage(json.message); - } - } - ); +function validateAddRelationshipType() +{ + $.postUTF8( + 'validateRelationshipType.action', + { + "aIsToB": getFieldValue( 'aIsToB' ), + "bIsToA": getFieldValue( 'bIsToA' ) + }, + function( json ) + { + if ( json.response == "success" ) + { + var form = document.getElementById( 'addRelationshipTypeForm' ); + form.submit(); + }else if ( json.response == "input" ) + { + setHeaderMessage( json.message ); + } + else if ( json.response == "error" ) + { + setHeaderMessage( json.message ); + } + } + ); } // ----------------------------------------------------------------------------- // Update RelationshipType // ----------------------------------------------------------------------------- -function validateUpdateRelationshipType() { - $.postJSON( - 'validateRelationshipType.action', - { - "id": getFieldValue('id'), - "aIsToB": getFieldValue('aIsToB'), - "bIsToA": getFieldValue('bIsToA') - }, - function( json ) { - if( json.response == "success" ) { - var form = document.getElementById('updateRelationshipTypeForm'); - form.submit(); - } else if( json.response == "input" ) { - setHeaderMessage(json.message); - } - else if( json.response == "error" ) { - setHeaderMessage(json.message); - } - } - ); +function validateUpdateRelationshipType() +{ + $.postJSON( + 'validateRelationshipType.action', + { + "id": getFieldValue( 'id' ), + "aIsToB": getFieldValue( 'aIsToB' ), + "bIsToA": getFieldValue( 'bIsToA' ) + }, + function( json ) + { + if ( json.response == "success" ) + { + var form = document.getElementById( 'updateRelationshipTypeForm' ); + form.submit(); + }else if ( json.response == "input" ) + { + setHeaderMessage( json.message ); + } + else if ( json.response == "error" ) + { + setHeaderMessage( json.message ); + } + } + ); } // ----------------------------------------------------------------------------- // Remove RelationshipType // ----------------------------------------------------------------------------- -function removeRelationshipType( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeRelationshipType.action'); +function removeRelationshipType( relationshipTypeId, aIsToB, bIsToA ) +{ + removeItem( relationshipTypeId, aIsToB + "/" + bIsToA, i18n_confirm_delete, 'removeRelationshipType.action' ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2013-12-16 04:39:49 +0000 @@ -1,85 +1,74 @@ -$(function() { - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - -function showProgramsForValidationCriteriaForm( context ) { - location.href = 'showProgramsForValidationCriteriaForm.action?criteriaId=' + context.id; -} - -function showUpdateValidationCriteriaForm( context ) { - location.href = 'showUpdateValidationCriteriaForm.action?id=' + context.id; -} - // ----------------------------------------------------------------------------- // Remove Criteria // ----------------------------------------------------------------------------- -function removeCriteria( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeValidationCriteria.action'); +function removeCriteria( id, name ) +{ + removeItem( id, name, i18n_confirm_delete, 'removeValidationCriteria.action' ); } // ----------------------------------------------------------------------------- // View details // ----------------------------------------------------------------------------- -function showValidationCriteriaDetails( context ) { - jQuery.getJSON('getValidationCriteria.action', { id: context.id }, function( json ) { - setInnerHTML('nameField', json.validationCriteria.name); - setInnerHTML('descriptionField', json.validationCriteria.description); - - var property = json.validationCriteria.property; - var operator = json.validationCriteria.operator; - var value = json.validationCriteria.value; - - // get operator - if( operator == 0 ) { - operator = '='; - } else if( operator == -1 ) { - operator = '<'; - } else { - operator = '>'; - } - - setInnerHTML('criteriaField', property + " " + operator + " " + value); - showDetails(); - }); +function showValidationCriteriaDetails( criteriaId ) +{ + jQuery.getJSON( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) { + setInnerHTML( 'nameField', json.validationCriteria.name ); + setInnerHTML( 'descriptionField', json.validationCriteria.description ); + + var property = json.validationCriteria.property; + var operator = json.validationCriteria.operator; + var value = json.validationCriteria.value; + + // get operator + if(operator == 0 ){ + operator = '='; + }else if(operator == -1 ){ + operator = '<'; + }else { + operator = '>'; + } + + setInnerHTML('criteriaField', property + " " + operator + " " + value ); + showDetails(); + }); } // ---------------------------------------------------------------------------------------- // Show div to Add or Update Validation-Criteria // ---------------------------------------------------------------------------------------- -function showDivValue() { - - var propertyName = byId('property').value; - hideDiv(); - if( propertyName != '' ) { - hideById('emptyCriteria'); - - var div = byId(propertyName + 'Div'); - div.style.display = 'block'; - if( propertyName == 'gender' || - propertyName == 'dobType' ) { - - byId('operator').selectedIndex = 1; - disable('operator'); - } - else { - enable('operator'); - } - } -} - -function hideDiv() { - hideById('genderDiv'); - hideById('integerValueOfAgeDiv'); - hideById('birthDateDiv'); - hideById('dobTypeDiv'); - showById('emptyCriteria'); -} - -function fillValue( value ) { - byId('value').value = value; -} +function showDivValue(){ + + var propertyName = byId('property').value; + hideDiv(); + if(propertyName != '') + { + hideById('emptyCriteria'); + + var div = byId(propertyName + 'Div'); + div.style.display = 'block'; + if( propertyName == 'gender' || + propertyName == 'dobType' ){ + + byId('operator').selectedIndex = 1; + disable('operator'); + } + else{ + enable('operator'); + } + } +} + +function hideDiv() +{ + hideById('genderDiv'); + hideById('integerValueOfAgeDiv'); + hideById('birthDateDiv'); + hideById('dobTypeDiv'); + showById('emptyCriteria'); +} + +function fillValue( value ){ + byId('value').value = value; +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewPatientRegistationForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewPatientRegistationForm.js 2013-07-09 06:45:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewPatientRegistationForm.js 2013-12-16 04:39:49 +0000 @@ -371,17 +371,7 @@ var htmlCode = "$i18n.getString( "patient_attribute_management" ) #openHelp( "patient_attribute" ) -

$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

- + + + + + + + #end + + + +

@@ -24,33 +15,43 @@ + + - #foreach( $patientAttribute in $patientAttributes ) - - - - #end - -

$i18n.getString( "name" )	$i18n.getString( "operations" )
$encoder.htmlEncode( $!patientAttribute.displayName )

+ #foreach( $patientAttribute in $patientAttributes ) +

$encoder.htmlEncode( $patientAttribute.displayName )

- -

$i18n.getString( "name" ):

$i18n.getString( "description" ):

$i18n.getString( "mandatory" ):

$i18n.getString( "inherit" ):

+ +

$i18n.getString( "name" ):

$i18n.getString( "description" ):

$i18n.getString( "mandatory" ):

$i18n.getString( "inherit" ):

$i18n.getString( "value_type" ):

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2013-12-05 11:31:19 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2013-12-16 04:39:49 +0000 @@ -1,59 +1,56 @@ +

$i18n.getString( "patient_attribute_group_management" ) #openHelp( "patient_attribute_group" )

$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

- + #foreach( $patientAttributeGroup in $patientAttributeGroups ) + + + + + + + + #end + + + +

- - - - - -

- $i18n.getString( "filter_by_name" ): -

- -
-

- - - - - - - - - - #foreach( $patientAttributeGroup in $patientAttributeGroups ) - - + +

$i18n.getString( "name" )
$encoder.htmlEncode( $!patientAttributeGroup.displayName )

+ + + + + + + + + - #end - -

$i18n.getString( "name" )	$i18n.getString( "operations" )
	+ + +

- + +

$encoder.htmlEncode( $patientAttributeGroup.displayName )

- -

$i18n.getString( "name" )

$i18n.getString( "description" ):

$i18n.getString( "number_of_attribute" ):

+ +

$i18n.getString( "name" )

$i18n.getString( "description" ):

$i18n.getString( "number_of_attribute" ):

+ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm 2013-12-05 12:21:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm 2013-12-16 04:39:49 +0000 @@ -1,50 +1,46 @@

$i18n.getString( "patient_identifier_type_management" ) #openHelp( "patient_identifier_type" )

$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

- - -

- - - - - -

- $i18n.getString( "filter_by_name" ): -

- -

- - - - - - - - #foreach( $identifierType in $identifierTypes ) - - - - #end - -

$i18n.getString( "name" )
$encoder.htmlEncode( $!identifierType.displayName )

+ + + + + + + + + + + + + + + #foreach( $identifierType in $identifierTypes ) + + + + + + + + #end + + + +

$i18n.getString( "name" )	$i18n.getString( "operations" )

$encoder.htmlEncode( $identifierType.displayName )	+ + + + +

+ +

$i18n.getString( "name" ):

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-12-06 11:34:43 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-12-16 04:39:49 +0000 @@ -1,9 +1,3 @@ - -

$i18n.getString( "patient_registration_form_management" ) #openHelp( "person_registration_form" )

@@ -36,7 +30,7 @@ $i18n.getString('no_program') #set($hasCommonForm = 'true') #end - + - + #foreach( $validation in $validations ) + + + + + + #end + +

$i18n.getString( 'design_data_entry_form' )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm 2013-12-16 04:39:49 +0000 @@ -1,14 +1,5 @@

$i18n.getString( "program_indicator_management_form" )

$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

$program.displayName

@@ -25,31 +16,38 @@ + + #set( $mark = false ) #foreach( $programIndicator in $programIndicators ) - - - + + + + + #set( $mark = !$mark ) #end

$i18n.getString( "name" )	$i18n.getString( "description" )	$i18n.getString( "operations" )
$encoder.htmlEncode( $!programIndicator.displayName )	$encoder.htmlEncode( $!programIndicator.description )
$encoder.htmlEncode( $programIndicator.displayName )	$encoder.htmlEncode( $programIndicator.description )	+ + + + +

+ +

$i18n.getString( "name" ):

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-12-06 08:54:56 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-12-16 04:39:49 +0000 @@ -2,56 +2,86 @@

$i18n.getString( "program_management" ) #openHelp( "program" )

$i18n.getString( "assign_program_to_orgunits" )
$i18n.getString( "assign_program_to_userroles" )
$i18n.getString( "edit" )
$i18n.getString( "view_program_stages" )
$i18n.getString( "program_validation_rule_management" )
$i18n.getString( "program_indicator_management_form" )
$i18n.getString( "sharing_settings" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

- - + - +

- -

- - + + + + - - #foreach( $program in $programs ) - - - - #end + + #foreach( $program in $programs ) + + + + + + + + #end - -

$i18n.getString( "name" )

$i18n.getString( "operations" )

$encoder.htmlEncode( $!program.displayName )

$encoder.htmlEncode( $program.displayName )

+ + #if( $security.canUpdate( $program ) ) +

$i18n.getString( 'assign_program_to_orgunits' )

+ #else +

+ #end + + #if( $security.canUpdate( $program ) ) + +

$i18n.getString( 'assign_program_to_userroles' )

$i18n.getString( 'view_stage_management' )

$i18n.getString( 'program_validation_rule_management' )

+ #else +

+ #end + + #if( $auth.hasAccess( "dhis-web-maintenance-patient", "programIndicator" ) && $program.type !='3' ) +

+ #else +

+ #end + + #if ( $security.canManage( $program ) ) +

+ #else +

+ #end + + #if( $security.canUpdate( $program ) ) +

+ #else +

+ #end + + #if( $security.canDelete( $program ) ) +

+ #else +

+ #end + +

+ +

$i18n.getString( "name" ):

@@ -83,6 +113,6 @@ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )'; var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")'; var i18n_multiple_events_with_registration = '$encoder.jsEscape( $i18n.getString( "multiple_events_with_registration" ) , "'")'; - var i18n_single_event_with_registration = '$encoder.jsEscape( $i18n.getString( "single_event_with_registration" ) , "'")'; - var i18n_single_event_without_registration = '$encoder.jsEscape( $i18n.getString( "single_event_without_registration" ) , "'")'; + var i18n_single_event_with_registration = '$encoder.jsEscape( $i18n.getString( "single_event_with_registration" ) , "'")'; + var i18n_single_event_without_registration = '$encoder.jsEscape( $i18n.getString( "single_event_without_registration" ) , "'")'; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2013-12-06 08:54:56 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2013-12-16 04:39:49 +0000 @@ -2,17 +2,6 @@

$program.displayName

$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )
$i18n.getString( "section_management" )
$i18n.getString( "design_data_entry_form" )

- @@ -30,31 +19,43 @@

+ - + + + #set( $mark = false ) #foreach( $association in $associations ) - - - + + + + + + #set( $mark = !$mark ) #end

$i18n.getString( "name" )	$i18n.getString( "description" )	$i18n.getString( "operations" )
$encoder.htmlEncode( $!association.displayName )	$encoder.htmlEncode( $!association.description )
$encoder.htmlEncode( $association.displayName )	$encoder.htmlEncode( $association.description )	+ + + #if( $program.type=='1' ) + + #end + + + +

+ +

$i18n.getString( "name" ):

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-12-06 11:18:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-12-16 04:39:49 +0000 @@ -2,14 +2,6 @@

@@ -28,30 +20,37 @@

- - - + + + + + + + - - - #foreach( $validation in $validations ) - - - - #end - -

$i18n.getString( "name" )	$i18n.getString( "operations" )

$encoder.htmlEncode( $!validation.displayName )

+ +

$validation.name

+ +

$i18n.getString( "name" ):

@@ -61,6 +60,7 @@

$i18n.getString( "right_side_description" ):

$i18n.getString( "right_side_expression" ):

@@ -68,13 +68,13 @@

$i18n.getString( "edit_patient_attribute_group" )

- +

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2013-12-16 04:39:49 +0000 @@ -5,7 +5,7 @@

$i18n.getString( "edit_patient_identifier_type" )

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-12-16 04:39:49 +0000 @@ -85,7 +85,7 @@

$i18n.getString( "edit_program" )

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm 2013-12-16 04:39:49 +0000 @@ -13,7 +13,7 @@

$i18n.getString( "update_program_indicator" )

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-12-16 04:39:49 +0000 @@ -12,7 +12,7 @@

$programStage.program.displayName

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm 2013-12-16 04:39:49 +0000 @@ -19,7 +19,7 @@

$programStage.displayName

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2013-12-16 04:39:49 +0000 @@ -2,7 +2,7 @@

$i18n.getString( "edit_relationship_type" )

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-12-16 04:39:49 +0000 @@ -2,7 +2,7 @@

$validation.program.displayName

- + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2013-12-16 04:39:49 +0000 @@ -2,7 +2,7 @@

$i18n.getString( "edit_validation_criteria" )

- +

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2013-12-06 11:34:43 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2013-12-16 04:39:49 +0000 @@ -1,15 +1,5 @@

$i18n.getString( "validation_criteria_management" ) #openHelp( "validation_criteria" )

$i18n.getString( "assign_validation_for_programs" )
$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
$i18n.getString( "show_details" )

+ #foreach($criteria in $criterias) - - + + + #end

$i18n.getString('name')	$i18n.getString('operator')
@@ -28,24 +18,29 @@
$encoder.htmlEncode( $!criteria.displayName )
$criteria.displayName	+ + + + + +

- -

+ +

$i18n.getString( "name" ):

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2013-12-16 04:39:49 +0000 @@ -66,7 +66,7 @@ - +

$i18n.getString( "dataentryform_management_for_program_stage" )

$programStage.displayName

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm 2013-12-16 04:39:49 +0000 @@ -48,7 +48,7 @@ } - + @@ -119,36 +119,10 @@ - - - - - - - - - - $i18n.getString("default_value") - - - - $i18n.getString("is_hidden") + + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm 2013-12-12 12:42:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm 2013-12-16 04:39:49 +0000 @@ -13,7 +13,7 @@ - +

$i18n.getString( "create_new_patient_attribute" )

$i18n.getString( "create_new_patient_attribute_group" )

$i18n.getString( "create_new_patient_identifier_type" )

$i18n.getString( "create_new_program" )

$i18n.getString( "create_new_program_indicator" )

$program.displayName

$programStage.displayName

$i18n.getString( "create_new_relationship_type" )

$program.displayName

$i18n.getString( "create_validation_criteria" )

$i18n.getString( 'patient_aggregation_query_builder_management' ) #openHelp( "patient_aggregation_query_builder" )

$i18n.getString( "patient_attribute_group_management" ) #openHelp( "patient_attribute_group" )

$i18n.getString( "patient_identifier_type_management" ) #openHelp( "patient_identifier_type" )

$i18n.getString( "patient_registration_form_management" ) #openHelp( "person_registration_form" )

$i18n.getString( "program_indicator_management_form" )

$program.displayName

$i18n.getString( "program_management" ) #openHelp( "program" )

$program.displayName

$program.displayName

$i18n.getString( "edit_patient_attribute_group" )

$i18n.getString( "edit_patient_identifier_type" )

$i18n.getString( "edit_program" )

$i18n.getString( "update_program_indicator" )

$programStage.program.displayName

$programStage.displayName

$i18n.getString( "edit_relationship_type" )

$validation.program.displayName

$i18n.getString( "edit_validation_criteria" )

$i18n.getString( "validation_criteria_management" ) #openHelp( "validation_criteria" )

$i18n.getString( "dataentryform_management_for_program_stage" )

$programStage.displayName