dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13587
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4386: added missing semicolons etc to javascript files
------------------------------------------------------------
revno: 4386
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-08-19 23:33:57 +0200
message:
added missing semicolons etc to javascript files
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorTypeForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorTypeForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateLoad.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addSection.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editSection.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/mobiledataset.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/hierarchyOperations.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js
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/programStage.js
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/viewDataEntryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/tallySheet.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/addValidationRuleGroupForm.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js 2011-03-24 03:34:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js 2011-08-19 21:33:57 +0000
@@ -16,5 +16,5 @@
}, {
'rules': rules
- })
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js 2011-07-27 04:18:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js 2011-08-19 21:33:57 +0000
@@ -1,8 +1,6 @@
function dataSetSelected()
{
var dataSetId = $( '#dataSetId' ).val();
- var periodFrom = $( '#sDateLB' ).val();
- var periodTo = $( '#eDateLB' ).val();
if ( dataSetId && dataSetId != 0 )
{
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-07-27 03:07:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-08-19 21:33:57 +0000
@@ -108,14 +108,14 @@
// show history / plan
var history = '<h4>' + i18n_program_stages_history_plan + '</h4>';
- history += '<table>'
+ history += '<table>';
for ( i in json.programStageInstances )
{
history += '<tr>';
history += '<td>';
history += '<strong>' + json.programStageInstances[i].name + '</strong>';
history += '</td>';
- history += '<td style="text-align:center" bgcolor=' + json.programStageInstances[i].colorMap + '>'
+ history += '<td style="text-align:center" bgcolor=' + json.programStageInstances[i].colorMap + '>';
history += json.programStageInstances[i].infor;
history += '</td>';
history += '</tr>';
@@ -132,7 +132,7 @@
function loadDataEntry()
{
setInnerHTML('dataEntryFormDiv', '');
- showById('dataEntryFormDiv')
+ showById('dataEntryFormDiv');
setFieldValue( 'dueDate', '' );
setFieldValue( 'executionDate', '' );
@@ -496,7 +496,6 @@
var name = '';
-
var as = nameContainer.getElementsByTagName('a');
if ( as.length > 0 ) //Admin rights: Name is in a link
@@ -551,9 +550,9 @@
var inputs = document.getElementsByName( "entryfield" );
// Simple bubble sort
- for ( i = 0; i < inputs.length - 1; ++i )
+ for ( var i = 0; i < inputs.length - 1; ++i )
{
- for ( j = i + 1; j < inputs.length; ++j )
+ for ( var j = i + 1; j < inputs.length; ++j )
{
if ( inputs[i].tabIndex > inputs[j].tabIndex )
{
@@ -673,10 +672,10 @@
this.save = function()
{
- var params = 'dataElementId=' + dataElementId
- params += '&value=' + value
- params += '&providedByAnotherFacility=' + providedByAnotherFacility;
-
+ var params = 'dataElementId=' + dataElementId;
+ params += '&value=' + value;
+ params += '&providedByAnotherFacility=' + providedByAnotherFacility;
+
var request = new Request();
request.setCallbackSuccess( handleResponse );
request.setCallbackError( handleHttpError );
@@ -697,9 +696,9 @@
{
if(value != "")
{
- var validationElement = rootElement.getElementsByTagName( 'validations' )[0];
var dataelementList = rootElement.getElementsByTagName( 'validation' );
var message = '';
+
for ( var i = 0; i < dataelementList.length; i++ )
{
message += "\n - " + dataelementList[i].firstChild.nodeValue;
@@ -967,7 +966,7 @@
}
TOGGLE = {
- init : function(){
+ init : function() {
jQuery(".togglePanel").each(function(){
jQuery(this).next("table:first").addClass("sectionClose");
jQuery(this).addClass("close");
@@ -983,8 +982,8 @@
}
});
});
- },
-}
+ }
+};
//------------------------------------------------------
// Run validation
@@ -1087,7 +1086,8 @@
function entryFormContainerOnReady()
{
- var currentFocus;
+ var currentFocus = undefined;
+
if( jQuery("#entryFormContainer") ) {
if( jQuery("#executionDate").val() )
@@ -1118,7 +1118,7 @@
},
function()
{
- if(currentFocus){
+ if(currentFocus) {
DRAG_DIV.showData(jQuery(currentFocus).metadata({
"type":"attr",
"name":"data"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2011-07-15 08:28:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2011-08-19 21:33:57 +0000
@@ -91,7 +91,7 @@
{
var url = 'viewRecords.action?id=' + programStageInstanceId;
- var width = 800
+ var width = 800;
var height = 500;
var left = parseInt( ( screen.availWidth/2 ) - ( width/2 ) );
var top = parseInt( ( screen.availHeight/2 ) - ( height/2 ) );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js 2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js 2011-08-19 21:33:57 +0000
@@ -43,7 +43,7 @@
$( "#" + id + "Button" )
.attr({ src: "../images/down.png", title: "View violations" })
.css({ cursor: "pointer" })
- .click( function() { $( "#" + id + "Div" ).slideToggle( "fast" ) } );
+ .click( function() { $( "#" + id + "Div" ).slideToggle( "fast" ); } );
// Populate violation div
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addDataDictionaryForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addDataElementGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : beforeSubmit,
'rules' : getValidationRules( "dataElementGroup" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addDataElementGroupSet', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : beforeSubmit,
'rules' : getValidationRules( "dataElementGroupSet" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addIndicatorGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupSet.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addIndicatorGroupSet', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorTypeForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorTypeForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorTypeForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addIndicatorTypeForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'rules' : getValidationRules( "indicatorType" )
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-08-19 21:33:57 +0000
@@ -114,7 +114,7 @@
if ( type != null )
{
- url += "&type=" + type
+ url += "&type=" + type;
}
if ( filterCalculated )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateDataDictionaryForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateDataElementGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : beforeSubmit,
'rules' : getValidationRules( "dataElementGroup" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateDataElementGroupSet', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : beforeSubmit,
'rules' : getValidationRules( "dataElementGroupSet" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateIndicatorGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupSet.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateIndicatorGroupSet', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorTypeForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorTypeForm.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorTypeForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateIndicatorTypeForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'rules' : getValidationRules( "indicatorType" )
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateLoad.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateLoad.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateLoad.js 2011-08-19 21:33:57 +0000
@@ -10,4 +10,4 @@
button.onclick = removeCDEDataElement;
}
}
-}
\ No newline at end of file
+};
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js 2011-05-19 16:03:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js 2011-08-19 21:33:57 +0000
@@ -1,6 +1,6 @@
jQuery(document).ready(function() {
validation2('addDataSetForm', function(form) {
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function() {
$("#dataElementsSelectedList").find("option").attr("selected", "selected");
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addSection.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addSection.js 2011-04-11 11:52:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addSection.js 2011-08-19 21:33:57 +0000
@@ -1,6 +1,6 @@
jQuery(document).ready(function() {
validation2('addSectionForm', function(form) {
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function() {
selectAllById('selectedList');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js 2011-05-19 16:03:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js 2011-08-19 21:33:57 +0000
@@ -1,6 +1,6 @@
jQuery(document).ready(function() {
validation2('editDataSetForm', function(form) {
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function() {
$("#dataElementsSelectedList").find("option").attr("selected", "selected");
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editSection.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editSection.js 2011-04-11 11:52:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editSection.js 2011-08-19 21:33:57 +0000
@@ -1,9 +1,9 @@
jQuery(document).ready(function() {
validation2('editDataSetForm', function(form) {
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function() {
- selectAllById('selectedList')
+ selectAllById('selectedList');
},
'rules' : getValidationRules("section")
});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/mobiledataset.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/mobiledataset.js 2011-02-25 07:08:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/mobiledataset.js 2011-08-19 21:33:57 +0000
@@ -1,3 +1,4 @@
-function orgunitselected(){
- window.location.reload(true)
-}
\ No newline at end of file
+function orgunitselected()
+{
+ window.location.reload( true );
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2011-01-25 20:50:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2011-08-19 21:33:57 +0000
@@ -26,13 +26,13 @@
if( datasetId == "null" ) {
window.alert( i18n_please_select_dataset );
} else {
- window.location = "showSortSectionForm.action?dataSetId=" + datasetId;
+ window.location.href = "showSortSectionForm.action?dataSetId=" + datasetId;
}
}
function getSectionByDataSet(dataSetId)
{
- window.location = "section.action?dataSetId=" + dataSetId;
+ window.location.href = "section.action?dataSetId=" + dataSetId;
}
function removeSection(sectionId, sectionName)
@@ -102,7 +102,7 @@
function saveGreyStatus( sectionId_, dataElementId_, optionComboId_ )
{
- var sectionId = sectionId_
+ var sectionId = sectionId_;
var dataElementId = dataElementId_;
var optionComboId = optionComboId_;
var isGreyed;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js 2010-08-19 10:26:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js 2011-08-19 21:33:57 +0000
@@ -7,8 +7,8 @@
{
var nameField = document.getElementById( 'name' );
var shortNameField = document.getElementById( 'shortName' );
- var maxLength = parseInt( shortNameField.maxLength );
-
+// var maxLength = parseInt( shortNameField.maxLength );
+
if ( nameField.value.length >= 20 )
{
//if ( (previousName != nameField.value)
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2011-07-11 10:22:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2011-08-19 21:33:57 +0000
@@ -68,7 +68,7 @@
} else {
insertIndicator();
}
- })
+ });
$("#insertButton").button("option", "icons", { primary: "ui-icon-plusthick" });
$("#saveButton").button("option", "icons", { primary: "ui-icon-disk" });
@@ -113,7 +113,7 @@
function filterSelectList( select_id, filter )
{
var select_selector = "#" + select_id;
- var select_hidden_id = select_id + "_ghost"
+ var select_hidden_id = select_id + "_ghost";
var select_hidden_selector = "#" + select_hidden_id;
var $select_options = $(select_selector).find("option");
@@ -149,7 +149,7 @@
if(idxa > idxb) return 1;
else if(idxa < idxb) return -1;
else return 0;
- })
+ });
$(select_selector).empty();
$sorted.appendTo( select_selector );
@@ -174,7 +174,7 @@
var template = '<input id="indicator' + id + '" value="[ ' + title + ' ]" title="' + title + '" name="indicator" indicatorid="' + id + '" style="width:7em;text-align:center;" readonly="readonly" />';
if(!checkExisted("indicator" + id)) {
- oEditor.insertHtml( template )
+ oEditor.insertHtml( template );
} else {
showThenFadeOutMessage( "<b>" + i18n_indicator_already_inserted + "</b>" );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js 2011-04-11 11:36:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js 2011-08-19 21:33:57 +0000
@@ -1,9 +1,11 @@
-jQuery(document).ready(function() {
- validation2('addOrganisationUnitGroupForm', function(form) {
- form.submit()
- }, {
- 'rules' : getValidationRules("organisationUnitGroup")
- });
+jQuery( document ).ready( function()
+{
+ validation2( 'addOrganisationUnitGroupForm', function( form )
+ {
+ form.submit();
+ }, {
+ 'rules' : getValidationRules( "organisationUnitGroup" )
+ } );
- checkValueIsExist("name", "validateOrganisationUnitGroup.action");
-});
+ checkValueIsExist( "name", "validateOrganisationUnitGroup.action" );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/hierarchyOperations.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/hierarchyOperations.js 2011-02-03 09:23:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/hierarchyOperations.js 2011-08-19 21:33:57 +0000
@@ -91,7 +91,7 @@
function newParentOrganisationUnitConfirmed()
{
- var toMoveId = document.getElementById( 'organisationUnitToMoveId' ).value
+ var toMoveId = document.getElementById( 'organisationUnitToMoveId' ).value;
var newParentId = document.getElementById( 'newParentOrganisationUnitId' ).value;
var request = new Request();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2011-08-11 11:31:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2011-08-19 21:33:57 +0000
@@ -5,7 +5,7 @@
$( document ).ready( function()
{
selection.setListenerFunction( organisationUnitSelected, true );
-} )
+} );
function organisationUnitSelected( orgUnitIds )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js 2011-04-11 11:36:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js 2011-08-19 21:33:57 +0000
@@ -1,7 +1,9 @@
-jQuery(document).ready(function() {
- validation2('updateOrganisationUnitGroupForm', function(form) {
- form.submit()
- }, {
- 'rules' : getValidationRules("organisationUnitGroup")
- });
-});
+jQuery( document ).ready( function()
+{
+ validation2( 'updateOrganisationUnitGroupForm', function( form )
+ {
+ form.submit();
+ }, {
+ 'rules' : getValidationRules( "organisationUnitGroup" )
+ } );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2011-08-05 07:47:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2011-08-19 21:33:57 +0000
@@ -314,7 +314,8 @@
var identifiers = $(patient).find('identifier');
if( identifiers.length > 0 )
{
- sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_identifiers + "</strong></td></tr>"
+ sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_identifiers + "</strong></td></tr>";
+
$( identifiers ).each( function( i, identifier )
{
sPatient +="<tr class='identifierRow'>"
@@ -327,7 +328,8 @@
var attributes = $(patient).find('attribute');
if( attributes.length > 0 )
{
- sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_attributes + "</strong></td></tr>"
+ sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_attributes + "</strong></td></tr>";
+
$( attributes ).each( function( i, attribute )
{
sPatient +="<tr class='attributeRow'>"
@@ -638,7 +640,7 @@
field.style.backgroundColor = '#ffffcc';
var dateSaver = new DateSaver( programStageInstanceId, field.value, '#ccffcc' );
- dateSaver.save();s
+ dateSaver.save();
}
//----------------------------------------------------
@@ -880,10 +882,11 @@
function addAttributeOption()
{
var rowId = 'advSearchBox' + jQuery('#advancedSearchTB select[name=searchingAttributeId]').length + 1;
- var contend = '<td>' + getInnerHTML('searchingAttributeIdTD') + '</td>'
+ var contend = '<td>' + getInnerHTML('searchingAttributeIdTD') + '</td>';
contend += '<td>' + searchTextBox ;
contend += '<input type="button" value="-" onclick="removeAttributeOption(' + "'" + rowId + "'" + ');"></td>';
contend = '<tr id="' + rowId + '">' + contend + '</tr>';
+
$('#advancedSearchTB > tbody:last').append( contend );
}
=== 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 2011-07-21 07:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2011-08-19 21:33:57 +0000
@@ -39,7 +39,7 @@
if(stageId != ''){
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( getDataElementsFromStageReceived)
+ request.setCallbackSuccess( getDataElementsFromStageReceived);
request.send( "getProgramStage.action?id=" + stageId );
}
}
=== 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 2011-07-21 07:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2011-08-19 21:33:57 +0000
@@ -1,7 +1,7 @@
function getStageByProgram( programId )
{
- window.location = "programStage.action?id=" + programId;
+ window.location.href = "programStage.action?id=" + programId;
}
function addProgramStage()
@@ -97,6 +97,7 @@
function moveUpDataElement()
{
var selectedList = jQuery("#selectedList");
+
jQuery("#selectedList").find("tr").each( function( i, item ){
item = jQuery(item);
if( item.hasClass("selected") )
@@ -113,6 +114,7 @@
function moveDownDataElement()
{
var selectedList = jQuery("#selectedList");
+
jQuery("#selectedList").find("tr").each( function( i, item ){
item = jQuery(item);
if( item.hasClass("selected") )
=== 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 2011-07-22 04:01:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2011-08-19 21:33:57 +0000
@@ -26,9 +26,9 @@
setInnerHTML( 'nameField', $(validationCriteria).find('name').text() );
setInnerHTML( 'descriptionField', $(validationCriteria).find('description' ).text() );
- var property = $(validationCriteria).find('property').text()
- var operator = $(validationCriteria).find('operator').text()
- var value = $(validationCriteria).find('value').text()
+ var property = $(validationCriteria).find('property').text();
+ var operator = $(validationCriteria).find('operator').text();
+ var value = $(validationCriteria).find('value').text();
// get operator
if(operator == 0 ){
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2011-07-21 08:12:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2011-08-19 21:33:57 +0000
@@ -68,7 +68,7 @@
{
if( window.confirm( i18n_delete_confirm ) )
{
- window.location = 'delDataEntryForm.action?associationId=' + associationId;
+ window.location.href = 'delDataEntryForm.action?associationId=' + associationId;
}
}
@@ -152,7 +152,7 @@
var toMatch = item.text().toString().toLowerCase();
if( toMatch.indexOf(filterLower) != -1 ){
dataElementList.append( "<option value='" + item.attr('value') + "'>" + item.text() + "</option>" );
- }
+ };
});
}
@@ -195,8 +195,8 @@
var displayName = dataElementName;
id = associationId + "-" + dataElementId + "-val";
htmlCode = "<input name=\"entryselect\" id=\"" + id + "\" value=\"" + displayName + "\" title=\"" + displayName + "\">";
- }
- }
+ }
+ }
else if ( dataElementType == "bool" )
{
var titleValue = "-- " + dataElementId + "." + dataElementName + " ("+dataElementType+") --";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js 2011-06-18 17:19:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js 2011-08-19 21:33:57 +0000
@@ -1,22 +1,22 @@
-jQuery(document).ready(function()
+jQuery( document ).ready( function()
{
- validation2('addUserForm', function( form )
+ validation2( 'addUserForm', function( form )
{
- jQuery("#selectedList").children().attr("selected", true);
- form.submit()
+ jQuery( "#selectedList" ).children().attr( "selected", true );
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
- listValidator('roleValidator', 'selectedList');
+ listValidator( 'roleValidator', 'selectedList' );
},
- 'rules' : getValidationRules("user")
- });
+ 'rules' : getValidationRules( "user" )
+ } );
/* remote validation */
- checkValueIsExist("username", "validateUser.action");
+ checkValueIsExist( "username", "validateUser.action" );
- jQuery("#cancel").click(function()
+ jQuery( "#cancel" ).click( function()
{
- referrerBack("alluser.action");
- });
-});
+ referrerBack( "alluser.action" );
+ } );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserGroupForm.js 2011-05-23 13:05:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserGroupForm.js 2011-08-19 21:33:57 +0000
@@ -1,16 +1,16 @@
jQuery( document ).ready( function()
{
- validation2( 'addUserGroupForm', function( form )
- {
- form.submit()
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembersList' );
- },
- 'rules' : getValidationRules("userGroup")
- } );
+ validation2( 'addUserGroupForm', function( form )
+ {
+ form.submit();
+ }, {
+ 'beforeValidateHandler' : function()
+ {
+ listValidator( 'memberValidator', 'groupMembersList' );
+ },
+ 'rules' : getValidationRules( "userGroup" )
+ } );
- /* remote validation */
- checkValueIsExist( "name", "validateUserGroup.action" );
+ /* remote validation */
+ checkValueIsExist( "name", "validateUserGroup.action" );
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-06-18 17:19:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-08-19 21:33:57 +0000
@@ -1,23 +1,23 @@
-jQuery(document).ready(function()
+jQuery( document ).ready( function()
{
- var rules = getValidationRules("user");
+ var rules = getValidationRules( "user" );
rules["rawPassword"].required = false;
rules["retypePassword"].required = false;
- validation2('updateUserForm', function( form )
+ validation2( 'updateUserForm', function( form )
{
- jQuery("#selectedList").children().attr("selected", true);
- form.submit()
+ jQuery( "#selectedList" ).children().attr( "selected", true );
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
- listValidator('roleValidator', 'selectedList');
+ listValidator( 'roleValidator', 'selectedList' );
},
'rules' : rules
- });
+ } );
- jQuery("#cancel").click(function()
+ jQuery( "#cancel" ).click( function()
{
- referrerBack("alluser.action");
- });
-});
+ referrerBack( "alluser.action" );
+ } );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserGroupForm.js 2011-05-23 13:05:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserGroupForm.js 2011-08-19 21:33:57 +0000
@@ -1,13 +1,13 @@
jQuery( document ).ready( function()
{
- validation2( 'editUserGroupForm', function( form )
- {
- form.submit()
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembersList' );
- },
- 'rules' : getValidationRules("userGroup")
- } );
+ validation2( 'editUserGroupForm', function( form )
+ {
+ form.submit();
+ }, {
+ 'beforeValidateHandler' : function()
+ {
+ listValidator( 'memberValidator', 'groupMembersList' );
+ },
+ 'rules' : getValidationRules( "userGroup" )
+ } );
} );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js 2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addChartGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js 2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addReportGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js 2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'addReportTableGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/tallySheet.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/tallySheet.js 2011-06-23 14:38:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/tallySheet.js 2011-08-19 21:33:57 +0000
@@ -39,7 +39,7 @@
{
var length = document.configureTallySheetForm.checkbox.length;
- for ( i = 0; i < length; i++ )
+ for ( var i = 0; i < length; i++ )
{
document.configureTallySheetForm.checkbox[i].checked = true;
document.configureTallySheetForm.checked[i].value = true;
@@ -54,7 +54,7 @@
{
var length = document.configureTallySheetForm.checkbox.length;
- for ( i = 0; i < length; i++ )
+ for ( var i = 0; i < length; i++ )
{
document.configureTallySheetForm.checkbox[i].checked = false;
document.configureTallySheetForm.checked[i].value = false;
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js 2011-07-22 07:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,14 +2,16 @@
{
validation2( 'updateChartGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
listValidator( 'memberValidator', 'groupMembers' );
},
'rules' : getValidationRules( "chartGroup" )
- });
-
- checkValueIsExist( "name", "validateChartGroup.action", {id: getFieldValue( "id" )});
-});
+ } );
+
+ checkValueIsExist( "name", "validateChartGroup.action", {
+ id : getFieldValue( "id" )
+ } );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js 2011-07-22 07:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,14 +2,16 @@
{
validation2( 'updateReportGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
listValidator( 'memberValidator', 'groupMembers' );
},
'rules' : getValidationRules( "reportGroup" )
- });
-
- checkValueIsExist( "name", "validateReportGroup.action", {id: getFieldValue( "id" )});
-});
+ } );
+
+ checkValueIsExist( "name", "validateReportGroup.action", {
+ id : getFieldValue( "id" )
+ } );
+} );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js 2011-07-22 07:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js 2011-08-19 21:33:57 +0000
@@ -2,7 +2,7 @@
{
validation2( 'updateReportTableGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
@@ -10,7 +10,9 @@
},
'rules' : getValidationRules( "reportTableGroup" )
} );
-
- checkValueIsExist( "name", "validateReportTableGroup.action", {id: getFieldValue( "id" )});
-
+
+ checkValueIsExist( "name", "validateReportTableGroup.action", {
+ id : getFieldValue( "id" )
+ } );
+
} );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/addValidationRuleGroupForm.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/addValidationRuleGroupForm.js 2011-06-23 14:44:17 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/addValidationRuleGroupForm.js 2011-08-19 21:33:57 +0000
@@ -4,11 +4,11 @@
validation2( 'addValidationRuleGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
- selectAllById( 'groupMembers' )
+ selectAllById( 'groupMembers' );
},
'rules' : getValidationRules( "validationRuleGroup" )
} );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js 2011-06-15 09:16:51 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js 2011-08-19 21:33:57 +0000
@@ -4,11 +4,11 @@
validation2( 'updateValidationRuleGroupForm', function( form )
{
- form.submit()
+ form.submit();
}, {
'beforeValidateHandler' : function()
{
- selectAllById( 'groupMembers' )
+ selectAllById( 'groupMembers' );
},
'rules' : getValidationRules( "validationRuleGroup" )
} );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js 2011-06-23 14:44:17 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js 2011-08-19 21:33:57 +0000
@@ -34,13 +34,12 @@
function initLists()
{
- var id;
- for ( id in groupMembers )
+ for ( var id in groupMembers )
{
$( "#groupMembers" ).append( $( "<option></option>" ).attr( "value", id ).text( groupMembers[id] ) );
}
- for ( id in availableValidationRules )
+ for ( var id in availableValidationRules )
{
$( "#availableValidationRules" ).append(
$( "<option></option>" ).attr( "value", id ).text( availableValidationRules[id] ) );
