dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19690
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8694: Added symbol property to OrganisationUnitGroup and add/update user interface. Primary use case is...
------------------------------------------------------------
revno: 8694
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-24 15:47:13 +0200
message:
Added symbol property to OrganisationUnitGroup and add/update user interface. Primary use case is GIS but can be used for other purposes.
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/01.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/03.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/04.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/05.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/06.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js
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/organisationunit/OrganisationUnitGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-10-16 14:18:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-10-24 13:47:13 +0000
@@ -57,7 +57,7 @@
*/
private static final long serialVersionUID = -1131637847640209166L;
- private String image;
+ private String symbol;
@Scanned
private Set<OrganisationUnit> members = new HashSet<OrganisationUnit>();
@@ -170,15 +170,16 @@
@JsonProperty
@JsonView( {DetailedView.class, ExportView.class} )
@JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
- public String getImage()
- {
- return image;
- }
-
- public void setImage( String image )
- {
- this.image = image;
- }
+ public String getSymbol()
+ {
+ return symbol;
+ }
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
+
@JsonProperty( value = "organisationUnits" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-10-24 13:47:13 +0000
@@ -123,6 +123,7 @@
executeSql( "ALTER TABLE configuration DROP COLUMN completenessrecipientsid" );
executeSql( "ALTER TABLE dataelement DROP COLUMN alternativename" );
executeSql( "ALTER TABLE indicator DROP COLUMN alternativename" );
+ executeSql( "ALTER TABLE orgunitgroup DROP COLUMN image" );
executeSql( "DROP INDEX crosstab" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2012-10-16 14:18:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2012-10-24 13:47:13 +0000
@@ -15,7 +15,7 @@
</id>
&identifiableProperties;
- <property name="image" />
+ <property name="symbol" />
<set name="members" table="orgunitgroupmembers">
<cache usage="read-write" />
=== added directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/01.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/01.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/01.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/03.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/03.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/03.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/04.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/04.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/04.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/05.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/05.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/05.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/06.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/06.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/06.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png 2012-10-24 13:47:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png 2012-10-24 13:47:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2012-10-24 13:47:13 +0000
@@ -81,6 +81,12 @@
this.name = name;
}
+ private String symbol;
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
private List<String> jsonAttributeValues;
@@ -96,7 +102,9 @@
public String execute()
throws Exception
{
- OrganisationUnitGroup organisationUnitGroup = new OrganisationUnitGroup( name );
+ OrganisationUnitGroup organisationUnitGroup = new OrganisationUnitGroup();
+ organisationUnitGroup.setName( name );
+ organisationUnitGroup.setSymbol( symbol );
Collection<OrganisationUnit> selectedOrganisationUnits = selectionTreeManager
.getReloadedSelectedOrganisationUnits();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java 2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java 2012-10-24 13:47:13 +0000
@@ -89,6 +89,13 @@
this.name = name;
}
+ private String symbol;
+
+ public void setSymbol( String symbol )
+ {
+ this.symbol = symbol;
+ }
+
private List<String> jsonAttributeValues;
public void setJsonAttributeValues( List<String> jsonAttributeValues )
@@ -106,6 +113,7 @@
OrganisationUnitGroup organisationUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( id );
organisationUnitGroup.setName( name );
+ organisationUnitGroup.setSymbol( symbol );
Collection<OrganisationUnit> selectedOrganisationUnits = selectionTreeManager.getReloadedSelectedOrganisationUnits();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-10-17 18:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-10-24 13:47:13 +0000
@@ -96,4 +96,6 @@
data_sets=Data sets
organisation_unit_groups=Organisation unit groups
select_group=Select group
-phone_number=Phone number
\ No newline at end of file
+phone_number=Phone number
+select_symbol=Select symbol
+symbol=Symbol
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2012-06-20 18:52:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2012-10-24 13:47:13 +0000
@@ -105,6 +105,7 @@
<action name="openAddOrganisationUnitGroup" class="org.hisp.dhis.oum.action.organisationunitgroup.ShowAddOrganisationUnitGroupFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm</param>
+ <param name="javascripts">javascript/organisationUnitGroup.js</param>
<param name="requiredAuthorities">F_ORGUNITGROUP_ADD</param>
</action>
@@ -117,6 +118,7 @@
<action name="openUpdateOrganisationUnitGroup" class="org.hisp.dhis.oum.action.organisationunitgroup.GetOrganisationUnitGroupAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm</param>
+ <param name="javascripts">javascript/organisationUnitGroup.js</param>
<param name="requiredAuthorities">F_ORGUNITGROUP_UPDATE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm 2012-10-17 18:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm 2012-10-24 13:47:13 +0000
@@ -20,13 +20,20 @@
<form name="addOrganisationUnitGroupForm" id="addOrganisationUnitGroupForm" action="addOrganisationUnitGroup.action" method="post" class="inputForm">
+<input type="hidden" id="symbol" name="symbol">
+
<table>
<tr>
- <th colspan="2">$i18n.getString( "details" )</th>
+ <th colspan="3">$i18n.getString( "details" )</th>
</tr>
<tr>
<td style="width:120px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name"></td>
+ <td colspan="2"><input type="text" id="name" name="name"></td>
+ </tr>
+ <tr>
+ <td style="height:35px"><label for="symbol">$i18n.getString( "symbol" )</td>
+ <td style="width:130px"><a href="javascript:openSymbolDialog()">$i18n.getString( "select_symbol" )</a></td>
+ <td><img id="symbolImg" style="display:none; padding-left:20px;"></td>
</tr>
</table>
@@ -45,4 +52,6 @@
<input type="button" onclick="window.location.href='organisationUnitGroup.action'" value="$i18n.getString( 'cancel' )" style="width:10em"/>
</p>
-</form>
\ No newline at end of file
+</form>
+
+#parse( "dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js 2011-09-27 08:37:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js 2012-10-24 13:47:13 +0000
@@ -21,4 +21,26 @@
function removeOrganisationUnitGroup( unitGroupId, unitGroupName )
{
removeItem( unitGroupId, unitGroupName, confirm_to_delete_org_unit_group, 'removeOrganisationUnitGroup.action' );
+}
+
+//-----------------------------------------------------------------------------
+//Symbol
+//-----------------------------------------------------------------------------
+
+function openSymbolDialog()
+{
+ $( "#symbolDiv" ).dialog( {
+ height: 194,
+ width: 194,
+ modal: true,
+ resizable: false,
+ title: "Select symbol"
+ } );
+}
+
+function selectSymbol( img )
+{
+ $( "#symbol" ).val( img );
+ $( "#symbolDiv" ).dialog( "close" );
+ $( "#symbolImg" ).attr( "src", "../images/orgunitgroup/" + img ).show();
}
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm 2012-10-24 13:47:13 +0000
@@ -0,0 +1,40 @@
+
+<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>
+ </tr>
+ <tr>
+ <td><img src="${base}05.png" onclick="selectSymbol( '05.png' )"></td>
+ <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>
+ </tr>
+ <tr>
+ <td><img src="${base}09.png" onclick="selectSymbol( '09.png' )"></td>
+ <td><img src="${base}10.png" onclick="selectSymbol( '10.png' )"></td>
+ <td><img src="${base}11.png" onclick="selectSymbol( '11.png' )"></td>
+ <td><img src="${base}12.png" onclick="selectSymbol( '12.png' )"></td>
+ </tr>
+</table>
+
+</div>
\ No newline at end of file
=== 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 2012-10-17 18:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2012-10-24 13:47:13 +0000
@@ -18,15 +18,22 @@
<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" name="id" id="id" style="width:300px" value="$!{organisationUnitGroup.id}">
+<input type="hidden" id="symbol" name="symbol" value="$!{organisationUnitGroup.symbol}">
<table>
<tr>
- <th colspan="2">$i18n.getString( "details" )</th>
+ <th colspan="3">$i18n.getString( "details" )</th>
</tr>
<tr>
<td style="width:120px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$!organisationUnitGroup.name"/></td>
+ <td colspan="2"><input type="text" id="name" name="name" value="$!organisationUnitGroup.name"/></td>
+ </tr>
+ <tr>
+ <td style="height:35px"><label for="symbol">$i18n.getString( "symbol" )</td>
+ <td style="width:130px"><a href="javascript:openSymbolDialog()">$i18n.getString( "select_symbol" )</a></td>
+ <td><img id="symbolImg" style="padding-left:20px;"#if( $organisationUnitGroup.symbol ) src="../images/orgunitgroup/${organisationUnitGroup.symbol}"#end></td>
</tr>
</table>
@@ -46,3 +53,5 @@
</p>
</form>
+
+#parse( "dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm" )
