------------------------------------------------------------
revno: 20768
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-10-19 15:48:25 +0200
message:
Unused files
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/organisationUnitMerge.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
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js 2011-07-07 10:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js 1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-
-var operandToEliminate = 0;
-var operandToKeep = 0;
-
-function initLists()
-{
- $("#operandList").dhisAjaxSelect({
- source: "../dhis-web-commons-ajax-json/getOperands.action",
- iterator: "operands",
- handler: function(item) {
- var option = jQuery("<option />");
- option.text( item.operandName );
- option.attr( "value", item.operandId );
-
- return option;
- }
- });
-
- $("#operandList").bind('click', operandSelected);
-}
-
-function operandSelected()
-{
- var operandName = $( "#operandList :selected" ).text();
-
- if ( operandToEliminate == 0 ) // Step 1
- {
- $( "#eliminateNameField" ).html( operandName );
- $( "#confirmEliminateButton" ).removeAttr( "disabled" );
- }
- else // Step 2
- {
- $( "#keepNameField" ).html( operandName );
- $( "#confirmKeepButton" ).removeAttr( "disabled" );
- }
-}
-
-function eliminateConfirmed()
-{
- operandToEliminate = $( "#operandList" ).val();
-
- $( "#confirmEliminateButton" ).attr( "disabled", "disabled" );
-
- $( "#step1" ).css( "background-color", "white" );
- $( "#step2" ).css( "background-color", "#ccffcc" );
-}
-
-function keepConfirmed()
-{
- operandToKeep = $( "#operandList" ).val();
-
- if ( operandToEliminate == operandToKeep )
- {
- setMessage( i18n_select_different_data_elements );
- return;
- }
-
- $( "#confirmKeepButton" ).attr( "disabled", "disabled" );
- $( "#eliminateButton" ).removeAttr( "disabled" );
-
- $( "#step2" ).css( "background-color", "white" );
- $( "#step3" ).css( "background-color", "#ccffcc" );
-}
-
-function eliminate()
-{
- setWaitMessage( i18n_eliminating + "..." );
-
- $.ajax({
- "url": "eliminateDuplicateData.action",
- "data": {
- "dataElementToKeep": operandToKeep.split( "." )[0],
- "categoryOptionComboToKeep": operandToKeep.split( "." )[1],
- "dataElementToEliminate": operandToEliminate.split( "." )[0],
- "categoryOptionComboToEliminate": operandToEliminate.split( "." )[1] },
- "success": function()
- {
- setMessage( i18n_elimination_done );
- } });
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/organisationUnitMerge.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/organisationUnitMerge.js 2010-02-01 20:21:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/organisationUnitMerge.js 1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-
-var organisationUnitToEliminate = 0;
-var organisationUnitToKeep = 0;
-var organisationUnitSelected = 0;
-
-function treeSelected( unitIds )
-{
- organisationUnitSelected = unitIds[0];
-
- if ( organisationUnitSelected != null && organisationUnitSelected != 0 )
- {
- $.getJSON(
- "../dhis-web-commons-ajax-json/getOrganisationUnit.action",
- {
- "id": organisationUnitSelected
- },
- function( json )
- {
- if ( organisationUnitToEliminate == 0 ) // Step 1
- {
- document.getElementById( "eliminateNameField" ).innerHTML = json.organisationUnit.name;
- document.getElementById( "confirmOrganisationUnitToEliminateButton" ).disabled = false;
- }
- else // Step 2
- {
- document.getElementById( "keepNameField" ).innerHTML = json.organisationUnit.name;
- document.getElementById( "confirmOrganisationUnitToKeepButton" ).disabled = false;
- }
- }
- );
- }
-}
-
-function organisationUnitToEliminateConfirmed()
-{
- organisationUnitToEliminate = organisationUnitSelected;
- document.getElementById( "confirmOrganisationUnitToEliminateButton" ).disabled = true;
-
- document.getElementById( 'step1' ).style.backgroundColor = 'white';
- document.getElementById( 'step2' ).style.backgroundColor = '#ccffcc';
-}
-
-function organisationUnitToKeepConfirmed()
-{
- organisationUnitToKeep = organisationUnitSelected;
-
- if ( organisationUnitToEliminate == organisationUnitToKeep )
- {
- setMessage( i18n_select_different_org_units );
- return;
- }
-
- document.getElementById( "confirmOrganisationUnitToKeepButton" ).disabled = true;
- document.getElementById( "mergeButton" ).disabled = false;
-
- document.getElementById( 'step2' ).style.backgroundColor = 'white';
- document.getElementById( 'step3' ).style.backgroundColor = '#ccffcc';
-}
-
-function mergeOrganisationUnits()
-{
- setWaitMessage( i18n_merging + "..." );
-
- $.ajax({
- "url": "mergeOrganisationUnits.action",
- "data": {
- "organisationUnitToEliminate": organisationUnitToEliminate,
- "organisationUnitToKeep": organisationUnitToKeep },
- "success": function()
- {
- setMessage( i18n_merging_done );
- } });
-}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
