dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02925
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 966: Added lastupdated property in view details GUI.
------------------------------------------------------------
revno: 966
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-03 14:11:45 +0100
message:
Added lastupdated property in view details GUI.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm
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/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/responseOrganisationUnitObject.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-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2009-11-03 08:29:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2009-11-03 13:11:45 +0000
@@ -18,9 +18,6 @@
<property name="dataDictionaryService">
<ref bean="org.hisp.dhis.datadictionary.DataDictionaryService" />
</property>
- <property name="translationUserSettingSupport">
- <ref bean="translationUserSettingSupport"/>
- </property>
</bean>
<bean
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2009-11-03 13:11:45 +0000
@@ -359,6 +359,7 @@
update_indicatorgroupset = Update Indicator Group Set
available_indicatorgroup = Available Indicator Groups
selected_indicatorgroup = Selected Indicator Groups
+last_updated = Last updated
intro_data_element = Create, modify, view and delete data elements.
intro_data_element_group = Create, modify, view and delete data element groups.
intro_data_element_group_editor = Easily add or remove data elements to and from data element groups.
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2009-11-02 13:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2009-11-03 13:11:45 +0000
@@ -83,21 +83,20 @@
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none;">
+ <div id="detailsArea" style="display:none">
<div style="float:right">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
</div>
- <div style="overflow:auto;height:400px;margin-top:20px">
- <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
- <p><label>$i18n.getString( "short_name" ):</label><br><span id="shortNameField"></span></p>
- <p><label>$i18n.getString( "alternative_name" ):</label><br><span id="alternativeNameField"></span></p>
- <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "active" ):</label><br><span id="activeField"></span></p>
- <p><label>$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
- <p><label>$i18n.getString( "aggregation_operator" ):</label><br><span id="aggregationOperatorField"></span></p>
- <p><label>$i18n.getString( "category_combination" ):</label><br><span id="categoryComboField"></span></p>
- <p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
- </div>
+ <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label>$i18n.getString( "short_name" ):</label><br><span id="shortNameField"></span></p>
+ <p><label>$i18n.getString( "alternative_name" ):</label><br><span id="alternativeNameField"></span></p>
+ <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+ <p><label>$i18n.getString( "active" ):</label><br><span id="activeField"></span></p>
+ <p><label>$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
+ <p><label>$i18n.getString( "aggregation_operator" ):</label><br><span id="aggregationOperatorField"></span></p>
+ <p><label>$i18n.getString( "category_combination" ):</label><br><span id="categoryComboField"></span></p>
+ <p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "last_updated" ):</label><br><span id="lastUpdatedField"></span></p>
</div>
<div id="warningArea" style="display:none">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2009-11-02 13:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2009-11-03 13:11:45 +0000
@@ -87,7 +87,8 @@
<p><label>$i18n.getString( "indicator_type" ):</label><br><span id="indicatorTypeNameField"></span></p>
<p><label>$i18n.getString( "numerator_description" ):</label><br><span id="numeratorDescriptionField"></span></p>
<p><label>$i18n.getString( "denominator_description" ):</label><br><span id="denominatorDescriptionField"></span></p>
- <p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "last_updated" ):</label><br><span id="lastUpdatedField"></span></p>
</div>
<div id="warningArea" style="display:none">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2009-09-25 22:00:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2009-11-03 13:11:45 +0000
@@ -60,6 +60,9 @@
var url = getElementValue( dataElementElement, 'url' );
setFieldValue( 'urlField', url ? '<a href="' + url + '">' + url + '</a>' : '[' + i18n_none + ']' );
+ var lastUpdated = getElementValue( dataElementElement, 'lastUpdated' );
+ setFieldValue( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
+
showDetails();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2009-05-20 14:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2009-11-03 13:11:45 +0000
@@ -50,6 +50,9 @@
var url = getElementValue( indicatorElement, 'url' );
setFieldValue( 'urlField', url ? '<a href="' + url + '">' + url + '</a>' : '[' + i18n_none + ']' );
+ var lastUpdated = getElementValue( indicatorElement, 'lastUpdated' );
+ setFieldValue( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
+
showDetails();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm 2009-05-20 14:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm 2009-11-03 13:11:45 +0000
@@ -10,5 +10,6 @@
<type>$dataElement.type</type>
<aggregationOperator>$dataElement.aggregationOperator</aggregationOperator>
<url>$!encoder.xmlEncode( $dataElement.url )</url>
- <categoryCombo>$dataElement.categoryCombo.name</categoryCombo>
+ <lastUpdated>$!format.formatDate( $dataElement.lastUpdated )</lastUpdated>
+ <categoryCombo>$!encoder.xmlEncode( $dataElement.categoryCombo.name )</categoryCombo>
</dataElement>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm 2009-05-20 14:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm 2009-11-03 13:11:45 +0000
@@ -11,4 +11,5 @@
<numeratorDescription>$encoder.xmlEncode( $indicator.numeratorDescription )</numeratorDescription>
<denominatorDescription>$encoder.xmlEncode( $indicator.denominatorDescription )</denominatorDescription>
<url>$!encoder.xmlEncode( $indicator.url )</url>
+ <lastUpdated>$!format.formatDate( $indicator.lastUpdated )</lastUpdated>
</indicator>
=== 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 2009-11-03 10:54:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2009-11-03 13:11:45 +0000
@@ -116,8 +116,9 @@
select_all_at_level = Select All at Level
unselect_all_at_level = Un-Select All at Level
select_all_in_group = Select All in Group
-unselect_all_in_group = Un-Select All in Group
-unselect_all = Un-Select All
+unselect_all_in_group = Unselect All in Group
+unselect_all = Unselect All
+last_updated = Last updated
intro_org_unit = Create, modify, view and delete organisation units.
intro_org_unit_group = Create, modify, view and delete organisation unit groups.
intro_org_unit_group_set = Create, modify, view and delete organisation unit group sets.
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2009-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2009-11-03 13:11:45 +0000
@@ -40,6 +40,9 @@
var url = getElementValue( unitElement, 'url' );
setFieldValue( 'urlField', url ? '<a href="' + url + '">' + url + '</a>' : '[' + none + ']' );
+ var lastUpdated = getElementValue( unitElement, 'lastUpdated' );
+ setFieldValue( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + none + ']' );
+
showDetails();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2009-11-02 13:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2009-11-03 13:11:45 +0000
@@ -64,6 +64,7 @@
<p><label>$i18n.getString( "registers_date" ):</label><br><span id="activeField"></span></p>
<p><label>$i18n.getString( "comment" ):</label><br><span id="commentField"></span></p>
<p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "last_updated" ):</label><br><span id="lastUpdatedField"></span></p>
</div>
<div id="warningArea" style="display:none">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/responseOrganisationUnitObject.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/responseOrganisationUnitObject.vm 2009-05-20 11:38:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/responseOrganisationUnitObject.vm 2009-11-03 13:11:45 +0000
@@ -4,9 +4,10 @@
<name>$encoder.xmlEncode( $organisationUnit.name )</name>
<shortName>$encoder.xmlEncode( $organisationUnit.shortName )</shortName>
<code>$!encoder.xmlEncode( $organisationUnit.code )</code>
- <openingDate>$format.formatDate( $organisationUnit.openingDate )</openingDate>
+ <openingDate>$!format.formatDate( $organisationUnit.openingDate )</openingDate>
<closedDate>$!format.formatDate( $organisationUnit.closedDate )</closedDate>
<active>$organisationUnit.active</active>
<comment>$!encoder.xmlEncode( $organisationUnit.comment )</comment>
- <url>$!encoder.xmlEncode( $organisationUnit.url )</url>
+ <url>$!encoder.xmlEncode( $organisationUnit.url )</url>
+ <lastUpdated>$!format.formatDate( $organisationUnit.lastUpdated )</lastUpdated>
</organisationUnit>
\ No newline at end of file
