------------------------------------------------------------
revno: 13057
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-11-28 20:26:08 +0100
message:
remove legend symbol from dataset
removed:
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-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/dataset/hibernate/DataSet.hbm.xml
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/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
--
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-11-20 14:47:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-11-28 19:26:08 +0000
@@ -166,8 +166,6 @@
*/
private boolean notifyCompletingUser;
- private String symbol;
-
// -------------------------------------------------------------------------
// Form properties
// -------------------------------------------------------------------------
@@ -648,19 +646,6 @@
@JsonProperty
@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;
@@ -774,7 +759,6 @@
dataElementDecoration = dataSet.isDataElementDecoration();
notificationRecipients = dataSet.getNotificationRecipients();
- symbol = dataSet.getSymbol();
dataElements.clear();
=== 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 2013-11-04 13:54:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2013-11-28 19:26:08 +0000
@@ -646,6 +646,8 @@
executeSql( "ALTER TABLE interpretation ALTER COLUMN userid DROP NOT NULL" );
executeSql( "UPDATE interpretation SET publicaccess='r-------' WHERE publicaccess IS NULL;" );
+ executeSql( "ALTER TABLE dataset DROP COLUMN symbol" );
+
upgradeMapViewsToAnalyticalObject();
executeSql( "ALTER TABLE users ALTER COLUMN password DROP NOT NULL" );
=== 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-11-20 14:47:27 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2013-11-28 19:26:08 +0000
@@ -21,8 +21,6 @@
<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-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-11-20 14:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2013-11-28 19:26:08 +0000
@@ -122,13 +122,6 @@
this.description = description;
}
- private String symbol;
-
- public void setSymbol( String symbol )
- {
- this.symbol = symbol;
- }
-
private int expiryDays;
public void setExpiryDays( int expiryDays )
@@ -253,7 +246,6 @@
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-11-20 14:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-11-28 19:26:08 +0000
@@ -133,13 +133,6 @@
this.description = description;
}
- private String symbol;
-
- public void setSymbol( String symbol )
- {
- this.symbol = symbol;
- }
-
private int expiryDays;
public void setExpiryDays( int expiryDays )
@@ -285,7 +278,6 @@
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/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-11-20 14:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-11-28 19:26:08 +0000
@@ -52,8 +52,6 @@
#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,12 +122,7 @@
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</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>
+ </td>
</tr>
</tbody>
<thead>
@@ -290,5 +283,3 @@
</tbody>
</table>
</form>
-
-#parse( "dhis-web-maintenance-dataset/dataSetSymbol.vm" )
=== removed 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 2013-11-20 14:47:27 +0000
+++ 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
@@ -1,57 +0,0 @@
-
-<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-11-20 14:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-11-28 19:26:08 +0000
@@ -51,7 +51,6 @@
<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
@@ -125,17 +124,6 @@
</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>
@@ -303,5 +291,3 @@
</tbody>
</table>
</form>
-
-#parse( "dhis-web-maintenance-dataset/dataSetSymbol.vm" )
_______________________________________________
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
