------------------------------------------------------------
revno: 2658
committer: Tri <Tri@Tri-Laptop>
branch nick: dhis2
timestamp: Thu 2011-01-20 12:24:17 +0700
message:
After closing the dataentry design page Left side menu got hidden
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.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-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2010-11-27 09:37:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2011-01-20 05:24:17 +0000
@@ -38,6 +38,8 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.paging.ActionPagingSupport;
+import org.hisp.dhis.webportal.menu.MenuState;
+import org.hisp.dhis.webportal.menu.MenuStateManager;
/**
* @author Kristian
@@ -65,7 +67,7 @@
{
this.dataSetComparator = dataSetComparator;
}
-
+
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
@@ -81,13 +83,13 @@
{
return dataSets;
}
-
+
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
private String key;
-
+
public String getKey()
{
return key;
@@ -97,7 +99,7 @@
{
this.key = key;
}
-
+
// -------------------------------------------------------------------------
// Execute
// -------------------------------------------------------------------------
@@ -108,18 +110,20 @@
if ( isNotBlank( key ) ) // Filter on key only if set
{
this.paging = createPaging( dataSetService.getDataSetCountByName( key ) );
-
- dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+
+ dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetweenByName( key, paging.getStartPos(),
+ paging.getPageSize() ) );
}
else
{
this.paging = createPaging( dataSetService.getDataSetCount() );
-
- dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetween( paging.getStartPos(), paging.getPageSize() ) );
+
+ dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetween( paging.getStartPos(), paging
+ .getPageSize() ) );
}
-
+
Collections.sort( dataSets, dataSetComparator );
-
+
displayPropertyHandler.handle( dataSets );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java 2010-08-31 14:34:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java 2011-01-20 05:24:17 +0000
@@ -31,6 +31,8 @@
import org.hisp.dhis.dataentryform.DataEntryFormService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.webportal.menu.MenuState;
+import org.hisp.dhis.webportal.menu.MenuStateManager;
import com.opensymphony.xwork2.Action;
@@ -44,13 +46,13 @@
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+
private DataEntryFormService dataEntryFormService;
public void setDataEntryFormService( DataEntryFormService dataEntryFormService )
{
this.dataEntryFormService = dataEntryFormService;
- }
+ }
private DataSetService dataSetService;
@@ -62,7 +64,7 @@
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
-
+
private int dataSetIdField;
public void setDataSetIdField( int dataSetIdField )
@@ -87,20 +89,21 @@
// -------------------------------------------------------------------------
// Execute
// -------------------------------------------------------------------------
-
+
public String execute()
throws Exception
{
- DataSet dataset = dataSetService.getDataSet( dataSetIdField );
+ DataSet dataset = dataSetService.getDataSet( dataSetIdField );
DataEntryForm dataEntryForm = dataset.getDataEntryForm();
if ( dataEntryForm == null )
{
- dataEntryForm = new DataEntryForm( nameField, dataEntryFormService.prepareDataEntryFormCode( designTextarea ) );
+ dataEntryForm = new DataEntryForm( nameField, dataEntryFormService
+ .prepareDataEntryFormCode( designTextarea ) );
dataEntryFormService.addDataEntryForm( dataEntryForm );
-
- dataset.setDataEntryForm(dataEntryForm);
+
+ dataset.setDataEntryForm( dataEntryForm );
dataSetService.updateDataSet( dataset );
}
else
@@ -108,9 +111,10 @@
dataEntryForm.setName( nameField );
dataEntryForm.setHtmlCode( dataEntryFormService.prepareDataEntryFormCode( designTextarea ) );
dataEntryFormService.updateDataEntryForm( dataEntryForm );
- }
+ }
+
return SUCCESS;
}
-
+
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-01-17 17:24:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-01-20 05:24:17 +0000
@@ -198,7 +198,7 @@
class="org.hisp.dhis.dataset.action.DataSetListAction" scope="prototype">
<property name="dataSetService">
<ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
+ </property>
</bean>
<bean id="org.hisp.dhis.dataset.action.PeriodTypeListAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2011-01-20 05:24:17 +0000
@@ -85,7 +85,8 @@
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
jQuery(document).ready(function(){
- tableSorter( 'listTable' );
+ tableSorter( 'listTable' );
+ leftBar.showAnimated();
});
</script>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
