=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java	2010-07-03 19:36:21 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java	2010-07-19 05:49:33 +0000
@@ -16,9 +16,7 @@
 
 /**
  * @author joakibj, martinwa, briane, eivinhb
- * @version $Id$
- * @modifier Dang Duy Hieu
- * @since 2010-04-06
+ * @version $Id StatementManagerDataBrowserStore.java 2010-04-06 Jason Pickering, Dang Duy Hieu$
  */
 public class StatementManagerDataBrowserStore
     implements DataBrowserStore

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2010-07-16 17:25:15 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2010-07-19 05:49:33 +0000
@@ -44,7 +44,7 @@
 
     private static final Pattern p = Pattern.compile( "\\W" );
 
-    private static final String PREFIX_VIEWNAME = "__sqlview";
+    private static final String PREFIX_VIEWNAME = "_view";
 
     // -------------------------------------------------------------------------
     // Dependencies

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/hibernate/HibernateSqlViewExpandStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/hibernate/HibernateSqlViewExpandStore.java	2010-07-16 17:25:15 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/hibernate/HibernateSqlViewExpandStore.java	2010-07-19 05:49:33 +0000
@@ -52,7 +52,7 @@
 {
     private static final String PREFIX_SELECT_QUERY = "SELECT * FROM ";
 
-    private static final String PREFIX_VIEWNAME = "__sqlview";
+    private static final String PREFIX_VIEWNAME = "_view";
 
     private static final String[] types = { "VIEW" };
 

=== 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-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/ExecuteSqlViewQueryAction.java	2010-07-19 05:49:33 +0000
@@ -117,12 +117,13 @@
         {
             dropView( viewName, holder );
 
-            holder.getStatement().executeUpdate(
-                "CREATE VIEW " + viewName + " AS " + sqlViewInstance.getSqlQuery() );
+            holder.getStatement().executeUpdate( "CREATE VIEW " + viewName + " AS " + sqlViewInstance.getSqlQuery() );
         }
         catch ( SQLException e )
         {
-            throw new RuntimeException( "Failed to create view: " + viewName, e );
+            message = i18n.getString( "failed_to_create_view_table_for" ) + ": <strong>" + sqlViewInstance.getName()
+                + "</strong>";
+            return ERROR;
         }
         finally
         {

=== 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-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/GetSqlViewObjectAction.java	2010-07-19 05:49:33 +0000
@@ -93,8 +93,6 @@
         }
 
         sqlViewObject = sqlViewService.getSqlView( id );
-        
-        System.out.println( "\n\n sqlViewObjectList : " + sqlViewObject.toString() + "\n" );
 
         return SUCCESS;
     }

=== 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-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/RegenerateAllSqlViewTablesAction.java	2010-07-19 05:49:33 +0000
@@ -107,7 +107,8 @@
             catch ( SQLException e )
             {
                 holder.close();
-                throw new RuntimeException( "Failed to create view: " + viewName, e );
+                message = i18n.getString( "failed_to_create_view_table_for" ) + ": " + viewName;
+                return ERROR;
             }
 
             message += i18n.getString( "sql_view_table_name" ) + " <strong>[ " + viewName + " ]</strong> "

=== 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-17 14:29:47 +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 05:49:33 +0000
@@ -215,6 +215,7 @@
 select_all_at_level													= Select all at level
 unselect_all_at_level												= Unselect all at level
 unselect_all														= Unselect all
+select_all                                                          = Select all
 select_all_in_group													= Select all in group
 unselect_all_in_group												= Unselect all in group
 loading																= Loading
@@ -233,7 +234,7 @@
 remove                                                              = Delete
 show_details                                                        = Show details
 hide_warning                                                        = Hide warning
-create_new_sql_view                                                 = Create new Sql view
+add_new_sql_view                                                    = Add new Sql view
 update_sql_view                                                     = Update Sql view
 name_is_null                                                        = Name is not allowed null
 name_in_used                                                        = Name is in used
@@ -243,6 +244,7 @@
 sql_view_instance_invalid                                           = This resource viewer is invalid/non-exists.
 sql_view_table_name                                                 = Sql view table with name
 is_created                                                          = is created
+sql_view_table_is_not_created_yet                                   = Please execute query to create View table before viewing
 regenerate_resource_tables_viewers                                  = Regenerate Resource & View tables
 regenerating_resource_tables_and_views                              = Preparing for regenerating Resource and View tables
 view_data_sql_view                                                  = View data from Sql view table
@@ -250,4 +252,5 @@
 indicators_violating_compulsory_group_sets							= Indicators violating compulsory group sets
 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
\ No newline at end of file
+view_data_for                                                       = View data for
+failed_to_create_view_table_for                                     = Failed to create view table for
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-07-16 17:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-07-19 05:49:33 +0000
@@ -185,6 +185,7 @@
 not_choose_organisation												= Xin vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh m\u1ed9t \u0111\u01a1n v\u1ecb
 generate                                                            = T\u1ea1o
 unselect_all														= B\u1ecf ch\u1ecdn t\u1ea5t c\u1ea3
+select_all                                                          = Ch\u1ecdn t\u1ea5t c\u1ea3
 select_all_in_group													= Ch\u1ecdn t\u1ea5t c\u1ea3 trong nh\u00f3m
 unselect_all_in_group												= B\u1ecf ch\u1ecdn t\u1ea5t c\u1ea3 trong nh\u00f3m
 generate_min_max_values												= T\u1ea1o ra gi\u00e1 tr\u1ecb Min/Max
@@ -228,7 +229,7 @@
 name                                                                = T\u00ean
 description                                                         = M\u00f4 t\u1ea3
 sql_statement                                                       = C\u00e2u l\u1ec7nh truy v\u1ea5n
-create_new_sql_view                                                 = Th\u00eam m\u1edbi Sql view
+add_new_sql_view                                                    = Th\u00eam m\u1edbi Sql view
 update_sql_view                                                     = Ch\u1ec9nh s\u1eeda Sql view
 name_is_null                                                        = T\u00ean kh\u00f4ng \u0111\u01b0\u1ee3c tr\u1ed1ng
 name_in_used                                                        = Tr\u00f9ng l\u1eb7p t\u00ean
@@ -242,9 +243,9 @@
 regenerate_resource_tables_viewers                                  = T\u00e1i t\u1ea1o c\u00e1c b\u1ea3ng Resource v\u00e0 View
 regenerating_resource_tables_and_views                              = Chu\u1ea9n b\u1ecb t\u00e1i t\u1ea1o c\u00e1c b\u1ea3ng Resource v\u00e0 View 
 view_data_sql_view                                                  = Xem d\u1eef li\u1ec7u t\u1eeb b\u1ea3ng Sql view
-OrganisationUnitGroup                                               = Nh\u00f3m \u0111\u01a1n v\u1ecb
 data_elements_violating_compulsory_group_sets						= C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u vi ph\u1ea1m t\u00ednh b\u1eaft bu\u1ed9c v\u1edbi c\u00e1c t\u1eadp ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 indicators_violating_compulsory_group_sets							= C\u00e1c ch\u1ec9 s\u1ed1 vi ph\u1ea1m t\u00ednh b\u1eaft bu\u1ed9c v\u1edbi c\u00e1c t\u1eadp t\u1eadp ch\u1ec9 s\u1ed1
 data_elements_violating_exclusive_group_sets						= C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u vi ph\u1ea1m t\u00ednh \u0111\u1ed9c quy\u1ec1n v\u1edbi c\u00e1c t\u1eadp ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 indicators_violating_exclusive_group_sets							= C\u00e1c ch\u1ec9 s\u1ed1 vi ph\u1ea1m t\u00ednh \u0111\u1ed9c quy\u1ec1n v\u1edbi c\u00e1c t\u1eadp ch\u1ec9 s\u1ed1
-view_data_for                                                       = Xem d\u1eef li\u1ec7u trong View
\ No newline at end of file
+view_data_for                                                       = Xem d\u1eef li\u1ec7u trong View
+failed_to_create_view_table_for                                     = Kh\u00f4ng th\u1ec3 t\u1ea1o b\u1ea3ng View cho
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-07-17 14:29:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-07-19 05:49:33 +0000
@@ -202,7 +202,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-dataadmin/resourceTableForm.vm</param>
 			<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-			<param name="javascripts">javascript/resourceTable.js,javascript/resourceViewer.js</param>
+			<param name="javascripts">javascript/sqlView.js</param>
 		</action>
 
 		<action name="generateResourceTable"

=== 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	2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2010-07-19 05:49:33 +0000
@@ -21,7 +21,7 @@
 </script>
 <input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
 
-<h3>$encoder.htmlEncode( $i18n.getString( "create_new_resource_viewer" ) )</h3>
+<h3>$encoder.htmlEncode( $i18n.getString( "add_new_sql_view" ) )</h3>
 
 <form id="addSqlViewForm" action="addSqlView.action" method="post" >
 

=== 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	2010-07-03 19:33:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2010-07-19 05:49:33 +0000
@@ -158,7 +158,7 @@
 		#foreach ( $col in $allCounts )
 			#set ($i = ($i + 1))
 			#set ( $rowMeta = $rowIt.next() )
-			<tr #if ($i%2 == 1) class="odd" #else class="par" #end >
+			<tr>
 			#if ( $searchOption=="OrganisationUnit" && !$parent && $rowMeta.id)
 			#set ( $urlLink = "searchResult.action?searchOption=OrganisationUnit&amp;selectedUnitChanger=" + $rowMeta.id + "&amp;periodType=" + $periodTypeId + "&amp;toDate=" + $toDate + "&amp;fromDate=" + $fromDate )
 				<td style="min-width:200px;cursor:pointer" onclick="javascript:viewDrillDownMenu( '$urlLink', '$rowMeta.id' );" title="$i18n.getString('click_on_this_orgunit')">$rowMeta.name</td>

=== 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-16 17:25:15 +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 05:49:33 +0000
@@ -74,7 +74,8 @@
 		{
 			if ( json.response == "success" )
 			{
-				setMessage( json.message );
+				setHeaderDelayMessage( json.message );
+				hideWarning();
 			}
 			else if ( json.response == "error" )
 			{
@@ -94,6 +95,20 @@
 	
 		listRadio.item(i).checked = checkingStatus;
 	}
+	
+	var button1 = document.getElementById("selectAllButton");
+    var button2 = document.getElementById("unselectAllButton");
+	
+	if (checkingStatus == true)
+	{
+		button2.style.display = "block";
+		button1.style.display = "none";
+	}
+	else
+	{
+		button1.style.display = "block";
+		button2.style.display = "none";
+	}
 }
 
 function regenerateResourceTableAndViewTables()
@@ -109,6 +124,7 @@
     if ( organisationUnit || groupSet || dataElementGroupSetStructure || indicatorGroupSetStructure || 
         organisationUnitGroupSetStructure || categoryStructure || categoryOptionComboName )
     {
+		hideWarning();
         setWaitMessage( i18n_regenerating_resource_tables_and_views );
 		
         var url = "dropAllSqlViewTables.action";
@@ -194,6 +210,7 @@
 			{
 				setFieldValue( 'warningArea', json.message );
 	
+				hideMessage();
 				showWarning();
 			}
 		}
@@ -220,5 +237,4 @@
 			}
 		}
 	);
-
 }
\ 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/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2010-07-16 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2010-07-19 05:49:33 +0000
@@ -2,11 +2,6 @@
 <h3>$i18n.getString( "resource_table" ) #openHelp( "resourceTables" )</h3>
 
 <p>
-    <input type="checkbox" name="resourceTableCheckBox" onclick="selectALL(this.checked)"/>
-    <label for="organisationUnit">$i18n.getString( "select_all" )/$i18n.getString( "unselect_all" )</label>
-</p>
-
-<p>
     <input type="checkbox" name="resourceTableCheckBox" id="organisationUnit">
     <label for="organisationUnit">$i18n.getString( "organisation_unit_structure" ) <span style="color:#606060">(orgunitstructure)</span></label>
 </p>
@@ -41,10 +36,19 @@
     <label for="categoryOptionComboName">$i18n.getString( "data_element_category_option_combo_name" ) <span style="color:#606060">(categoryoptioncomboname)</span></label>
 </p>
 
-<p>
-    <input type="button" value='$i18n.getString( "generate_resource_tables" )' onclick="generateResourceTable()" style="width:170px">
-    <input type="button" value='$i18n.getString( "regenerate_resource_tables_views" )' onclick="regenerateResourceTableAndViewTables()" style="width:250px">
-</p>
+
+<table>
+	<tr>
+		<td>
+			<input type="button" value='$i18n.getString( "select_all" )' id="selectAllButton" onclick="selectALL(true)"/>
+			<input type="button" value='$i18n.getString( "unselect_all" )' id="unselectAllButton" onclick="selectALL(false)" style="display:none"/>
+		</td>
+		<td>
+		    <input type="button" value='$i18n.getString( "generate_resource_tables" )' onclick="regenerateResourceTableAndViewTables()" style="width:175px"/> 
+		</td>
+	</tr>
+
+</table>
 
 <span id="message"></span>
 

=== 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-07-16 17:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm	2010-07-19 05:49:33 +0000
@@ -15,7 +15,7 @@
 	<thead>
 		<tr>
 		#foreach ( $columnName in $sqlViewTable.getHeaders() )
-			<th title="$columnName" class="formatLabel">$i18n.getString( $columnName )</th>
+			<th title="$columnName" class="formatLabel">$columnName</th>
 		#end
 		</tr>
 	</thead>

=== 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-07-16 17:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm	2010-07-19 05:49:33 +0000
@@ -12,17 +12,13 @@
 			<table width="100%" class="listTable">
 				<thead>		
 					<tr>
-						<th style="width:20em;">$i18n.getString( "name" )</th>
-						<th style="width:20em;">$i18n.getString( "description" )</th>
-						<th style="width:30em;">$i18n.getString( "sql_statement" )</th>
+						<th style="width:70em;">$i18n.getString( "sql_statement" )</th>
 						<th style="width:145px;">$i18n.getString( "operations" )</th>
 					</tr>
 				</thead>
 				<tbody id="list">
 					#foreach( $sqlViewObject in $sqlViewObjectList )
 					<tr id="tr${sqlViewObject.id}">
-						<td onclick="showSqlViewDetails( $sqlViewObject.id )">$!encoder.htmlEncode( $sqlViewObject.name )</td>
-						<td onclick="showSqlViewDetails( $sqlViewObject.id )">$!encoder.htmlEncode( $sqlViewObject.description )</td>
 						<td onclick="showSqlViewDetails( $sqlViewObject.id )">$!encoder.htmlEncode( $sqlViewObject.sqlQuery )</td>
 						<td><a href="javascript:runSqlViewQuery( $sqlViewObject.id )" title="$i18n.getString( 'run' )"><img src="../images/start_process.png" alt="$i18n.getString( 'run' )"></a>
 						<a href="javascript:showDataSqlViewForm( $sqlViewObject.id )" title="$i18n.getString( 'view' )"><img src="../images/view_sections.png" alt="$i18n.getString( 'view' )"></a>
@@ -57,8 +53,6 @@
 	</tr>
 </table>
 
-<span id="message"></span>
-
 <script type="text/javascript">
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
 	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_sqlview" ) , "'")';