dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26228
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12992: add legend symbol to dataSets
------------------------------------------------------------
revno: 12992
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-11-20 15:47:27 +0100
message:
add legend symbol to dataSets
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetSymbol.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.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/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.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-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-10-08 10:20:06 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-11-20 14:47:27 +0000
@@ -62,7 +62,7 @@
*
* @author Kristian Nordal
*/
-@JacksonXmlRootElement(localName = "dataSet", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "dataSet", namespace = DxfNamespaces.DXF_2_0 )
public class DataSet
extends BaseNameableObject
{
@@ -166,6 +166,8 @@
*/
private boolean notifyCompletingUser;
+ private String symbol;
+
// -------------------------------------------------------------------------
// Form properties
// -------------------------------------------------------------------------
@@ -426,10 +428,10 @@
}
@JsonProperty
- @JsonSerialize(using = JacksonPeriodTypeSerializer.class)
- @JsonDeserialize(using = JacksonPeriodTypeDeserializer.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( using = JacksonPeriodTypeSerializer.class )
+ @JsonDeserialize( using = JacksonPeriodTypeDeserializer.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public PeriodType getPeriodType()
{
return periodType;
@@ -441,8 +443,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataEntryForm getDataEntryForm()
{
return dataEntryForm;
@@ -454,10 +456,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "dataElements", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "dataElement", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "dataElements", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "dataElement", namespace = DxfNamespaces.DXF_2_0 )
public Set<DataElement> getDataElements()
{
return dataElements;
@@ -469,10 +471,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "indicators", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "indicator", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "indicators", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "indicator", namespace = DxfNamespaces.DXF_2_0 )
public Set<Indicator> getIndicators()
{
return indicators;
@@ -484,9 +486,9 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "compulsoryDataElementOperands", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "compulsoryDataElementOperand", namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "compulsoryDataElementOperands", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "compulsoryDataElementOperand", namespace = DxfNamespaces.DXF_2_0 )
public Set<DataElementOperand> getCompulsoryDataElementOperands()
{
return compulsoryDataElementOperands;
@@ -497,11 +499,11 @@
this.compulsoryDataElementOperands = compulsoryDataElementOperands;
}
- @JsonProperty(value = "organisationUnits")
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "organisationUnits", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0)
+ @JsonProperty( value = "organisationUnits" )
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnit> getSources()
{
return sources;
@@ -512,11 +514,11 @@
this.sources = sources;
}
- @JsonProperty(value = "organisationUnitGroups")
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0)
+ @JsonProperty( value = "organisationUnitGroups" )
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnitGroup> getOrganisationUnitGroups()
{
return organisationUnitGroups;
@@ -538,10 +540,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class })
- @JacksonXmlElementWrapper(localName = "sections", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "section", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class } )
+ @JacksonXmlElementWrapper( localName = "sections", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "section", namespace = DxfNamespaces.DXF_2_0 )
public Set<Section> getSections()
{
return sections;
@@ -553,8 +555,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isMobile()
{
return mobile;
@@ -566,8 +568,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Integer getVersion()
{
return version;
@@ -579,8 +581,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public int getExpiryDays()
{
return expiryDays;
@@ -592,8 +594,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public int getTimelyDays()
{
return timelyDays;
@@ -605,8 +607,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isSkipAggregation()
{
return skipAggregation;
@@ -618,8 +620,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public UserGroup getNotificationRecipients()
{
return notificationRecipients;
@@ -631,8 +633,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isNotifyCompletingUser()
{
return notifyCompletingUser;
@@ -644,8 +646,21 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getSymbol()
+ {
+ return symbol;
+ }
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
+
+ @JsonProperty
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isAllowFuturePeriods()
{
return allowFuturePeriods;
@@ -657,8 +672,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isFieldCombinationRequired()
{
return fieldCombinationRequired;
@@ -670,8 +685,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isValidCompleteOnly()
{
return validCompleteOnly;
@@ -683,8 +698,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isSkipOffline()
{
return skipOffline;
@@ -696,8 +711,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isRenderAsTabs()
{
return renderAsTabs;
@@ -709,8 +724,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isRenderHorizontally()
{
return renderHorizontally;
@@ -722,8 +737,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isDataElementDecoration()
{
return dataElementDecoration;
@@ -759,6 +774,7 @@
dataElementDecoration = dataSet.isDataElementDecoration();
notificationRecipients = dataSet.getNotificationRecipients();
+ symbol = dataSet.getSymbol();
dataElements.clear();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2013-09-30 19:54:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2013-11-20 14:47:27 +0000
@@ -258,6 +258,7 @@
OrganisationUnitGroup organisationUnitGroup = (OrganisationUnitGroup) other;
groupSet = null;
+ symbol = organisationUnitGroup.getSymbol();
removeAllOrganisationUnits();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2013-09-30 10:39:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2013-11-20 14:47:27 +0000
@@ -21,6 +21,8 @@
<property name="description" type="text" />
+ <property name="symbol" />
+
<many-to-one name="periodType" lazy="false" class="org.hisp.dhis.period.PeriodType" column="periodtypeid"
not-null="true" foreign-key="fk_dataset_periodtypeid" />
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2013-11-20 14:12:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2013-11-20 14:47:27 +0000
@@ -1886,7 +1886,6 @@
} );
}
-
//-----------------------------------------------------------------------------
// Symbol
//-----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2013-09-30 10:39:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2013-11-20 14:47:27 +0000
@@ -122,6 +122,13 @@
this.description = description;
}
+ private String symbol;
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
+
private int expiryDays;
public void setExpiryDays( int expiryDays )
@@ -246,6 +253,7 @@
DataSet dataSet = new DataSet( name, shortName, code, periodType );
+ dataSet.setSymbol( symbol );
dataSet.setExpiryDays( expiryDays );
dataSet.setTimelyDays( timelyDays );
dataSet.setSkipAggregation( skipAggregation );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-09-30 10:39:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-11-20 14:47:27 +0000
@@ -133,6 +133,13 @@
this.description = description;
}
+ private String symbol;
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
+
private int expiryDays;
public void setExpiryDays( int expiryDays )
@@ -278,6 +285,7 @@
DataSet dataSet = dataSetService.getDataSet( dataSetId );
+ dataSet.setSymbol( symbol );
dataSet.setExpiryDays( expiryDays );
dataSet.setTimelyDays( timelyDays );
dataSet.setSkipAggregation( skipAggregation );
=== 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 2013-09-30 10:39:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2013-11-20 14:47:27 +0000
@@ -110,3 +110,5 @@
insert_images=Insert images
dataelementdecoration=Data element decoration
pdf_data_entry_form=Get PDF for Data Entry
+select_symbol=Select symbol
+symbol=Symbol
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-10-03 08:36:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-11-20 14:47:27 +0000
@@ -52,6 +52,8 @@
#sharingCreateNotification( "dataSet" )
<form id="addDataSetForm" name="addDataSetForm" action="addDataSet.action" method="post" class="inputForm">
+ <input type="hidden" id="symbol" name="symbol">
+
<table id="detailsList" style="width: 600px;">
<col style="width: 400px;"/> ## Labels
<col /> ## Input
@@ -124,6 +126,11 @@
</select>
</td>
</tr>
+ <tr>
+ <td style="height:35px"><label for="symbol">$i18n.getString( "symbol" )</td>
+ <td><a href="javascript:openSymbolDialog()">$i18n.getString( "select_symbol" )</a>
+ <img id="symbolImg" style="margin-left: 30px;"></td>
+ </tr>
</tbody>
<thead>
<tr>
@@ -283,3 +290,5 @@
</tbody>
</table>
</form>
+
+#parse( "dhis-web-maintenance-dataset/dataSetSymbol.vm" )
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetSymbol.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetSymbol.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetSymbol.vm 2013-11-20 14:47:27 +0000
@@ -0,0 +1,57 @@
+
+<style type="text/css">
+.symbolTable img
+{
+ padding: 12px;
+ cursor: pointer;
+}
+
+.symbolTable img:hover
+{
+ background-color: #ececec;
+}
+</style>
+
+<div id="symbolDiv" style="display:none" class="page">
+
+#set( $base = "../images/orgunitgroup/" )
+
+<table class="symbolTable">
+ <tr>
+ <td><img src="${base}01.png" onclick="selectSymbol( '01.png' )"></td>
+ <td><img src="${base}02.png" onclick="selectSymbol( '02.png' )"></td>
+ <td><img src="${base}03.png" onclick="selectSymbol( '03.png' )"></td>
+ <td><img src="${base}04.png" onclick="selectSymbol( '04.png' )"></td>
+ <td><img src="${base}05.png" onclick="selectSymbol( '05.png' )"></td>
+ </tr>
+ <tr>
+ <td><img src="${base}06.png" onclick="selectSymbol( '06.png' )"></td>
+ <td><img src="${base}07.png" onclick="selectSymbol( '07.png' )"></td>
+ <td><img src="${base}08.png" onclick="selectSymbol( '08.png' )"></td>
+ <td><img src="${base}09.png" onclick="selectSymbol( '09.png' )"></td>
+ <td><img src="${base}10.png" onclick="selectSymbol( '10.png' )"></td>
+ </tr>
+ <tr>
+ <td><img src="${base}11.png" onclick="selectSymbol( '11.png' )"></td>
+ <td><img src="${base}12.png" onclick="selectSymbol( '12.png' )"></td>
+ <td><img src="${base}13.png" onclick="selectSymbol( '13.png' )"></td>
+ <td><img src="${base}14.png" onclick="selectSymbol( '14.png' )"></td>
+ <td><img src="${base}15.png" onclick="selectSymbol( '15.png' )"></td>
+ </tr>
+ <tr>
+ <td><img src="${base}16.png" onclick="selectSymbol( '16.png' )"></td>
+ <td><img src="${base}17.png" onclick="selectSymbol( '17.png' )"></td>
+ <td><img src="${base}18.png" onclick="selectSymbol( '18.png' )"></td>
+ <td><img src="${base}19.png" onclick="selectSymbol( '19.png' )"></td>
+ <td><img src="${base}20.png" onclick="selectSymbol( '20.png' )"></td>
+ </tr>
+ <tr>
+ <td><img src="${base}21.png" onclick="selectSymbol( '21.png' )"></td>
+ <td><img src="${base}22.png" onclick="selectSymbol( '22.png' )"></td>
+ <td><img src="${base}23.png" onclick="selectSymbol( '23.png' )"></td>
+ <td><img src="${base}24.png" onclick="selectSymbol( '24.png' )"></td>
+ <td><img src="${base}25.png" onclick="selectSymbol( '25.png' )"></td>
+ </tr>
+</table>
+
+</div>
\ 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/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-10-03 08:36:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-11-20 14:47:27 +0000
@@ -51,7 +51,8 @@
<form id="editDataSetForm" name="editDataSetForm" action="updateDataSet.action" method="post" class="inputForm">
<input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/>
-
+ <input type="hidden" id="symbol" name="symbol" value="$!dataSet.symbol">
+
<table id="detailsList" style="width: 600px;">
<col style="width: 400px;"/> ## Labels
<col /> ## Input
@@ -124,6 +125,17 @@
</select>
</td>
</tr>
+ <tr>
+ <td style="height:35px"><label for="symbol">$i18n.getString( "symbol" )</td>
+ <td><a href="javascript:openSymbolDialog()">$i18n.getString( "select_symbol" )</a>
+ <img id="symbolImg" style="padding-left: 30px;"
+ #if( $dataSet.getSymbol() )
+ src="../images/orgunitgroup/$dataSet.symbol"
+ #else
+ src="../images/transparent.png"
+ #end >
+ </td>
+ </tr>
</tbody>
<thead>
<tr>
@@ -291,3 +303,5 @@
</tbody>
</table>
</form>
+
+#parse( "dhis-web-maintenance-dataset/dataSetSymbol.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2013-09-25 15:52:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2013-11-20 14:47:27 +0000
@@ -35,7 +35,6 @@
<h3>$i18n.getString( "edit_org_unit_group" ) #openHelp( "ou_groups_edit" )</h3>
<form id="updateOrganisationUnitGroupForm" action="updateOrganisationUnitGroup.action" method="post" class="inputForm">
-
<input type="hidden" name="id" id="id" style="width:300px" value="$!{organisationUnitGroup.id}">
<input type="hidden" id="symbol" name="symbol" value="$!{organisationUnitGroup.symbol}">
