dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31703
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16201: Section, added property description
------------------------------------------------------------
revno: 16201
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-07-21 13:37:05 +0200
message:
Section, added property description
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml
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/UpdateSectionAction.java
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/editSection.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/Section.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2014-05-06 10:12:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2014-07-21 11:37:05 +0000
@@ -28,12 +28,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.IdentifiableObject;
@@ -44,10 +43,12 @@
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementOperand;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
@JacksonXmlRootElement(localName = "section", namespace = DxfNamespaces.DXF_2_0)
public class Section
@@ -58,6 +59,8 @@
*/
private static final long serialVersionUID = -4657657995917502852L;
+ private String description;
+
private DataSet dataSet;
@Scanned
@@ -171,6 +174,19 @@
// -------------------------------------------------------------------------
@JsonProperty
+ @JsonView({ DetailedView.class, ExportView.class })
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
+ @JsonProperty
@JsonSerialize(as = BaseIdentifiableObject.class)
@JsonView({ DetailedView.class, ExportView.class })
@JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml 2014-05-05 10:58:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml 2014-07-21 11:37:05 +0000
@@ -13,17 +13,12 @@
<id name="id" column="sectionid">
<generator class="native" />
</id>
+ &identifiableProperties;
<property name="name" column="name" not-null="true" length="230"
unique-key="key_sectionnamedataset" />
- <property name="uid" column="uid" length="11" />
-
- <property name="code" column="code" not-null="false" unique="true" length="50" />
-
- <property name="created" type="timestamp" />
-
- <property name="lastUpdated" type="timestamp" />
+ <property name="description" type="text" />
<many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid"
unique-key="key_sectionnamedataset" foreign-key="fk_section_datasetid" not-null="true" />
=== 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-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/AddSectionAction.java 2014-07-21 11:37:05 +0000
@@ -85,6 +85,13 @@
{
this.sectionName = sectionName;
}
+
+ private String description;
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
private List<String> selectedList = new ArrayList<String>();
@@ -106,6 +113,7 @@
section.setDataSet( dataSet );
section.setName( sectionName );
+ section.setDescription( description );
section.setSortOrder( 0 );
List<DataElement> selectedDataElements = new ArrayList<DataElement>();
=== 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-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/UpdateSectionAction.java 2014-07-21 11:37:05 +0000
@@ -88,6 +88,13 @@
this.sectionName = sectionName;
}
+ private String description;
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
private List<String> selectedList = new ArrayList<String>();
public void setSelectedList( List<String> selectedList )
@@ -124,6 +131,7 @@
section.setDataElements( dataElements );
section.setName( sectionName );
+ section.setDescription( description );
sectionService.updateSection( section );
=== 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 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/addSection.vm 2014-07-21 11:37:05 +0000
@@ -36,7 +36,11 @@
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="sectionName" name="sectionName"></td>
- </tr>
+ </tr>
+ <tr>
+ <td><label>$i18n.getString( "description" )</label></td>
+ <td><textarea id="description" name="description"></textarea></td>
+ </tr>
<tr>
<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" value="$dataSet.displayName" disabled="disabled"/><input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/></td>
=== 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-07-21 08:45:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2014-07-21 11:37:05 +0000
@@ -40,7 +40,11 @@
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="sectionName" name="sectionName" value= "$section.name"></td>
- </tr>
+ </tr>
+ <tr>
+ <td><label>$i18n.getString( "description" )</label></td>
+ <td><textarea id="description" name="description">$!encoder.htmlEncode( $section.description )</textarea></td>
+ </tr>
<tr>
<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" value="$dataSet.displayName" disabled="disabled"/></td>
