dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11026
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3060: cleaned up javascript a bit in dhis-web-maintenance-dataadmin
------------------------------------------------------------
revno: 3060
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-17 15:42:52 +0100
message:
cleaned up javascript a bit in dhis-web-maintenance-dataadmin
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showcache.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.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-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-01-06 17:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-03-17 14:42:52 +0000
@@ -1,11 +1,11 @@
-<script>
-jQuery(document).ready(function() {
-
- validation( 'addSqlViewForm', function() {
- validateAddUpdateSqlView( 'add' );
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ validation( 'addSqlViewForm', function() {
+ validateAddUpdateSqlView( 'add' );
+ });
});
-});
</script>
+
<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
<h3>$encoder.htmlEncode( $i18n.getString( "add_new_sql_view" ) )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm 2011-03-01 08:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm 2011-03-17 14:42:52 +0000
@@ -1,11 +1,16 @@
-<script>
- jQuery(document).ready( function()
- {
+<script type="text/javascript">
+ jQuery(document).ready( function() {
validation( 'lockingForm', function( form )
{
validateCollectiveDataLockingForm( form );
});
});
+
+ var i18n_organisation_unit_not_selected = '$encoder.jsEscape( $i18n.getString( "organisation_unit_not_selected" ) , "'")';
+ var i18n_period_not_selected = '$encoder.jsEscape( $i18n.getString( "period_not_selected" ) , "'")';
+ var i18n_dataset_not_selected = '$encoder.jsEscape( $i18n.getString( "dataset_not_selected" ) , "'")';
+ var i18n_lock = '$encoder.jsEscape( $i18n.getString( "lock" ) , "'")';
+ var i18n_unlock = '$encoder.jsEscape( $i18n.getString( "unlock" ) , "'")';
</script>
<h3>$i18n.getString( "data_locking_form" ) #openHelp( "dataLocking" )</h3>
@@ -88,13 +93,3 @@
</form>
<span id="message"></span>
-
-<script type="text/javascript">
-
- var i18n_organisation_unit_not_selected = '$encoder.jsEscape( $i18n.getString( "organisation_unit_not_selected" ) , "'")';
- var i18n_period_not_selected = '$encoder.jsEscape( $i18n.getString( "period_not_selected" ) , "'")';
- var i18n_dataset_not_selected = '$encoder.jsEscape( $i18n.getString( "dataset_not_selected" ) , "'")';
- var i18n_lock = '$encoder.jsEscape( $i18n.getString( "lock" ) , "'")';
- var i18n_unlock = '$encoder.jsEscape( $i18n.getString( "unlock" ) , "'")';
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm 2011-03-17 14:42:52 +0000
@@ -3,4 +3,6 @@
<div align="left"><h3>$message</h3></div>
-<p><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayLockingForm.action'" style="width:100px"/></p>
\ No newline at end of file
+<p>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayLockingForm.action'" style="width:100px"/>
+</p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2010-09-25 20:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2011-03-17 14:42:52 +0000
@@ -1,14 +1,23 @@
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ datePickerInRange( 'startDate' , 'endDate' );
+ });
+
+ var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
+ var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
+ var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
+</script>
<style type="text/css">
-.overlaps
-{
- padding:1em;
- margin:1em;
- background-color: #baffbc;
- border: 1px solid #12cd17;
- width: 500px;
- display: none;
-}
+ .overlaps
+ {
+ padding:1em;
+ margin:1em;
+ background-color: #baffbc;
+ border: 1px solid #12cd17;
+ width: 500px;
+ display: none;
+ }
</style>
<h3>$i18n.getString( "data_archive" ) #openHelp( "dataArchive" )</h3>
@@ -52,14 +61,3 @@
<br/>
<span id="message"></span>
-
-<script type="text/javascript">
- var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
- var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
- var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
-
- $(document).ready(function()
- {
- datePickerInRange( 'startDate' , 'endDate' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2011-03-14 05:00:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,24 @@
+<script type="text/javascript">
+ var flag;
+ window.onload = modeHandler;
+
+ jQuery(document).ready(function() {
+ datePickerInRange( 'fromDate' , 'toDate' );
+
+ validation( 'databrowser', function( form ){
+ form.submit();
+ });
+ });
+
+ var i18n_drilldown_earliest_selected = '$encoder.jsEscape( $i18n.getString("earliest_date_used_if_no_date_selected"), "'" )';
+ var i18n_drilldown_latest_selected = '$encoder.jsEscape( $i18n.getString("latest_date_used_if_no_date_selected"), "'" )';
+ var i18n_drilldown_choose_period_type = '$encoder.jsEscape( $i18n.getString("drilldown_choose_period_type"), "'" )';
+ var i18n_drilldown_fromdate_invalid = '$encoder.jsEscape( $i18n.getString("drilldown_fromdate_invalid"), "'" )';
+ var i18n_drilldown_enddate_invalid = '$encoder.jsEscape( $i18n.getString("drilldown_enddate_invalid"), "'" )';
+ var i18n_drilldown_fromdate_is_later_tdan_todate = '$encoder.jsEscape( $i18n.getString("drilldown_fromdate_is_later_tdan_todate"), "'" )';
+ var i18n_drilldown_select_browse_mode = '$encoder.jsEscape( $i18n.getString("drilldown_select_browse_mode"), "'" )';
+</script>
+
<h3>$i18n.getString( "data_browser" ) #openHelp( "dataBrowser" )</h3>
<form id="databrowser" method="get" action="searchResult.action">
@@ -82,27 +103,3 @@
</form>
<span id="message"></span>
-
-<script type="text/javascript">
-
- var flag;
- window.onload = modeHandler;
-
- var i18n_drilldown_earliest_selected = '$encoder.jsEscape( $i18n.getString("earliest_date_used_if_no_date_selected"), "'" )';
- var i18n_drilldown_latest_selected = '$encoder.jsEscape( $i18n.getString("latest_date_used_if_no_date_selected"), "'" )';
- var i18n_drilldown_choose_period_type = '$encoder.jsEscape( $i18n.getString("drilldown_choose_period_type"), "'" )';
- var i18n_drilldown_fromdate_invalid = '$encoder.jsEscape( $i18n.getString("drilldown_fromdate_invalid"), "'" )';
- var i18n_drilldown_enddate_invalid = '$encoder.jsEscape( $i18n.getString("drilldown_enddate_invalid"), "'" )';
- var i18n_drilldown_fromdate_is_later_tdan_todate = '$encoder.jsEscape( $i18n.getString("drilldown_fromdate_is_later_tdan_todate"), "'" )';
- var i18n_drilldown_select_browse_mode = '$encoder.jsEscape( $i18n.getString("drilldown_select_browse_mode"), "'" )';
-
- jQuery(document).ready(function() {
-
- datePickerInRange( 'fromDate' , 'toDate' );
-
- validation( 'databrowser', function( form ){
- form.submit();
- });
- });
-
-</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm 2011-03-15 03:37:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+ jQuery(document).ready( function()
+ {
+ validation( 'exportPDF', function( form ){ form.submit() });
+ loadListeners();
+ });
+</script>
#if ( $grid.getHeight() == 0 || $grid.getWidth() == 0 )
<br/><br/>$i18n.getString( "no_data_found" )
@@ -47,14 +54,4 @@
</ul>
</div>
-<script type="text/javascript">
-
- loadListeners();
-
- jQuery(document).ready( function()
- {
- validation( 'exportPDF', function( form ){ form.submit() });
- });
-</script>
-
-#end
\ No newline at end of file
+#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2011-03-15 03:37:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2011-03-17 14:42:52 +0000
@@ -1,5 +1,4 @@
-<style>
-
+<style type="text/css">
div#drillDownMenu
{
position: absolute;
@@ -10,7 +9,6 @@
{
text-align: center;
}
-
</style>
<h3>$!encoder.htmlEncode( $grid.title )</h3>
@@ -95,4 +93,4 @@
<br/>
<!-- Data Browser Grid -->
-#parse( "/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm" )
\ No newline at end of file
+#parse( "/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,12 @@
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ initLists();
+ });
+
+ var i18n_eliminating = '$encoder.jsEscape( $i18n.getString( "eliminating" ), "'" )';
+ var i18n_elimination_done = '$encoder.jsEscape( $i18n.getString( "elimination_done" ), "'" )';
+ var i18n_select_different_data_elements = '$encoder.jsEscape( $i18n.getString( "select_different_data_elements" ), "'" )';
+</script>
<h3>$i18n.getString( "duplicate_data_elimination" ) #openHelp( "duplicateDataElimination" )</h3>
@@ -49,11 +58,3 @@
</table>
<p><span id="message"></span></p>
-
-<script type="text/javascript">
- var i18n_eliminating = '$encoder.jsEscape( $i18n.getString( "eliminating" ), "'" )';
- var i18n_elimination_done = '$encoder.jsEscape( $i18n.getString( "elimination_done" ), "'" )';
- var i18n_select_different_data_elements = '$encoder.jsEscape( $i18n.getString( "select_different_data_elements" ), "'" )';
-
- initLists();
-</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm 2011-02-01 18:55:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,8 @@
+<script type="text/javascript">
+ var i18n_select_options = '$encoder.jsEscape( $i18n.getString( "select_options" ), "'" )';
+ var i18n_performing_maintenance = '$encoder.jsEscape( $i18n.getString( "performing_maintenance" ), "'" )';
+ var i18n_maintenance_performed = '$encoder.jsEscape( $i18n.getString( "maintenance_performed" ), "'" )';
+</script>
<h3>$i18n.getString( "maintenance" ) #openHelp( "maintenance" )</h3>
@@ -31,9 +36,3 @@
</p>
<span id="message"></span>
-
-<script type="text/javascript">
- var i18n_select_options = '$encoder.jsEscape( $i18n.getString( "select_options" ), "'" )';
- var i18n_performing_maintenance = '$encoder.jsEscape( $i18n.getString( "performing_maintenance" ), "'" )';
- var i18n_maintenance_performed = '$encoder.jsEscape( $i18n.getString( "maintenance_performed" ), "'" )';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm 2010-10-24 15:41:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm 2011-03-17 14:42:52 +0000
@@ -1,23 +1,25 @@
<h2>$i18n.getString( "data_administration" ) </h2>
- <ul>
- <li><a href="displayDataBrowserForm.action">$i18n.getString( "data_browser" ) </a></li>
- <li><a href="displayDataIntegrityForm.action">$i18n.getString( "data_integrity" ) </a></li>
- <li><a href="displayDataArchiveForm.action">$i18n.getString( "data_archive" ) </a></li>
- <li><a href="displayPatientDataArchiveForm.action">$i18n.getString( "patient_data_archive" ) </a></li>
- <li><a href="displayMaintenanceForm.action">$i18n.getString( "maintenance" ) </a></li>
- <li><a href="displayResourceTableForm.action">$i18n.getString( "resource_table" ) </a></li>
- <li><a href="showSqlViewListForm.action">$i18n.getString( "sql_view" ) </a></li>
- <li><a href="displayOrganisationUnitMergeForm.action">$i18n.getString( "organisation_unit_merge" ) </a></li>
- <li><a href="displayDuplicateDataEliminationForm.action">$i18n.getString( "duplicate_data_elimination" ) </a></li>
- <li><a href="viewStatistics.action">$i18n.getString( "data_statistics" ) </a></li>
- <li><a href="displayLockingForm.action">$i18n.getString( "data_locking" ) </a></li>
- <li><a href="zeroValueStorageManagement.action">$i18n.getString( "zero_storage_management" ) </a></li>
- <li><a href="displayPruneOrganisationUnitForm.action">$i18n.getString( "organisation_unit_pruning" ) </a></li>
- <li><a href="getMinMaxValidationParams.action">$i18n.getString( "min_max_value_generation") </a></li>
- </ul>
-
+
+<ul>
+ <li><a href="displayDataBrowserForm.action">$i18n.getString( "data_browser" ) </a></li>
+ <li><a href="displayDataIntegrityForm.action">$i18n.getString( "data_integrity" ) </a></li>
+ <li><a href="displayDataArchiveForm.action">$i18n.getString( "data_archive" ) </a></li>
+ <li><a href="displayPatientDataArchiveForm.action">$i18n.getString( "patient_data_archive" ) </a></li>
+ <li><a href="displayMaintenanceForm.action">$i18n.getString( "maintenance" ) </a></li>
+ <li><a href="displayResourceTableForm.action">$i18n.getString( "resource_table" ) </a></li>
+ <li><a href="showSqlViewListForm.action">$i18n.getString( "sql_view" ) </a></li>
+ <li><a href="displayOrganisationUnitMergeForm.action">$i18n.getString( "organisation_unit_merge" ) </a></li>
+ <li><a href="displayDuplicateDataEliminationForm.action">$i18n.getString( "duplicate_data_elimination" ) </a></li>
+ <li><a href="viewStatistics.action">$i18n.getString( "data_statistics" ) </a></li>
+ <li><a href="displayLockingForm.action">$i18n.getString( "data_locking" ) </a></li>
+ <li><a href="zeroValueStorageManagement.action">$i18n.getString( "zero_storage_management" ) </a></li>
+ <li><a href="displayPruneOrganisationUnitForm.action">$i18n.getString( "organisation_unit_pruning" ) </a></li>
+ <li><a href="getMinMaxValidationParams.action">$i18n.getString( "min_max_value_generation") </a></li>
+</ul>
+
<h2>$i18n.getString( "system_administration" ) </h2>
- <ul>
- <li><a href="showCache.action">$i18n.getString( "cache_statistics" ) </a></li>
- </ul>
\ No newline at end of file
+
+<ul>
+ <li><a href="showCache.action">$i18n.getString( "cache_statistics" ) </a></li>
+</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm 2011-03-17 14:42:52 +0000
@@ -1,29 +1,14 @@
-<h2>Data Administration</h2>
-<ul>
- <li>Data Administration</li>
- <ul>
- <li>
- Data Locking
- </li>
- </ul>
-</ul>
-<div style=" float:right; font-size:8pt; cursor:pointer; margin-top:-15px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( 'go_back' )"/></a>
-</div>
-
-<br/><br/>
-
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-
<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
+ jQuery(document).ready(function() {
+ selection.setListenerFunction( orgUnitHasBeenSelected );
+ });
-function orgUnitHasBeenSelected( orgUnitIds )
-{
-
- getSelectedOrgUnit( orgUnitIds );
-}
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+
+ getSelectedOrgUnit( orgUnitIds );
+ }
function getSelectedOrgUnit( orgUnitIds )
{
@@ -95,7 +80,22 @@
document.getElementById( "organisationUnitIds" ).disabled=true;
}
}
-
-
-selection.setListenerFunction( orgUnitHasBeenSelected );
-</script>
\ No newline at end of file
+</script>
+
+<h2>Data Administration</h2>
+<ul>
+ <li>Data Administration</li>
+ <ul>
+ <li>
+ Data Locking
+ </li>
+ </ul>
+</ul>
+<div style=" float:right; font-size:8pt; cursor:pointer; margin-top:-15px; ">
+ <a href="index.action">
+ <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( 'go_back' )"/></a>
+</div>
+
+<br/><br/>
+
+#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm 2010-10-04 16:37:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm 2011-03-17 14:42:52 +0000
@@ -1,26 +1,29 @@
-<script>
-var isGenerate = true;
-//-----------------------------------------------------------------------
-//init jQuery validation for reportAssociation
-//-----------------------------------------------------------------------
- jQuery(document).ready(
- function()
- {
- jQuery("#minMaxGeneratingForm").validate({
- meta:"validate"
- ,errorElement:"td"
- ,submitHandler: function(form)
- {
- if(isGenerate){
- generateMinMaxValue();
- }else{
- removeMinMaxValue();
- }
- }
- });
- }
- );
-
+<script type="text/javascript">
+ var isGenerate = true;
+ var numberOfSelects = 0;
+
+ //-----------------------------------------------------------------------
+ //init jQuery validation for reportAssociation
+ //-----------------------------------------------------------------------
+ jQuery(document).ready(function() {
+ jQuery("#minMaxGeneratingForm").validate({
+ meta:"validate"
+ ,errorElement:"td"
+ ,submitHandler: function(form)
+ {
+ if(isGenerate){
+ generateMinMaxValue();
+ }else{
+ removeMinMaxValue();
+ }
+ }
+ });
+ });
+
+ var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';
+ var levelMustBeInt = '$encoder.jsEncode( $i18n.getString( "level_must_be_int" ) )';
+ var i18n_not_choose_dataset = '$encoder.jsEncode( $i18n.getString( "not_choose_dataset" ) )';
+ var i18n_not_choose_organisation = '$encoder.jsEncode( $i18n.getString( "not_choose_organisation" ) )';
</script>
<h3>$i18n.getString( "min_max_value_generation" )</h3>
@@ -49,13 +52,4 @@
</table>
</form>
-<script type="text/javascript">
-
- var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';
- var levelMustBeInt = '$encoder.jsEncode( $i18n.getString( "level_must_be_int" ) )';
- var i18n_not_choose_dataset = '$encoder.jsEncode( $i18n.getString( "not_choose_dataset" ) )';
- var i18n_not_choose_organisation = '$encoder.jsEncode( $i18n.getString( "not_choose_organisation" ) )';
- var numberOfSelects = 0;
-
-</script>
-<span id="info" style="display:none;top:70px;right:5px;position:fixed;" onclick="hideById(this.id)"></span>
\ No newline at end of file
+<span id="info" style="display:none;top:70px;right:5px;position:fixed;" onclick="hideById(this.id)"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm 2011-03-17 14:42:52 +0000
@@ -1,14 +1,21 @@
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ selectionTreeSelection.setMultipleSelectionAllowed( false );
+ selectionTreeSelection.setListenerFunction( treeSelected );
+ selectionTree.clearSelectedOrganisationUnits();
+ selectionTree.buildSelectionTree();
+ });
+
+ var i18n_merging = '$encoder.jsEscape( $i18n.getString( "merging" ), "'" )';
+ var i18n_merging_done = '$encoder.jsEscape( $i18n.getString( "merging_done" ), "'" )';
+ var i18n_select_different_org_units = '$encoder.jsEscape( $i18n.getString( "select_different_org_units" ), "'" )';
+</script>
+
<h3>$i18n.getString( "organisation_unit_merge" ) #openHelp( "organisationUnitMerge" )</h3>
<div id="selectionTree" style="width:500px; height:200px"></div>
-<script type="text/javascript">
- selectionTreeSelection.setMultipleSelectionAllowed( false );
- selectionTreeSelection.setListenerFunction( treeSelected );
- selectionTree.clearSelectedOrganisationUnits();
- selectionTree.buildSelectionTree();
-</script>
<br/>
@@ -52,9 +59,3 @@
</table>
<p><span id="message"></span></p>
-
-<script type="text/javascript">
- var i18n_merging = '$encoder.jsEscape( $i18n.getString( "merging" ), "'" )';
- var i18n_merging_done = '$encoder.jsEscape( $i18n.getString( "merging_done" ), "'" )';
- var i18n_select_different_org_units = '$encoder.jsEscape( $i18n.getString( "select_different_org_units" ), "'" )';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2010-10-25 06:11:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2011-03-17 14:42:52 +0000
@@ -1,14 +1,24 @@
+<script type="text/javascript">
+ jQuery(document).ready(function()
+ {
+ datePickerInRange( 'startDate' , 'endDate' );
+ });
+
+ var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
+ var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
+ var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
+</script>
<style type="text/css">
-.overlaps
-{
- padding:1em;
- margin:1em;
- background-color: #baffbc;
- border: 1px solid #12cd17;
- width: 500px;
- display: none;
-}
+ .overlaps
+ {
+ padding:1em;
+ margin:1em;
+ background-color: #baffbc;
+ border: 1px solid #12cd17;
+ width: 500px;
+ display: none;
+ }
</style>
<h3>$i18n.getString( "patient_data_archive" ) #openHelp( "patientDataArchive" )</h3>
@@ -52,14 +62,3 @@
<br/>
<span id="message"></span>
-
-<script type="text/javascript">
- var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
- var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
- var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
-
- $(document).ready(function()
- {
- datePickerInRange( 'startDate' , 'endDate' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm 2010-11-08 09:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm 2011-03-17 14:42:52 +0000
@@ -3,6 +3,12 @@
// Override the listener after tree loaded succesfully
selectionTreeSelection.setListenerFunction( treeSelected );
});
+
+ var i18n_confirmation = '$encoder.jsEscape( $i18n.getString( "prune_organisation_unit_confirmation" ), "'" )';
+ var i18n_pruning = '$encoder.jsEscape( $i18n.getString( "pruning" ), "'" )';
+ var i18n_not_selected = '$encoder.jsEscape( $i18n.getString( "not_selected" ), "'" )';
+ var i18n_pruning_done = '$encoder.jsEscape( $i18n.getString( "pruning_done" ), "'" )';
+ var i18n_pruning_interrupted = '$encoder.jsEscape( $i18n.getString( "pruning_interrupted" ), "'" )';
</script>
<h3>$i18n.getString( "organisation_unit_pruning" )</h3>
@@ -27,11 +33,3 @@
</table>
<p><span id="message"></span></p>
-
-<script type="text/javascript">
- var i18n_confirmation = '$encoder.jsEscape( $i18n.getString( "prune_organisation_unit_confirmation" ), "'" )';
- var i18n_pruning = '$encoder.jsEscape( $i18n.getString( "pruning" ), "'" )';
- var i18n_not_selected = '$encoder.jsEscape( $i18n.getString( "not_selected" ), "'" )';
- var i18n_pruning_done = '$encoder.jsEscape( $i18n.getString( "pruning_done" ), "'" )';
- var i18n_pruning_interrupted = '$encoder.jsEscape( $i18n.getString( "pruning_interrupted" ), "'" )';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2010-09-16 19:01:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,12 @@
+<script type="text/javascript">
+ var i18n_generating_resource_tables = '$encoder.jsEscape( $i18n.getString( "generating_resource_tables" ), "'" )';
+ var i18n_resource_tables_generated = '$encoder.jsEscape( $i18n.getString( "resource_tables_generated" ), "'" )';
+ var i18n_regenerating_resource_tables_and_views = '$encoder.jsEscape( $i18n.getString( "regenerating_resource_tables_and_views" ), "'" )';
+ var i18n_regenerating_failed = '$encoder.jsEscape( $i18n.getString( "regenerating_failed" ), "'" )';
+ var i18n_select_options = '$encoder.jsEscape( $i18n.getString( "select_options" ), "'" )';
+ var i18n_select_all = '$encoder.jsEscape( $i18n.getString( "select_all" ), "'" )';
+ var i18n_unselect_all = '$encoder.jsEscape( $i18n.getString( "unselect_all" ), "'" )';
+</script>
<h3>$i18n.getString( "resource_table" ) #openHelp( "resourceTables" )</h3>
@@ -43,15 +52,3 @@
</table>
<span id="message"></span>
-
-<script type="text/javascript">
-
- var i18n_generating_resource_tables = '$encoder.jsEscape( $i18n.getString( "generating_resource_tables" ), "'" )';
- var i18n_resource_tables_generated = '$encoder.jsEscape( $i18n.getString( "resource_tables_generated" ), "'" )';
- var i18n_regenerating_resource_tables_and_views = '$encoder.jsEscape( $i18n.getString( "regenerating_resource_tables_and_views" ), "'" )';
- var i18n_regenerating_failed = '$encoder.jsEscape( $i18n.getString( "regenerating_failed" ), "'" )';
- var i18n_select_options = '$encoder.jsEscape( $i18n.getString( "select_options" ), "'" )';
- var i18n_select_all = '$encoder.jsEscape( $i18n.getString( "select_all" ), "'" )';
- var i18n_unselect_all = '$encoder.jsEscape( $i18n.getString( "unselect_all" ), "'" )';
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm 2011-03-17 14:42:52 +0000
@@ -1,15 +1,13 @@
-<style>
-
+<style type="text/css">
th.formatLabel
{
text-align: center;
}
-
</style>
<h3>$i18n.getString( "view_data_for" ) "$!viewTableName"</h3>
- <table class="listTable">
+<table class="listTable">
<thead>
<tr>
#foreach ( $columnName in $sqlViewTable.getHeaders() )
@@ -17,7 +15,7 @@
#end
</tr>
</thead>
-
+
<tbody>
#foreach( $row in $sqlViewTable.getRecords() )
<tr>
@@ -30,14 +28,14 @@
</tr>
#end
</tbody>
- </table>
-
- <br/>
-
- <div>
- <table>
- <tr>
- <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em"/>
- </tr>
- </table>
- </div>
\ No newline at end of file
+</table>
+
+<br/>
+
+<div>
+ <table>
+ <tr>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em"/>
+ </tr>
+ </table>
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm 2010-10-01 07:03:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,7 @@
+<script type="text/javascript">
+ var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_sqlview" ) , "'")';
+</script>
<h3>$encoder.htmlEncode( $i18n.getString( "sql_view_management" ) ) #openHelp( "sqlView" )</h3>
<table>
@@ -65,8 +69,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_sqlview" ) , "'")';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showcache.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showcache.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showcache.vm 2011-03-17 14:42:52 +0000
@@ -79,4 +79,4 @@
<td>$stats.getQueryStatistics( $query ).executionRowCount</td>
</tr>
#end
-</table>
\ No newline at end of file
+</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-01-06 17:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-03-17 14:42:52 +0000
@@ -1,11 +1,11 @@
-<script>
-jQuery(document).ready(function() {
-
- validation( 'updateSqlViewForm', function() {
- validateAddUpdateSqlView( 'update' );
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ validation( 'updateSqlViewForm', function() {
+ validateAddUpdateSqlView( 'update' );
+ });
});
-});
</script>
+
<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
<h3>$encoder.htmlEncode( $i18n.getString( "update_sql_view" ) )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm 2010-09-23 07:35:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm 2011-03-17 14:42:52 +0000
@@ -1,3 +1,20 @@
+<script type="text/javascript">
+ function getSaveZeroDataElements( value )
+ {
+ jQuery.postJSON('../dhis-web-commons-ajax-json/getDataElements.action', {id: value },
+ function( json ) {
+ var ignoreZeroValueDataElements = jQuery("#ignoreZeroValueDataElements");
+ ignoreZeroValueDataElements.empty();
+ jQuery.each( json.dataElements, function(i, item) {
+ if( item.zeroIsSignificant == 'false' )
+ {
+ ignoreZeroValueDataElements.append( "<option value='" + item.id + "'>" + item.name + "</option>");
+ }
+ });
+ });
+ }
+</script>
+
<h3>$i18n.getString( "zero_storage_management" ) #openHelp( "zeroValueStorage" )</h3>
<br/>
<form id="ZeroDataValueManagement" method="POST" action="updateZeroIsSignificantForDataElements.action" onsubmit="selectAllById( 'zeroDataValueElements' )">
@@ -58,21 +75,3 @@
<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='index.action'" style="width:100px"/>
</p>
</form>
-<script>
- function getSaveZeroDataElements( value )
- {
- jQuery.postJSON('../dhis-web-commons-ajax-json/getDataElements.action'
- , {id: value },
- function( json ){
- var ignoreZeroValueDataElements = jQuery("#ignoreZeroValueDataElements");
- ignoreZeroValueDataElements.empty();
- jQuery.each( json.dataElements, function(i, item){
- if( item.zeroIsSignificant == 'false' )
- {
- ignoreZeroValueDataElements.append( "<option value='" + item.id + "'>" + item.name + "</option>");
- }
- });
- });
- }
-
-</script>
\ No newline at end of file
