dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06708
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1865: Added intro icon + text for sqlview
------------------------------------------------------------
revno: 1865
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Mon 2010-07-19 17:20:24 +0200
message:
Added intro icon + text for sqlview
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/sqlview.png
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/DropAllSqlViewTablesAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RegenerateAllSqlViewTablesAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/sqlview.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/sqlview.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/sqlview.png 2010-07-19 15:20:24 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java 2010-07-19 15:20:24 +0000
@@ -38,11 +38,6 @@
public class AddSqlViewAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
private static final String REGEX = "\\s+";
// -------------------------------------------------------------------------
@@ -115,5 +110,4 @@
{
return input.replaceAll( REGEX, " " ).trim();
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java 2010-07-16 17:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java 2010-07-19 15:20:24 +0000
@@ -41,11 +41,6 @@
public class CheckViewTableExistenceAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/DropAllSqlViewTablesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/DropAllSqlViewTablesAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/DropAllSqlViewTablesAction.java 2010-07-19 15:20:24 +0000
@@ -47,11 +47,6 @@
public class DropAllSqlViewTablesAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java 2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java 2010-07-19 15:20:24 +0000
@@ -48,11 +48,6 @@
public class ExecuteSqlViewQueryAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -121,8 +116,7 @@
}
catch ( SQLException e )
{
- message = i18n.getString( "failed_to_create_view_table_for" ) + ": <strong>" + sqlViewInstance.getName()
- + "</strong>";
+ message = i18n.getString( "failed_to_create_view_table_for" ) + ": " + sqlViewInstance.getName();
return ERROR;
}
finally
@@ -130,8 +124,7 @@
holder.close();
}
- message = i18n.getString( "sql_view_table_name" ) + " <strong>[ " + viewName + " ]</strong> "
- + i18n.getString( "is_created" );
+ message = i18n.getString( "sql_view_table_name" ) + " [ " + viewName + " ] " + i18n.getString( "is_created" );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java 2010-07-19 15:20:24 +0000
@@ -42,11 +42,6 @@
public class GetSqlViewListAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -80,5 +75,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java 2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java 2010-07-19 15:20:24 +0000
@@ -42,11 +42,6 @@
public class GetSqlViewObjectAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RegenerateAllSqlViewTablesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RegenerateAllSqlViewTablesAction.java 2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RegenerateAllSqlViewTablesAction.java 2010-07-19 15:20:24 +0000
@@ -49,11 +49,6 @@
public class RegenerateAllSqlViewTablesAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -92,13 +87,11 @@
public String execute()
{
- message = "";
- String viewName = "";
final StatementHolder holder = statementManager.getHolder();
for ( SqlView sqlView : sqlViewService.getAllSqlViews() )
{
- viewName = sqlViewService.setUpViewTableName( sqlView.getName() );
+ String viewName = sqlViewService.setUpViewTableName( sqlView.getName() );
try
{
@@ -111,7 +104,7 @@
return ERROR;
}
- message += i18n.getString( "sql_view_table_name" ) + " <strong>[ " + viewName + " ]</strong> "
+ message += i18n.getString( "sql_view_table_name" ) + " [ " + viewName + " ] "
+ i18n.getString( "is_created" ) + "<br/>";
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java 2010-07-19 15:20:24 +0000
@@ -41,11 +41,6 @@
public class RemoveSqlViewAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java 2010-07-16 17:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java 2010-07-19 15:20:24 +0000
@@ -41,11 +41,6 @@
public class ShowUpSqlViewTableAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -94,5 +89,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java 2010-07-19 15:20:24 +0000
@@ -41,11 +41,6 @@
public class UpdateSqlViewAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -88,7 +83,6 @@
public String execute()
{
-
if ( id == null || (id.intValue() == -1) )
{
return ERROR;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java 2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java 2010-07-19 15:20:24 +0000
@@ -38,11 +38,6 @@
public class ValidateAddUpdateSqlViewAction
extends ActionSupport
{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
private static final String ADD = "add";
private static final String REGEX_SELECT_QUERY = "^(?i)\\s*(select\\s{1,}).+$";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2010-07-19 15:20:24 +0000
@@ -134,6 +134,7 @@
intro_organisation_unit_pruning = Remove sub-trees from the organisation unit tree. Useful when creating and deploying local databases.
intro_zero_storage_management = Define which data elements for which zero values should be stored or ignored. Useful for reducing database size.
intro_duplicate_data_elimination = Eliminate data registered for duplicate data elements. Useful when data has been entered for identical data elements.
+intro_sql_view = Create SQL database views. These views will typically use the resource tables to provide convenient views for 3rd party tools.
expression_is_empty = Expression is empty
dataelement_id_not_numeric = Data element identifier must be a number
category_option_combo_id_not_numeric = Category option combo identifier must be a number
@@ -223,8 +224,8 @@
not_choose_dataset = Please select a data set
not_choose_organisation = Please select an organsisation unit
generate = Generate
-sql_view_management = Sql view Management
-sql_view = Sql view
+sql_view_management = Sql View Management
+sql_view = Sql View
filter_by_name = Filter by Name
name = Name
description = Description
@@ -253,4 +254,5 @@
data_elements_violating_exclusive_group_sets = Data elements violating exclusive group sets
indicators_violating_exclusive_group_sets = Indicators violating exclusive group sets
view_data_for = View data for
-failed_to_create_view_table_for = Failed to create view table for
\ No newline at end of file
+failed_to_create_view_table_for = Failed to create view table for
+update = Update
\ 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/javascript/sqlView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js 2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js 2010-07-19 15:20:24 +0000
@@ -75,13 +75,10 @@
if ( json.response == "success" )
{
setHeaderDelayMessage( json.message );
- hideWarning();
}
else if ( json.response == "error" )
{
- setFieldValue( 'warningArea', json.message );
-
- showWarning();
+ setHeaderDelayMessage( json.message );
}
}
);
@@ -124,7 +121,6 @@
if ( organisationUnit || groupSet || dataElementGroupSetStructure || indicatorGroupSetStructure ||
organisationUnitGroupSetStructure || categoryStructure || categoryOptionComboName )
{
- hideWarning();
setWaitMessage( i18n_regenerating_resource_tables_and_views );
var url = "dropAllSqlViewTables.action";
@@ -144,7 +140,6 @@
{
if ( xmlObject.getAttribute( 'type' ) == 'success' )
{
- // Regenerating Resource tables
generateResourceTableForViews();
}
else
@@ -208,10 +203,9 @@
}
else if ( json.response == "error" )
{
- setFieldValue( 'warningArea', json.message );
-
+ setHeaderDelayMessage( json.message );
+
hideMessage();
- showWarning();
}
}
);
