dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11264
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3187: cleanup in dhis-web-importexport
------------------------------------------------------------
revno: 3187
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-28 16:39:48 +0200
message:
cleanup in dhis-web-importexport
modified:
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/configDhis14Form.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm
--
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-importexport/src/main/webapp/dhis-web-importexport/configDhis14Form.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/configDhis14Form.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/configDhis14Form.vm 2011-03-28 14:39:48 +0000
@@ -1,3 +1,8 @@
+#if ( $message )
+<script type="text/javascript">
+ setMessage( "${message}" );
+</script>
+#end
<h3>$i18n.getString( "dhis14_file_configuration" )</h3>
@@ -36,17 +41,13 @@
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'save' )" style="width:50%" onclick="validateConfigDhis14()"><input
- type="button" value="$i18n.getString( 'cancel' )" style="width:50%" onclick="window.location.href='displayImportForm.action?importFormat=DHIS14FILE'"></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'save' )" style="width:50%" onclick="validateConfigDhis14()" />
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:50%" onclick="window.location.href='displayImportForm.action?importFormat=DHIS14FILE'" />
+ </td>
</tr>
</table>
</form>
<span id="message"></span>
-
-#if ( $message )
-<script type="text/javascript">
- setMessage( "${message}" );
-</script>
-#end
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm 2011-03-18 13:02:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm 2011-03-28 14:39:48 +0000
@@ -1,6 +1,19 @@
<script type="text/javascript">
jQuery(document).ready(function(){
datePickerInRange( 'startDate' , 'endDate' );
+
+ selectionTreeSelection.setMultipleSelectionAllowed( true );
+ selectionTree.clearSelectedOrganisationUnits();
+ selectionTree.buildSelectionTree();
+
+ var selectedOrganisationUnitIds = null;
+
+ function setSelectedOrganisationUnitIds( ids )
+ {
+ selectedOrganisationUnitIds = ids;
+ }
+
+ selectionTreeSelection.setListenerFunction( setSelectedOrganisationUnitIds );
});
var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
@@ -31,22 +44,6 @@
<tr>
<td colspan="3">
<div id="selectionTree" style="width:730px; height:220px"></div>
-
- <script type="text/javascript">
- selectionTreeSelection.setMultipleSelectionAllowed( true );
- selectionTree.clearSelectedOrganisationUnits();
- selectionTree.buildSelectionTree();
-
- var selectedOrganisationUnitIds = null;
-
- function setSelectedOrganisationUnitIds( ids )
- {
- selectedOrganisationUnitIds = ids;
- }
-
- selectionTreeSelection.setListenerFunction( setSelectedOrganisationUnitIds );
- </script>
-
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm 2010-02-27 21:18:45 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm 2011-03-28 14:39:48 +0000
@@ -14,7 +14,7 @@
</tr>
<tr>
<td>
- <input type="text" id="dataElementFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableDataElements' )" onfocus="clearFilter( 'dataElementFilter', 'availableDataElements' )" value="$i18n.getString( 'filter' )...">
+ <input type="text" id="dataElementFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableDataElements' )" onfocus="clearFilter( 'dataElementFilter', 'availableDataElements' )" value="$i18n.getString( 'filter' )">
<input type="button" value="$i18n.getString( 'clear' )" style="width:50px" onclick="clearFilter( 'dataElementFilter', 'availableDataElements' )">
<select id="dataDictionaryDataElementList" name="dataDictionaryDataElementList" onchange="dataElementCriteriaChanged()" style="width:210px">
<option value="null">[ $i18n.getString( "all_data_dictionary" ) ]</option>
@@ -67,8 +67,8 @@
</tr>
<tr>
<td>
- <input type="text" id="indicatorFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableIndicators' )" onfocus="clearFilter( 'indicatorFilter', 'availableIndicators' )" value="$i18n.getString( 'filter' )...">
- <input type="button" value="$i18n.getString( 'clear' )" style="width:50px" onclick="clearFilter( 'indicatorFilter', 'availableIndicators' )">
+ <input type="text" id="indicatorFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableIndicators' )" onfocus="clearFilter( 'indicatorFilter', 'availableIndicators' )" value="$i18n.getString( 'filter' )..." />
+ <input type="button" value="$i18n.getString( 'clear' )" style="width:50px" onclick="clearFilter( 'indicatorFilter', 'availableIndicators' )" />
<select id="dataDictionaryIndicatorList" name="dataDictionaryIndicatorList" onchange="indicatorCriteriaChanged()" style="width:210px">
<option value="null">[ $i18n.getString( "all_data_dictionary" ) ]</option>
#foreach( $dictionary in $dataDictionaries )
@@ -94,10 +94,10 @@
</tr>
<tr>
<td>
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2011-03-18 13:02:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2011-03-28 14:39:48 +0000
@@ -6,86 +6,86 @@
<form id="exportForm" name="exportForm" method="post" action="exportMetaData.action">
-<input type="hidden" name="exportFormat" value="$!exportFormat">
+<input type="hidden" name="exportFormat" value="$!exportFormat" />
<table width="325">
-
+
<colgroup>
<col width="25">
<col width="300">
</colgroup>
-
+
<!-- Elements -->
<tr>
<th colspan="2">$i18n.getString( "elements" )</th>
</tr>
<tr>
- <td><input id="dataElements" name="dataElements" type="checkbox" value="true"></td>
+ <td><input id="dataElements" name="dataElements" type="checkbox" value="true" /></td>
<td><label for="dataElements">$i18n.getString( 'data_elements' )</label></td>
</tr>
<tr>
- <td><input id="dataElementGroups" name="dataElementGroups" type="checkbox" value="true"></td>
+ <td><input id="dataElementGroups" name="dataElementGroups" type="checkbox" value="true" /></td>
<td><label for="dataElementGroups">$i18n.getString( 'data_element_groups' )</label></td>
</tr>
<tr>
- <td><input id="dataElementGroupSets" name="dataElementGroupSets" type="checkbox" value="true"></td>
+ <td><input id="dataElementGroupSets" name="dataElementGroupSets" type="checkbox" value="true" /></td>
<td><label for="dataElementGroupSets">$i18n.getString( 'data_element_group_sets' )</label></td>
</tr>
<tr>
- <td><input id="indicators" name="indicators" type="checkbox" value="true"></td>
+ <td><input id="indicators" name="indicators" type="checkbox" value="true" /></td>
<td><label for="indicators">$i18n.getString( 'indicators' )</label></td>
</tr>
<tr>
- <td><input id="indicatorGroups" name="indicatorGroups" type="checkbox" value="true"></td>
+ <td><input id="indicatorGroups" name="indicatorGroups" type="checkbox" value="true" /></td>
<td><label for="indicatorGroups">$i18n.getString( 'indicator_groups' )</label></td>
</tr>
<tr>
- <td><input id="indicatorGroupSets" name="indicatorGroupSets" type="checkbox" value="true"></td>
+ <td><input id="indicatorGroupSets" name="indicatorGroupSets" type="checkbox" value="true" /></td>
<td><label for="indicatorGroupSets">$i18n.getString( 'indicator_group_sets' )</label></td>
</tr>
<tr>
- <td><input id="dataDictionaries" name="dataDictionaries" type="checkbox" value="true"></td>
+ <td><input id="dataDictionaries" name="dataDictionaries" type="checkbox" value="true" /></td>
<td><label for="dataDictionaries">$i18n.getString( 'data_dictionaries' )</label></td>
</tr>
<tr>
- <td><input id="dataSets" name="dataSets" type="checkbox" value="true"></td>
+ <td><input id="dataSets" name="dataSets" type="checkbox" value="true" /></td>
<td><label for="dataSets">$i18n.getString( 'data_sets' )</label></td>
</tr>
<tr>
- <td><input id="organisationUnits" name="organisationUnits" type="checkbox" value="true"></td>
+ <td><input id="organisationUnits" name="organisationUnits" type="checkbox" value="true" /></td>
<td><label for="organisationUnits">$i18n.getString( 'organisation_units' )</label></td>
</tr>
<tr>
- <td><input id="organisationUnitGroups" name="organisationUnitGroups" type="checkbox" value="true"></td>
+ <td><input id="organisationUnitGroups" name="organisationUnitGroups" type="checkbox" value="true" /></td>
<td><label for="organisationUnitGroups">$i18n.getString( 'organisation_unit_groups' )</label></td>
</tr>
<tr>
- <td><input id="organisationUnitGroupSets" name="organisationUnitGroupSets" type="checkbox" value="true"></td>
+ <td><input id="organisationUnitGroupSets" name="organisationUnitGroupSets" type="checkbox" value="true" /></td>
<td><label for="organisationUnitGroupSets">$i18n.getString( 'organisation_unit_group_sets' )</label></td>
</tr>
<tr>
- <td><input id="organisationUnitLevels" name="organisationUnitLevels" type="checkbox" value="true"></td>
+ <td><input id="organisationUnitLevels" name="organisationUnitLevels" type="checkbox" value="true" /></td>
<td><label for="organisationUnitLevels">$i18n.getString( 'organisation_unit_levels' )</label></td>
</tr>
<tr>
- <td><input id="validationRules" name="validationRules" type="checkbox" value="true"></td>
+ <td><input id="validationRules" name="validationRules" type="checkbox" value="true" /></td>
<td><label for="validationRules">$i18n.getString( 'validation_rules' )</label></td>
</tr>
<tr>
- <td><input id="reports" name="reports" type="checkbox" value="true"></td>
+ <td><input id="reports" name="reports" type="checkbox" value="true" /></td>
<td><label for="reports">$i18n.getString( 'reports' )</label></td>
</tr>
<tr>
- <td><input id="reportTables" name="reportTables" type="checkbox" value="true"></td>
+ <td><input id="reportTables" name="reportTables" type="checkbox" value="true" /></td>
<td><label for="reportTables">$i18n.getString( 'report_tables' )</label></td>
</tr>
<tr>
- <td><input id="charts" name="charts" type="checkbox" value="true"></td>
+ <td><input id="charts" name="charts" type="checkbox" value="true" /></td>
<td><label for="charts">$i18n.getString( 'charts' )</label></td>
</tr>
<tr>
- <td><input id="olapUrls" name="olapUrls" type="checkbox" value="true"></td>
+ <td><input id="olapUrls" name="olapUrls" type="checkbox" value="true" /></td>
<td><label for="olapUrls">$i18n.getString( 'olap_urls' )</label></td>
</tr>
@@ -93,9 +93,9 @@
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'export' )" style="width:34%" onclick="submitMetaDataExportForm()"><input
- type="button" value="$i18n.getString( 'select_all' )" style="width:33%" onclick="toggle( 'all' )"><input
- type="button" value="$i18n.getString( 'select_none' )" style="width:33%" onclick="toggle( 'none' )">
+ <input type="button" value="$i18n.getString( 'export' )" style="width:34%" onclick="submitMetaDataExportForm()" />
+ <input type="button" value="$i18n.getString( 'select_all' )" style="width:33%" onclick="toggle( 'all' )" />
+ <input type="button" value="$i18n.getString( 'select_none' )" style="width:33%" onclick="toggle( 'none' )" />
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm 2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm 2011-03-28 14:39:48 +0000
@@ -7,4 +7,4 @@
#introListImgItem( "displayDataValueExportForm.action?exportFormat=DHIS14XML" "DHIS14_data_export" "dhis14" )
#introListImgItem( "displayMetaDataExportForm.action?exportFormat=PDF" "pdf_metadata_export" "pdf" )
#introListImgItem( "displayMetaDataExportForm.action?exportFormat=XLS" "xls_metadata_export" "excel" )
-</ul>
\ No newline at end of file
+</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm 2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm 2011-03-28 14:39:48 +0000
@@ -4,4 +4,4 @@
<ul id="introList">
#introListImgItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" "dhis14" )
#introListImgItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" "dhis14" )
-</ul>
\ No newline at end of file
+</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2011-03-18 13:02:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2011-03-28 14:39:48 +0000
@@ -1,5 +1,7 @@
<script type="text/javascript">
- getImportStatus();
+ jQuery(document).ready(function() {
+ getImportStatus();
+ });
var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'" )';
var i18n_importing = '$encoder.jsEscape( $i18n.getString( "importing" ), "'" )';
