dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34659
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17778: Move data set section to context menu.
------------------------------------------------------------
revno: 17778
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-12-22 23:00:36 +0700
message:
Move data set section to context menu.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionOptionsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionSortOrderAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm
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/editSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.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/section/AddSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java 2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java 2014-12-22 16:00:36 +0000
@@ -88,6 +88,23 @@
this.dataSetId = dataSetId;
}
+ public Integer getDataSetId()
+ {
+ return dataSetId;
+ }
+
+ private Integer categoryComboId;
+
+ public void setCategoryComboId( Integer categoryComboId )
+ {
+ this.categoryComboId = categoryComboId;
+ }
+
+ public Integer getCategoryComboId()
+ {
+ return categoryComboId;
+ }
+
private String sectionName;
public void setSectionName( String sectionName )
@@ -115,7 +132,7 @@
{
this.selectedIndicatorList = selectedIndicatorList;
}
-
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java 2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java 2014-12-22 16:00:36 +0000
@@ -63,7 +63,7 @@
{
return sectionId;
}
-
+
public void setSectionId( Integer sectionId )
{
this.sectionId = sectionId;
@@ -111,7 +111,7 @@
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
-
+
@Override
public String execute()
throws Exception
@@ -121,7 +121,7 @@
dataSet = section.getDataSet();
categoryCombo = section.getCategoryCombo();
-
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionOptionsAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionOptionsAction.java 2014-12-22 16:00:36 +0000
@@ -58,7 +58,7 @@
}
private DataSetService dataSetService;
-
+
public void setDataSetService( DataSetService dataSetService )
{
this.dataSetService = dataSetService;
@@ -76,7 +76,7 @@
}
private Integer categoryComboId;
-
+
public void setCategoryComboId( Integer categoryComboId )
{
this.categoryComboId = categoryComboId;
@@ -94,14 +94,14 @@
}
private DataElementCategoryCombo categoryCombo;
-
+
public DataElementCategoryCombo getCategoryCombo()
{
return categoryCombo;
}
-
+
private List<DataElement> dataElements = new ArrayList<>();
-
+
public List<DataElement> getDataElements()
{
return dataElements;
@@ -116,9 +116,9 @@
throws Exception
{
dataSet = dataSetService.getDataSet( dataSetId );
-
+
categoryCombo = categoryService.getDataElementCategoryCombo( categoryComboId );
-
+
dataElements = new ArrayList<>( dataSet.getDataElements() ); // Available data elements must be member of data set
for ( Section section : dataSet.getSections() )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionSortOrderAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionSortOrderAction.java 2014-12-22 16:00:36 +0000
@@ -72,6 +72,11 @@
this.dataSetId = dataSetId;
}
+ public int getDataSetId()
+ {
+ return dataSetId;
+ }
+
private List<String> sections;
public void setSections( List<String> sections )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java 2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java 2014-12-22 16:00:36 +0000
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Set;
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataset.DataSet;
@@ -71,10 +70,20 @@
// Input & output
// -------------------------------------------------------------------------
+ private Integer categoryComboId;
+
+ public Integer getCategoryComboId()
+ {
+ return categoryComboId;
+ }
+
+ public void setCategoryComboId( Integer categoryComboId )
+ {
+ this.categoryComboId = categoryComboId;
+ }
+
private List<Section> sections = new ArrayList<>();
- private List<DataSet> datasets = new ArrayList<>();
-
private Set<DataElementCategoryCombo> categoryCombos = new HashSet<>();
private Integer dataSetId;
@@ -94,16 +103,6 @@
return sectionService;
}
- public List<DataSet> getDatasets()
- {
- return datasets;
- }
-
- public void setDatasets( List<DataSet> datasets )
- {
- this.datasets = datasets;
- }
-
public Integer getDataSetId()
{
return dataSetId;
@@ -132,25 +131,15 @@
public String execute()
throws Exception
{
- datasets = new ArrayList<>( dataSetService.getAllDataSets() );
-
- Collections.sort( datasets, IdentifiableObjectNameComparator.INSTANCE );
-
- if ( dataSetId != null && dataSetId != -1 )
- {
- DataSet dataSet = dataSetService.getDataSet( dataSetId );
-
- sections = new ArrayList<>( dataSet.getSections() );
-
- for ( DataElement de : dataSet.getDataElements() )
- {
- categoryCombos.add( de.getCategoryCombo() );
- }
- }
- else
- {
- sections = new ArrayList<>( sectionService.getAllSections() );
- }
+ DataSet dataSet = dataSetService.getDataSet( dataSetId );
+
+ sections = new ArrayList<>( dataSet.getSections() );
+
+ for ( DataElement de : dataSet.getDataElements() )
+ {
+ categoryCombos.add( de.getCategoryCombo() );
+ }
+
Collections.sort( sections, new SectionOrderComparator() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java 2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java 2014-12-22 16:00:36 +0000
@@ -66,19 +66,19 @@
}
private IndicatorService indicatorService;
-
+
public void setIndicatorService( IndicatorService indicatorService )
{
this.indicatorService = indicatorService;
}
private DataSetService dataSetService;
-
+
public void setDataSetService( DataSetService dataSetService )
{
this.dataSetService = dataSetService;
}
-
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -98,7 +98,7 @@
}
private String description;
-
+
public void setDescription( String description )
{
this.description = description;
@@ -118,6 +118,13 @@
this.selectedIndicatorList = selectedIndicatorList;
}
+ private Section section;
+
+ public Section getSection()
+ {
+ return section;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -126,7 +133,7 @@
public String execute()
throws Exception
{
- Section section = sectionService.getSection( sectionId.intValue() );
+ section = sectionService.getSection( sectionId.intValue() );
List<DataElement> dataElements = new ArrayList<>();
@@ -134,9 +141,9 @@
{
dataElements.add( dataElementService.getDataElement( Integer.parseInt( id ) ) );
}
-
+
List<Indicator> indicators = new ArrayList<>();
-
+
for ( String id : selectedIndicatorList )
{
indicators.add( indicatorService.getIndicator( Integer.parseInt( id ) ) );
@@ -152,14 +159,14 @@
dataSetService.updateDataSet( dataSet.increaseVersion() );
}
}
-
+
section.setDataElements( dataElements );
section.setIndicators( indicators );
section.setName( sectionName );
section.setDescription( description );
sectionService.updateSection( section );
-
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2014-10-23 11:57:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2014-12-22 16:00:36 +0000
@@ -51,7 +51,6 @@
dataset_management=Data set management
section_management=Data set section management
intro_dataset=Create, update, view and delete data sets and custom forms. A data set is a collection of data elements for which data is entered.
-intro_dataset_section=Create, update, view and delete data set sections. Sections can be inserted into data sets to make them more comprehensible.
intro_dataset_assignment_editor=Assign data sets to organisation units in a grid based layout for faster operations when working with a high number of items.
edit_compulsory_data_elements=Edit compulsory data elements
dataset_assignment_editor=Data Set Assignment Editor
@@ -114,3 +113,4 @@
symbol=Symbol
legend_set=Legend set
enable_for_java_mobile_client = Enable for Java mobile client
+view_sections = View sections
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2014-07-16 15:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2014-12-22 16:00:36 +0000
@@ -19,20 +19,18 @@
<action name="section" class="org.hisp.dhis.dataset.action.section.SectionListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/sectionList.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
<param name="javascripts">javascript/section.js</param>
</action>
<action name="getSectionOptions" class="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/addSection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
<param name="javascripts">javascript/section.js</param>
<param name="requiredAuthorities">F_SECTION_ADD</param>
</action>
<action name="addSection" class="org.hisp.dhis.dataset.action.section.AddSectionAction">
- <result name="success" type="redirect">section.action</result>
+ <result name="success" type="redirect">section.action?dataSetId=${dataSetId}&categoryComboId=${categoryComboId}</result>
<param name="requiredAuthorities">F_SECTION_ADD</param>
</action>
@@ -52,13 +50,12 @@
<action name="editSection" class="org.hisp.dhis.dataset.action.section.EditSectionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/editSection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
<param name="javascripts">javascript/section.js</param>
<param name="requiredAuthorities">F_SECTION_ADD</param>
</action>
<action name="updateSection" class="org.hisp.dhis.dataset.action.section.UpdateSectionAction">
- <result name="success" type="redirect">section.action</result>
+ <result name="success" type="redirect">section.action?dataSetId=${section.dataSet.id}&categoryComboId=${categoryComboId}</result>
<param name="requiredAuthorities">F_SECTION_ADD</param>
</action>
@@ -70,7 +67,6 @@
<action name="greySection" class="org.hisp.dhis.dataset.action.section.GreySectionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/greySection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
<param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
<param name="requiredAuthorities">F_SECTION_ADD</param>
</action>
@@ -84,12 +80,11 @@
<action name="showSortSectionForm" class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/sortSectionForm.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
<param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
</action>
<action name="saveSectionSortOrder" class="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction">
- <result name="success" type="redirect">section.action</result>
+ <result name="success" type="redirect">section.action?dataSetId=${dataSetId}</result>
</action>
<!-- Dataset -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2014-09-17 17:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2014-12-22 16:00:36 +0000
@@ -40,7 +40,8 @@
<h3>$i18n.getString( "add_section" ) #openHelp( "dataset_sections_edit" )</h3>
-<form id="addSectionForm" name="addSectionForm" action="addSection.action" method="post" class="inputForm">
+<form id="addSectionForm" name="addSectionForm" action="addSection.action" method="get" class="inputForm">
+
<table id="detailsList" style="margin-bottom: 20px">
<col/>
<col/>
@@ -156,7 +157,7 @@
<tr>
<td colspan="4">
<input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
- <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )" style="width:120px" />
+ <input type="button" onclick="window.location.href='section.action?dataSetId=$dataSet.id&categoryComboId=$categoryCombo.id'" value="$i18n.getString( 'cancel' )" style="width:120px" />
</td>
</tr>
</tbody>
=== 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 2014-07-16 15:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2014-12-22 16:00:36 +0000
@@ -19,6 +19,7 @@
<div id="contextMenu" class="contextMenu" style="width: 240px;">
<ul id="contextMenuItems" class="contextMenuItems">
<li data-enabled="canUpdate"><a data-target-fn="defineDataSetAssociationsForm"><i class="fa fa-plus"></i> $i18n.getString( "define_associations" )</a></li>
+ <li data-enabled="canUpdate"><a data-target-fn="viewSectionList"><i class="fa fa-plus"></i> $i18n.getString( "view_sections" )</a></li>
<li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li data-enabled="canUpdate"><a data-target-fn="editDataSetForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2014-09-21 14:20:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2014-12-22 16:00:36 +0000
@@ -167,7 +167,7 @@
<tr>
<td colspan="4">
<input type="submit" name="save" value="$i18n.getString( 'save' )" style="width:120px" />
- <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )" style="width:120px" />
+ <input type="button" onclick="window.location.href='section.action?dataSetId=$dataSet.id&categoryComboId=$categoryCombo.id'" value="$i18n.getString( 'cancel' )" style="width:120px" />
</td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2013-02-03 10:13:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2014-12-22 16:00:36 +0000
@@ -39,5 +39,5 @@
</div>
<p>
- <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'done' )" style="width:120px"/>
+ <input type="button" onclick="window.location.href='section.action?dataSetId=$section.dataSet.id&categoryComboId=$categoryCombo.id'" value="$i18n.getString( 'done' )" style="width:120px"/>
</p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 2014-12-22 16:00:36 +0000
@@ -2,6 +2,5 @@
<ul class="introList">
#introListImgItem( "dataSet.action" "dataset" "dataset" )
- #introListImgItem( "section.action" "dataset_section" "section" )
#introListImgItem( "displayEditorForm.action" "dataset_assignment_editor" "assignment" )
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2014-06-13 07:55:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2014-12-22 16:00:36 +0000
@@ -51,3 +51,8 @@
function defineDataSetAssociationsForm( context ) {
location.href = 'defineDataSetAssociationsForm.action?dataSetId=' + context.id;
}
+
+function viewSectionList( context ) {
+ location.href = 'section.action?dataSetId=' + context.id;
+}
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2011-10-31 11:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2014-12-22 16:00:36 +0000
@@ -2,6 +2,5 @@
<h2>$i18n.getString( "dataset" ) </h2>
<ul>
<li><a href="dataSet.action">$i18n.getString( "dataset" ) </a></li>
- <li><a href="section.action">$i18n.getString( "dataset_section" ) </a></li>
<li><a href="displayEditorForm.action">$i18n.getString( "dataset_assignment_editor" ) </a></li>
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2014-06-13 07:55:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2014-12-22 16:00:36 +0000
@@ -23,19 +23,13 @@
</ul>
</div>
+<input type='hidden' id="dataSetId" name="dataSetId" value='$dataSetId' >
+
<table class="mainPageTable">
<tr>
<td>
<table width="100%">
<tr>
- <td><label>$i18n.getString( "select_dataset" )</label><br/>
- <select id="dataSetId" name="dataSetId" style="min-width:20em" onchange="javascript:getSectionByDataSet(this.options[this.selectedIndex].value)">
- <option value="-1">[ $i18n.getString( "all" ) ]</option>
- #foreach ( $dataset in $datasets )
- <option value="$dataset.id" #if($dataSetId==$dataset.id) selected="selected" #end>$dataset.displayName</option>
- #end
- </select>
- </td>
<td>
<label>$i18n.getString( "select_categorycombo" )</label><br/>
<select id="categoryComboId" name="categoryComboId" style="min-width:20em">
@@ -48,7 +42,7 @@
<td style="text-align:right">
<input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:addSectionSubmit()" style="width:80px"/><br/>
<input type="button" value="$i18n.getString( 'sort_section' )" onclick="javascript:sortOrderSubmit()" style="width:80px"/><br/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="javascript:window.location.href='dataSet.action'" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='dataSet.action'" style="width:80px"/>
</td>
</tr>
</table>
@@ -60,15 +54,15 @@
<col/>
<thead>
<tr>
- <th>$i18n.getString( "dataset" )</th>
- <th>$i18n.getString( "name" )</th>
+ <th>$i18n.getString( "name" )</th>
+ <th>$i18n.getString( "category_combo" )</th>
</tr>
</thead>
<tbody id="list">
#foreach( $section in $sections )
<tr id="tr${section.id}" data-id="$!section.id" data-uid="$!section.uid" data-type="Section" data-name="$encoder.htmlEncode( $!section.displayName )">
- <td>$encoder.htmlEncode( $section.dataSet.displayName )</td>
<td>$encoder.htmlEncode( $section.displayName )</td>
+ <td>$!encoder.htmlEncode( $section.categoryCombo.name )</td>
</tr>
#end
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm 2013-05-12 17:13:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm 2014-12-22 16:00:36 +0000
@@ -12,24 +12,27 @@
<input type="hidden" name="dataSetId" value="${dataSetId}">
-<p>
-<input type="button" value="$i18n.getString( 'move_up' )" style="width:130px" onclick="moveUpSelectedOption( 'sections' )"><input
-type="button" value="$i18n.getString( 'move_down' )" style="width:130px" onclick="moveDownSelectedOption( 'sections' )"><input
-type="button" value="$i18n.getString( 'move_to_top' )" style="width:130px" onclick="moveSelectedOptionToTop( 'sections' )"><input
-type="button" value="$i18n.getString( 'move_to_bottom' )" style="width:130px" onclick="moveSelectedOptionToBottom( 'sections' )">
-</p>
-
-<p>
-<select multiple id="sections" name="sections" size="25" style="width:680px">
-#foreach ( $section in $sections )
- <option value="$section.id">$section.displayName</option>
-#end
-</select>
-</p>
+<table>
+ <tr>
+ <td>
+ <select multiple id="sections" name="sections" size="25" style="width:680px">
+ #foreach ( $section in $sections )
+ <option value="$section.id">$section.displayName</option>
+ #end
+ </select>
+ </td>
+ <td valign='center'>
+ <img type="button" src="../images/move_top.png" title="$i18n.getString( 'move_to_top' )" onclick="moveSelectedOptionToTop( 'sections' )"><br><br>
+ <img type="button" src="../images/move_up.png" title="$i18n.getString( 'move_up' )" onclick="moveUpSelectedOption( 'sections' )"><br><br>
+ <img type="button" src="../images/move_down.png" title="$i18n.getString( 'move_down' )" onclick="moveDownSelectedOption( 'sections' )"><br><br>
+ <img type="button" src="../images/move_bottom.png" title="$i18n.getString( 'move_to_bottom' )" onclick="moveSelectedOptionToBottom( 'sections' )"><br><br>
+ </td>
+ </tr>
+</table>
<p>
<input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"><input
-type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='section.action'">
+type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='section.action?dataSetId=${dataSetId}'">
</p>
</form>
