[Dhis2-devs] [Bug 656113] Re: json files not loaded/recongnized?

[Kim Anh Vo]

thanks... it works now.
Should fix in the document: 10.3.3: geojson not geoson

** Changed in: dhis2
   Status: New => Invalid

-- 
json files not loaded/recongnized?
https://bugs.launchpad.net/bugs/656113
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Invalid

Bug description:
ersion:
2.0.6-SNAPSHOT
Build revision:
2326 
Build date:
2010-10-07 09:15

Description: shapefiles got from www.gadm.org (registered/viewed okay with 
geoserver)
Following the latest DHIS2 document, json files exported and imported into 
DHIS2 (DHIS2_HOME/geoson folder)
Unfortunately, none of the json files are listed  when trying to register a map 
in DHIS2-GIS (stuck in step 10.5, see DHIS2 user docs)



___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2348: Minor fixed

[noreply]

revno: 2348
committer: Hieu 
branch nick: trunk
timestamp: Tue 2010-10-12 15:36:44 +0700
message:
  Minor fixed
modified:
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js	2010-10-12 08:22:10 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js	2010-10-12 08:36:44 +
@@ -30,6 +30,7 @@
 if ( value == 'custom' )
 {
 commentSelector.style.display = 'none';
+commentField.style.css = 'text';
 commentField.style.display = 'inline';
 
 commentField.select();
@@ -55,7 +56,7 @@
 if ( value == '' )
 {
 commentField.style.display = 'none';
-		commentSelector.style.css = "combobox";
+		commentSelector.style.css = 'combobox';
 commentSelector.style.display = 'inline';
 
 commentSelector.selectedIndex = 0;

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm	2010-10-12 08:22:10 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm	2010-10-12 08:36:44 +
@@ -52,6 +52,7 @@
 	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
 	var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
 	var i18n_saving_comment_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_comment_failed_status_code" ) , "'")';
+	var i18n_saving_comment_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_comment_failed_error_code" ) , "'")';
 	var i18n_saving_minmax_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_minmax_failed_error_code" ) , "'")';
 	var i18n_saving_zero_values_unnecessary = '$encoder.jsEscape( $i18n.getString( "saving_zero_values_unnecessary" ) , "'")';
 	

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2349: Data Section Form - Fixed bug view history

[noreply]

revno: 2349
committer: Hieu 
branch nick: trunk
timestamp: Tue 2010-10-12 16:16:17 +0700
message:
  Data Section Form - Fixed bug view history
modified:
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.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-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm	2010-10-12 08:22:10 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm	2010-10-12 09:16:17 +
@@ -50,7 +50,7 @@
 		
 			
 			#if( $dataElement.type == "int" && $auth.hasAccess( "dhis-web-dataentry", "viewHistory" ) )
-
+
 			#end
 			#if( $useShortName )
 $encoder.htmlEncode( $dataElement.shortName )

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2350: Data Section Form - Fixed bug when saving comment in the historical viewer (pop-up) and minor cha...

[noreply]

revno: 2350
committer: Hieu 
branch nick: trunk
timestamp: Tue 2010-10-12 17:00:17 +0700
message:
  Data Section Form - Fixed bug when saving comment in the historical viewer 
(pop-up) and minor changes.
modified:
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js


--
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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-10-07 11:14:36 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-10-12 10:00:17 +
@@ -133,3 +133,4 @@
 datavalue_history =	Data value history
 data_element_order = Data Element Order
 generate_min_max_success 			= Generate Min/Max successfully.
+enter_digits= Enter digit only.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2010-04-02 02:43:38 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2010-10-12 10:00:17 +
@@ -90,265 +90,266 @@
 change_order			= \u0110\u1ed5i t\u1ee9 t\u1ef1
 #Resource generated by I18n Resource Editor
 #Fri Mar 26 15:52:46 ICT 2010
-validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-import_from_excel=Nh\u1EADp t\u1EEB file Excel (M\u1EABu \u0111\u00E3 \u0111\u01B0\u1EE3c xu\u1EA5t ra)
-saving_comment_failed_status_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-description=M\u00F4 t\u1EA3
-use_short_names=S\u1EED d\u1EE5ng t\u00EAn vi\u1EBFt t\u1EAFt
-saving_value_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-entry=Gi\u00E1 tr\u1ECB
-data_set=T\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-dataelement_comment=Ch\u00FA th\u00EDch
-confirm_undo=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn b\u1EA1n s\u1EBD x\u00F3a b\u1ECF vi\u1EC7c \u0111\u0103ng k\u00ED n\u00E0y?
-successful_validation=Gi\u00E1 tr\u1ECB h\u1EE3p l\u1EC7
-data_entry=Nh\u1EADp d\u1EEF li\u1EC7u
-stored_by=Ng\u01B0\u1EDDi nh\u1EADp li\u1EC7u
-order_by_entry=Th\u1EE9 t\u1EF1 theo \u0111\u0103ng k\u00FD
-saving_value_failed_status_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-max_limit=Gi\u1EDBi h\u1EA1n cao nh\u1EA5t
-dv_deleted=\u0110\u00E3 x\u00F3a
-delete_min_max_values=X\u00F3a gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-saving_comment_failed_error_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-organisation_unit=\u0110\u01A1n v\u1ECB
-value_of_data_element_greater=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u sau l\u1EDBn h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t cho ph\u00E9p
-yes=C\u00F3
-max=L\u1EDBn nh\u1EA5t
-generate_min_max=T\u1EA1o gi\u1EDBi b\u1EA1n min/max
-date=Ng\u00E0y
-audit_operation=Lo\u1EA1i thao t\u00E1c
-validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-down=Xu\u1ED1ng
-dv_updated=\u0110\u00E3 c\u1EADp nh\u1EADt
-value_of_data_element_less=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u th\u1EA5p h\u01A1n gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t cho ph\u00E9p
-save=L\u01B0u
-saving_minmax_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-min_max_limits=Gi\u1EDBi h\u1EA1n l\u1EDBn nh\u1EA5t - nh\u1ECF nh\u1EA5t
-left_description=M\u00F4 t\u1EA3 v\u1EBF tr\u00E1i
-comment=Ch\u00FA th\u00EDch
-dataelement_history=L\u1ECBch s\u1EED ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-minimum_must_less_than_maximum=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i nh\u1ECF h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-unsuccessful_validation=Gi\u00E1 tr\u1ECB kh\u00F4ng h\u1EE3p l\u1EC7. C\u1EE5 th\u1EC3 nh\u01B0 sau\:
-specify_minimum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
+validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+import_from_excel=Nh\u1eadp t\u1eeb file Excel (M\u1eabu \u0111\u00e3 \u0111\u01b0\u1ee3c xu\u1ea5t ra)
+saving_comment_failed_status_code=L\u01b

[Dhis2-devs] [Bug 585751] Re: PDF export of indicators should contain more details

[Hynek Kruzik]

Just few more details should be corrected:

1. Information about indicator annualization is missing in the report as well 
as date of last update.
2. New labels in the report (numerator_formula and denominator_formula) should 
be generated with Capital first letter and without undercores.

-- 
PDF export of indicators should contain more details
https://bugs.launchpad.net/bugs/585751
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
PDF export of indicators should contain more details, especially definition of 
numerator and denominator. At this moment report includes only comments 
attached to them instead the report should contain all formulas.



___
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

[Dhis2-devs] [Bug 659094] [NEW] Indicator management info panel does'nt show annualizaition attribute properly

[Hynek Kruzik]

Public bug reported:

Information panel in indicator management screen (populated after
pressing the Show info button) shows annualization attribute status as
"No" even if it is set to "Yes".

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
Indicator management info panel does'nt show annualizaition attribute properly
https://bugs.launchpad.net/bugs/659094
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Information panel in indicator management screen (populated after pressing the 
Show info button) shows annualization attribute status as "No" even if it is 
set to "Yes".



___
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

[Dhis2-devs] [Bug 659094] Re: Indicator management info panel does'nt show annualizaition attribute properly

[Hynek Kruzik]

And I forgot to mention that I propose to add numerator and denominator
formula into the information pannel.

-- 
Indicator management info panel does'nt show annualizaition attribute properly
https://bugs.launchpad.net/bugs/659094
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Information panel in indicator management screen (populated after pressing the 
Show info button) shows annualization attribute status as "No" even if it is 
set to "Yes".



___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2351: (GIS) Client restructured. Improved code. Major speed increase on startup and mapview loading.

[noreply]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 2351 [merge]
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Tue 2010-10-12 13:25:14 +0200
message:
  (GIS) Client restructured. Improved code. Major speed increase on startup and 
mapview loading.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java
  
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/util.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/polygonShapefile.vm
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Symbol.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
The size of the diff (6455 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

Re: [Dhis2-devs] update select data element function in design data entry form more easier, simple and faster

[Ola Hodne Titlestad]

Hi Tri,

Nice work on the form designer, I agree that it is now better and faster.

Here are a few suggestions to further improvements (should go into a
blueprint, but I start here...):

*1. Only show non-selected (available) data elements in the data element
list*
This will make it a lot easier to find data elements when working on large
data sets, and to avoid duplication (using a data element more than one
place)

*2. Add a filter by name on top of the data element list*
Very useful on large data sets.

*3. Add a possibility to sort the list by catcombo name asc, data element
name asc, catoptioncombo name asc*
This is sometimes needed when working on data sets with multiple catcombos
and many data elements and will make it a lot faster to find what you are
looking for. Alternatively add a "filter by catcombo" on top of the list.

*4. Double-click to insert data elements.*
Right now the user has to first select a data element and then click on
 at the bottom of the list.
Double-click insert will speed up the use her, especially when working with
long DE lists.

*5. Preview function*
A bigger job I guess, but a preview window would be great to have to avoid
having to go to data entry to test the form while designing.


--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

Mobile: +47 48069736
Home address: Vetlandsvn. 95B, 0685 Oslo, Norway. Googlemaps
link


On 8 October 2010 12:15,  wrote:

> 
> revno: 2339
> committer: Tri Tran Thanh 
> branch nick: trunk
> timestamp: Fri 2010-10-08 17:12:54 +0700
> message:
>  update select data element function in design data entry form more easier,
> simple and faster
> modified:
>
>  
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java
>
>  
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java
>
>  
> dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
>
>  
> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java
>
>  
> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
>
>  
> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
>
>  
> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.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

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2334: Fix bug: After clicking Completed button into data entry form, it is still possible to re-enter c...

[Lars Helge Øverland]

Hey,

I am not sure if this is the behaviour we want. Marking a dataset as
complete is a subjective assessment and it doesn't mean that all cells are
filled, nor that no more data will be entered later. It is not the same as
the data locking functionality, which will take care of denying further data
entry. In any case its not a bug, its a change in behaviour which must be
discussed. Any comments here? I think we should roll this one back..

Lars


On Fri, Oct 8, 2010 at 9:35 AM,  wrote:

> 
> revno: 2334
> committer: Tran Chau 
> branch nick: trunk
> timestamp: Fri 2010-10-08 14:32:01 +0700
> message:
>  Fix bug: After clicking Completed button into data entry form, it is still
> possible to re-enter comments.
> modified:
>
>  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.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-dataentry/src/main/webapp/dhis-web-dataentry/form.vm'
> ---
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>   2010-10-05 06:53:19 +
> +++
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>   2010-10-08 07:32:01 +
> @@ -211,9 +211,13 @@
>var inputList =
> entryform.getElementsByTagName('input');
>for(var i=0;ivar input = inputList[i];
> -
>input.disabled = disabled;
> -
> +   }
> +
> +   var selectList =
> entryform.getElementsByTagName('select');
> +   for(var i=0;i< selectList.length;i++){
> +   var select =  selectList[i];
> +   select.disabled = disabled;
>}
>}
>
>
>
> ___
> 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
>
>
___
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

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2338: Bug Fixed in Data Entry

[Lars Helge Øverland]

Hi folks,

can we please improve the quality of the log messages a bit? These days
there are tons of commits ala "fixed bug" and "minor fix" which make it hard
to follow what is going on. In some cases its OK if we are doing cosmetic
changes but many of the minor fix commits lately don't look so minor. So
please make some time for writing informative log messages.

regards, Lars


On Fri, Oct 8, 2010 at 11:57 AM,  wrote:

> 
> revno: 2338
> committer: Mithilesh Kumar Thakur
> branch nick: trunk
> timestamp: Fri 2010-10-08 15:26:09 +0530
> message:
>  Bug Fixed in Data Entry
> modified:
>  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
>
>  
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
>
>  
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js
>
>
> --
> 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-dataentry/src/main/resources/struts.xml'
> --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
>  2010-06-27 15:47:33 +
> +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
>  2010-10-08 09:56:09 +
> @@ -188,7 +188,7 @@
> class="org.hisp.dhis.de.action.HistoryAction">
> type="velocity">/popup.vm
> name="page">/dhis-web-dataentry/history.vm
> -name="javascripts">javascript/history.js
> +name="javascripts">javascript/history.js,../request.js
>
>
> class="org.hisp.dhis.de.action.MinMaxGeneratingAction">
>
> === modified file
> 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
> ---
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
>2010-04-05 14:15:54 +
> +++
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
>2010-10-08 09:56:09 +
> @@ -55,7 +55,7 @@
> 
>  
> $encoder.htmlEncode( $i18n.getString( "max_limit" )
> ) 
> - style="width:10em" value="$maxLimit"
> + style="width:10em" value="$maxLimit" class="{validate:{digits:true}}"
> #if( $auth.hasAccess( "dhis-web-dataentry",
> "saveMinMaxLimits" ) && $auth.hasAccess( "dhis-web-dataentry",
> "removeMinMaxLimits" ))
> onchange="saveMaxLimit( $
> dataElementHistory.organisationUnit.id, $dataElementHistory.dataElement.id,
>  $dataElementHistory.optionCombo.id )"
> #else disabled="disabled" #end
> onfocus="this.select()">
>
> === modified file
> 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js'
> ---
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js
> 2010-01-28 23:08:44 +
> +++
> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js
> 2010-10-08 09:56:09 +
> @@ -148,20 +148,24 @@
>
>  function saveMaxLimit( organisationUnitId, dataElementId, optionComboId )
>  {
> -var minLimitField = document.getElementById( "minLimit" );
> +
> +   var minLimitField = document.getElementById( "minLimit" );
> var maxLimitField = document.getElementById( "maxLimit" );
> -
> +
> var request = new Request();
> +
> request.setCallbackSuccess( refreshWindow );
> request.setCallbackError( refreshWindow );
>
> if ( maxLimitField.value == '' )
> {
> -request.send( 'removeMinMaxLimits.action?organisationUnitId=' +
> organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' +
> optionComboId );
> +
> +   request.send( 'removeMinMaxLimits.action?organisationUnitId=' +
> organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' +
> optionComboId );
> +
> }
> else
> {
> -var minLimit = Number( minLimitField.value );
> +   var minLimit = Number( minLimitField.value );
> var maxLimit = Number( maxLimitField.value );
>
> if ( maxLimit )
> @@ -180,7 +184,8 @@
> minLimit = maxLimit - 1;
> }
>
> -request.send( 'saveMinMaxLimits.action?organisationUnitId=' +
> organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' +
> optionComboId + '&minLimit=' + minLimit + '&maxLimit=' + maxLimit );
> +  request.send( 'saveMinMaxLimits.action?organisationUnitId=' +
> organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' +
> optionComboId + '&minLimit=' + minLimit + '&maxLimit=' + maxLimit );
> +
> }
> e

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2334: Fix bug: After clicking Completed button into data entry form, it is still possible to re-enter c...

[bharath kumar]

In *SystemSettings* we have option to select *Disable data entry when data
set completed; *once we select that option then in the dataentry when we
click Complte button in dataentry it is disabling TextBoxes for dataentry
but not the comments.

So while testing we thought it is a bug as it should disable both TextBox
and Comment, but if we understood wrong then Tran please revert it back.

*
*
2010/10/12 Lars Helge Øverland 

> Hey,
>
> I am not sure if this is the behaviour we want. Marking a dataset as
> complete is a subjective assessment and it doesn't mean that all cells are
> filled, nor that no more data will be entered later. It is not the same as
> the data locking functionality, which will take care of denying further data
> entry. In any case its not a bug, its a change in behaviour which must be
> discussed. Any comments here? I think we should roll this one back..
>
> Lars
>
>
> On Fri, Oct 8, 2010 at 9:35 AM,  wrote:
>
>> 
>> revno: 2334
>> committer: Tran Chau 
>> branch nick: trunk
>> timestamp: Fri 2010-10-08 14:32:01 +0700
>> message:
>>  Fix bug: After clicking Completed button into data entry form, it is
>> still possible to re-enter comments.
>> modified:
>>
>>  
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.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-dataentry/src/main/webapp/dhis-web-dataentry/form.vm'
>> ---
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>   2010-10-05 06:53:19 +
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>   2010-10-08 07:32:01 +
>> @@ -211,9 +211,13 @@
>>var inputList =
>> entryform.getElementsByTagName('input');
>>for(var i=0;i>var input = inputList[i];
>> -
>>input.disabled = disabled;
>> -
>> +   }
>> +
>> +   var selectList =
>> entryform.getElementsByTagName('select');
>> +   for(var i=0;i< selectList.length;i++){
>> +   var select =  selectList[i];
>> +   select.disabled = disabled;
>>}
>>}
>>
>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>


-- 

Regards,
Bharath Kumar. Ch
___
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

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2334: Fix bug: After clicking Completed button into data entry form, it is still possible to re-enter c...

[Ola Hodne Titlestad]

Agree with Lars, we should roll back this one.

The complete button was introduced as a subjective way of defining a dataset
as complete, and we should allow changes and possibly new values after this
action.
Subjective or not, complete does not mean final, and it it must be possible
to make edits and improvements to the data after this point.

Just saw Bharath's email,
It seems we are combining very different things here, which might be very
confusing for the users. I understand why you did it from a technical
perspective (reusing code and buttons on the screen), but it seems it would
be better to have a separate "lock dataset" button on the data entry form,
in addition to the "complete" button.

--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

Mobile: +47 48069736
Home address: Vetlandsvn. 95B, 0685 Oslo, Norway. Googlemaps
link


2010/10/12 Lars Helge Øverland 

> Hey,
>
> I am not sure if this is the behaviour we want. Marking a dataset as
> complete is a subjective assessment and it doesn't mean that all cells are
> filled, nor that no more data will be entered later. It is not the same as
> the data locking functionality, which will take care of denying further data
> entry. In any case its not a bug, its a change in behaviour which must be
> discussed. Any comments here? I think we should roll this one back..
>
> Lars
>
>
> On Fri, Oct 8, 2010 at 9:35 AM,  wrote:
>
>> 
>> revno: 2334
>> committer: Tran Chau 
>> branch nick: trunk
>> timestamp: Fri 2010-10-08 14:32:01 +0700
>> message:
>>  Fix bug: After clicking Completed button into data entry form, it is
>> still possible to re-enter comments.
>> modified:
>>
>>  
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.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-dataentry/src/main/webapp/dhis-web-dataentry/form.vm'
>> ---
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>   2010-10-05 06:53:19 +
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>   2010-10-08 07:32:01 +
>> @@ -211,9 +211,13 @@
>>var inputList =
>> entryform.getElementsByTagName('input');
>>for(var i=0;i>var input = inputList[i];
>> -
>>input.disabled = disabled;
>> -
>> +   }
>> +
>> +   var selectList =
>> entryform.getElementsByTagName('select');
>> +   for(var i=0;i< selectList.length;i++){
>> +   var select =  selectList[i];
>> +   select.disabled = disabled;
>>}
>>}
>>
>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>
___
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

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2334: Fix bug: After clicking Completed button into data entry form, it is still possible to re-enter c...

[bharath kumar]

Disabling inputboxes in the dataenryscreen functionality was there before
(not sure who worked on that),

Tran worked on only disabling *comments*, she can revert that funcationality
back. but still locking input box functionality will be there, so i guess we
should change that as well.

Tran correct me if i am wrong.

2010/10/12 Ola Hodne Titlestad 

> Agree with Lars, we should roll back this one.
>
> The complete button was introduced as a subjective way of defining a
> dataset as complete, and we should allow changes and possibly new values
> after this action.
> Subjective or not, complete does not mean final, and it it must be possible
> to make edits and improvements to the data after this point.
>
> Just saw Bharath's email,
> It seems we are combining very different things here, which might be very
> confusing for the users. I understand why you did it from a technical
> perspective (reusing code and buttons on the screen), but it seems it would
> be better to have a separate "lock dataset" button on the data entry form,
> in addition to the "complete" button.
>
> --
> Ola Hodne Titlestad (Mr)
> HISP
> Department of Informatics
> University of Oslo
>
> Mobile: +47 48069736
> Home address: Vetlandsvn. 95B, 0685 Oslo, Norway. Googlemaps 
> link
>
>
> 2010/10/12 Lars Helge Øverland 
>
>> Hey,
>>
>> I am not sure if this is the behaviour we want. Marking a dataset as
>> complete is a subjective assessment and it doesn't mean that all cells are
>> filled, nor that no more data will be entered later. It is not the same as
>> the data locking functionality, which will take care of denying further data
>> entry. In any case its not a bug, its a change in behaviour which must be
>> discussed. Any comments here? I think we should roll this one back..
>>
>> Lars
>>
>>
>> On Fri, Oct 8, 2010 at 9:35 AM,  wrote:
>>
>>> 
>>> revno: 2334
>>> committer: Tran Chau 
>>> branch nick: trunk
>>> timestamp: Fri 2010-10-08 14:32:01 +0700
>>> message:
>>>  Fix bug: After clicking Completed button into data entry form, it is
>>> still possible to re-enter comments.
>>> modified:
>>>
>>>  
>>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.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-dataentry/src/main/webapp/dhis-web-dataentry/form.vm'
>>> ---
>>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>>   2010-10-05 06:53:19 +
>>> +++
>>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>>   2010-10-08 07:32:01 +
>>> @@ -211,9 +211,13 @@
>>>var inputList =
>>> entryform.getElementsByTagName('input');
>>>for(var i=0;i>>var input = inputList[i];
>>> -
>>>input.disabled = disabled;
>>> -
>>> +   }
>>> +
>>> +   var selectList =
>>> entryform.getElementsByTagName('select');
>>> +   for(var i=0;i< selectList.length;i++){
>>> +   var select =  selectList[i];
>>> +   select.disabled = disabled;
>>>}
>>>}
>>>
>>>
>>>
>>> ___
>>> 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
>>>
>>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>


-- 

Regards,
Bharath Kumar. Ch
___
Mailing list: https://launchpad.net/~dhi

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2334: Fix bug: After clicking Completed button into data entry form, it is still possible to re-enter c...

[Lars Helge Øverland]

OK sorry my fault I forgot we had a system setting for this.

As Ola I also think this is mixing of concerns but as long as we have a
setting we can disable it if we don't want it. Agree its consistent to both
lock value and comment if we are going to do this in the first place.
___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2352: (GIS) Base coordinate removed from client and server as it is no longer needed.

[noreply]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 2352 [merge]
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Tue 2010-10-12 15:26:15 +0200
message:
  (GIS) Base coordinate removed from client and server as it is no longer 
needed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
  
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
  
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml
  
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js


--
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/mapping/Map.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2010-04-12 21:23:33 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2010-10-12 13:25:01 +
@@ -54,12 +54,6 @@
 
 private String nameColumn;
 
-private String longitude;
-
-private String latitude;
-
-private int zoom;
-
 private Set staticMapLayerPaths;
 
 public Map()
@@ -67,8 +61,7 @@
 }
 
 public Map( String name, String mapLayerPath, String type, String sourceType, OrganisationUnit organisationUnit,
-OrganisationUnitLevel organisationUnitLevel, String nameColumn, String longitude, String latitude, int zoom,
-Set staticMapLayerPaths )
+OrganisationUnitLevel organisationUnitLevel, String nameColumn, Set staticMapLayerPaths )
 {
 this.name = name;
 this.mapLayerPath = mapLayerPath;
@@ -77,9 +70,6 @@
 this.organisationUnit = organisationUnit;
 this.organisationUnitLevel = organisationUnitLevel;
 this.nameColumn = nameColumn;
-this.longitude = longitude;
-this.latitude = latitude;
-this.zoom = zoom;
 this.staticMapLayerPaths = staticMapLayerPaths;
 }
 
@@ -200,36 +190,6 @@
 this.nameColumn = nameColumn;
 }
 
-public String getLongitude()
-{
-return longitude;
-}
-
-public void setLongitude( String longitude )
-{
-this.longitude = longitude;
-}
-
-public String getLatitude()
-{
-return latitude;
-}
-
-public void setLatitude( String latitude )
-{
-this.latitude = latitude;
-}
-
-public int getZoom()
-{
-return zoom;
-}
-
-public void setZoom( int zoom )
-{
-this.zoom = zoom;
-}
-
 public Set getStaticMapLayerPaths()
 {
 return staticMapLayerPaths;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2010-09-09 19:19:51 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2010-10-12 13:25:01 +
@@ -114,13 +114,10 @@
  *organisation unit value.
  * @param nameColumn, the shapefile column which holds the name of the
  *organisation unit.
- * @param longitude
- * @param latitude
- * @param zoom
  * @return a generated unique id of the added Map.
  */
 int addMap( String name, String mapLayerPath, String type, String sourceType, int organisationUnitId,
-int organisationUnitLevelId, String nameColumn, String longitude, String latitude, int zoom );
+int organisationUnitLevelId, String nameColumn );
 
 /**
  * Adds a map. If a map with the same mapLayerPath already exists, the map
@@ -134,12 +131,9 @@
  *which the map is devided.
  * @param nameColumn, the shapefile column which holds the name of the
  *organisation unit.
- * @param longitude
- * @param latitude
- * @param zoom
  */
 void addOrUpdateMap( String name, String mapLayerPath, String type, String sourceType, int organisationUnitId,
-int organisationUnitLevelId, String nameColumn, String longitude, String latitude, int zoom );
+int organisationUnitLevelId, String nameColumn );
 
 /**
  * Updates a Map.

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java

[Dhis2-devs] Build failed in Hudson: Dhis2 Service Tr unk » DHIS Test Support #1312

[support]

See 


--
[INFO] 
[INFO] Building DHIS Test Support
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 6 source files to 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service 
Trunk/modules/org.hisp.dhis$dhis-support-test/builds/2010-10-12_15-31-29/archive/org.hisp.dhis/dhis-support-test/2.0.6-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure

:[800,11]
 cannot find symbol
symbol  : method setLongitude(java.lang.String)
location: class org.hisp.dhis.mapping.Map

:[801,11]
 cannot find symbol
symbol  : method setLatitude(java.lang.String)
location: class org.hisp.dhis.mapping.Map

:[802,11]
 cannot find symbol
symbol  : method setZoom(int)
location: class org.hisp.dhis.mapping.Map


[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 2 minutes 23 seconds
[INFO] Finished at: Tue Oct 12 15:34:01 CEST 2010
[INFO] Final Memory: 70M/251M
[INFO] 
Waiting for Hudson to finish collecting data


___
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

[Dhis2-devs] Build failed in Hudson: Dhis2 Service Trunk #1312

[support]

See 

Changes:

[Jan Henrik Overland] (GIS) Base coordinate removed from client and server as 
it is no longer needed.

--
Started by an SCM change
$ bzr revision-info -d "
[workspace] $ bzr pull --overwrite 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
 M  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
 M  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
 M  
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
 M  
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
All changes applied successfully.
Now on revision 2352.
$ bzr revision-info -d "
[workspace] $ bzr log -v -r 
revid:janhenrik.overl...@gmail.com-20101012112514-vzg38nc22nn621nk..revid:janhenrik.overl...@gmail.com-20101012132615-ann6nz0rxbg0tcxk
 --long --show-ids
Getting local revision...
$ bzr revision-info -d "
janhenrik.overl...@gmail.com-20101012132615-ann6nz0rxbg0tcxk
Parsing POMs
[dhis-2] $ /local/opt/j2sdk/bin/java -Xmx2048m -XX:MaxPermSize=512m -cp 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.375.jar:/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1/boot/classworlds-1.1.jar
 hudson.maven.agent.Main 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/tomcat/webapps/ci/WEB-INF/lib/remoting-1.375.jar
 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.375.jar
 35040 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 clean 
install findbugs:findbugs
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   DHIS 2
[INFO]   DHIS API
[INFO]   DHIS Support Parent Project
[INFO]   DHIS Test Support
[INFO]   DHIS External Support
[INFO]   DHIS Hibernate Support
[INFO]   DHIS System Support
[INFO]   DHIS JDBC Service
[INFO]   DHIS Services Parent Project
[INFO]   DHIS Core API Implementations
[INFO]   DHIS XML framework services
[INFO]   DHIS I18n Static
[INFO]   DHIS Options
[INFO]   DHIS Administration Service
[INFO]   DHIS DataMart Service - Default
[INFO]   DHIS Aggregation Service - Default
[INFO]   DHIS OrganisationUnit API Implementations
[INFO]   DHIS Reporting Service
[INFO]   DHIS Import-Export Service
[INFO]   DHIS Excel Reporting Service
[INFO]   DHIS Patient API Implementations
[INFO]   DHIS JDBC / External Test Project
[INFO] 
[INFO] Building DHIS 2
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis/2.0.6-SNAPSHOT/dhis-2.0.6-SNAPSHOT.pom
[INFO] Preparing findbugs:findbugs
[INFO] No goals needed for project - skipping
[INFO] Setting property: classpath.resource.loader.class => 
'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
[INFO] Setting property: velocimacro.messages.on => 'false'.
[INFO] Setting property: resource.loader => 'classpath'.
[INFO] Setting property: resource.manager.logwhenfound => 'false'.
[INFO] ** 
[INFO] Starting Jakarta Velocity v1.4
[INFO] RuntimeInstance initializing.
[INFO] Default Properties File: 
org/apache/velocity/runtime/defaults/velocity.properties
[INFO] Default ResourceManager initializing. (class 
org.apache.velocity.runtime.resource.ResourceManagerImpl)
[INFO] Resource Loader Instantiated: 
org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader
[INFO] ClasspathResourceLoader : initialization starting.
[INFO] ClasspathResourceLoader : initialization complete.
[

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2354: (GIS) Minor bug fixed.

[noreply]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 2354 [merge]
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Tue 2010-10-12 17:26:07 +0200
message:
  (GIS) Minor bug fixed.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js


--
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-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-10-12 15:00:41 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-10-12 15:21:18 +
@@ -1,7 +1,5 @@
 /* OpenLayers map */
 var MAP;
-/* Center point of the country */
-var BASECOORDINATE = {};
 /* Geojson, shapefile or database */
 var MAPSOURCE;
 /* Fixed periods or from-to dates */

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-10-12 13:25:01 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-10-12 15:21:18 +
@@ -1474,6 +1474,10 @@
 MAP.zoomToExtent(this.layer.getDataExtent());
 }
 
+this.mapData = {
+nameColumn: 'name'
+};
+
 if (this.mapView) {
 if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
 MAP.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2010-10-12 13:25:01 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2010-10-12 15:24:42 +
@@ -1411,6 +1411,10 @@
 MAP.zoomToExtent(this.layer.getDataExtent());
 }
 
+this.mapData = {
+nameColumn: 'name'
+};
+
 if (this.mapView) {
 if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
 MAP.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);

___
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

[Dhis2-devs] Build failed in Hudson: Dhis2 Service Tr unk » DHIS Test Support #1313

[support]

See 


--
[INFO] 
[INFO] Building DHIS Test Support
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 6 source files to 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service 
Trunk/modules/org.hisp.dhis$dhis-support-test/builds/2010-10-12_17-31-32/archive/org.hisp.dhis/dhis-support-test/2.0.6-SNAPSHOT/pom.xml


___
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

[Dhis2-devs] Build failed in Hudson: Dhis2 Service Trunk #1313

[support]

See 

Changes:

[Jan Henrik Overland] (GIS) Minor bug fixed.

[Jan Henrik Overland] (GIS) Upgraded ExtJS lib version to 3.3.0

--
[...truncated 459 lines...]
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tabs/tab-strip-bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tabs/tab-strip-bg.png
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tabs/tab-strip-btm-bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tabs/tabs-sprite.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/btn-arrow-light.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/btn-arrow.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/btn-over-bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/gray-bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/more.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/tb-bg.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/toolbar/tb-btn-sprite.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/arrows.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/elbow-end-minus-nl.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/elbow-end-minus.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/elbow-end-plus-nl.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/tree/elbow-end-plus.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/icon-error.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/icon-info.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/icon-question.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/icon-warning.gif
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/left-corners.png
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/left-corners.pspimage
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/left-right.png
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/right-corners.png
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/images/gray/window/top-bottom.png
-D  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext/resources/resources.jsb
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
 M  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
All changes applied successfully.
Now on revision 2354.
$ bzr revision-info -d "
[workspace] $ bzr log -v -r 
revid:janhenrik.overl...@gmail.com-20101012132615-ann6nz0rxbg0tcxk..revid:janhenrik.overl...@gmail.com-20101012152607-un9fqjejwbm82k10
 --long --show-ids
Getting local revision...
$ bzr revision-info -d "
janhenrik.overl...@gmail.com-20101012152607-un9fqjejwbm82k10
Parsing POMs
[dhis-2] $ /local/opt/j2sdk/bin/java -Xmx2048m -XX:MaxPermSize=512m -cp 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-

[Dhis2-devs] Latest GIS commit causes build failure

[Knut Staring]

[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure

/root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[800,11]
cannot find symbol
symbol  : method setLongitude(java.lang.String)
location: class org.hisp.dhis.mapping.Map

/root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[801,11]
cannot find symbol
symbol  : method setLatitude(java.lang.String)
location: class org.hisp.dhis.mapping.Map

/root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[802,11]
cannot find symbol
symbol  : method setZoom(int)
location: class org.hisp.dhis.mapping.Map



On Tue, Oct 12, 2010 at 5:29 PM,   wrote:
> Merge authors:
>  Jan Henrik Øverland (janhenrik-overland)
> 
> revno: 2354 [merge]
> committer: Jan Henrik Overland 
> branch nick: trunk
> timestamp: Tue 2010-10-12 17:26:07 +0200
> message:
>  (GIS) Minor bug fixed.
> modified:
>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>
>
> --
> 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-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
> --- 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>    2010-10-12 15:00:41 +
> +++ 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>    2010-10-12 15:21:18 +
> @@ -1,7 +1,5 @@
>  /* OpenLayers map */
>  var MAP;
> -/* Center point of the country */
> -var BASECOORDINATE = {};
>  /* Geojson, shapefile or database */
>  var MAPSOURCE;
>  /* Fixed periods or from-to dates */
>
> === modified file 
> 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
> --- 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>    2010-10-12 13:25:01 +
> +++ 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>    2010-10-12 15:21:18 +
> @@ -1474,6 +1474,10 @@
>                 MAP.zoomToExtent(this.layer.getDataExtent());
>             }
>
> +            this.mapData = {
> +                nameColumn: 'name'
> +            };
> +
>             if (this.mapView) {
>                 if (this.mapView.longitude && this.mapView.latitude && 
> this.mapView.zoom) {
>                     MAP.setCenter(new 
> OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), 
> this.mapView.zoom);
>
> === modified file 
> 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
> --- 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>        2010-10-12 13:25:01 +
> +++ 
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>        2010-10-12 15:24:42 +
> @@ -1411,6 +1411,10 @@
>                 MAP.zoomToExtent(this.layer.getDataExtent());
>             }
>
> +            this.mapData = {
> +                nameColumn: 'name'
> +            };
> +
>             if (this.mapView) {
>                 if (this.mapView.longitude && this.mapView.latitude && 
> this.mapView.zoom) {
>                     MAP.setCenter(new 
> OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), 
> this.mapView.zoom);
>
>
> ___
> 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
>
>



-- 
Cheers,
Knut Staring

___
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

Re: [Dhis2-devs] Latest GIS commit causes build failure

[Jan Henrik Øverland]

Fixed.

On Tue, Oct 12, 2010 at 17:45, Knut Staring  wrote:

> [ERROR] BUILD FAILURE
> [INFO]
> 
> [INFO] Compilation failure
>
>
> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[800,11]
> cannot find symbol
> symbol  : method setLongitude(java.lang.String)
> location: class org.hisp.dhis.mapping.Map
>
>
> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[801,11]
> cannot find symbol
> symbol  : method setLatitude(java.lang.String)
> location: class org.hisp.dhis.mapping.Map
>
>
> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[802,11]
> cannot find symbol
> symbol  : method setZoom(int)
> location: class org.hisp.dhis.mapping.Map
>
>
>
> On Tue, Oct 12, 2010 at 5:29 PM,   wrote:
> > Merge authors:
> >  Jan Henrik Øverland (janhenrik-overland)
> > 
> > revno: 2354 [merge]
> > committer: Jan Henrik Overland 
> > branch nick: trunk
> > timestamp: Tue 2010-10-12 17:26:07 +0200
> > message:
> >  (GIS) Minor bug fixed.
> > modified:
> >
>  
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
> >
>  
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
> >
>  
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
> >
> >
> > --
> > 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-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
> > ---
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>   2010-10-12 15:00:41 +
> > +++
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>   2010-10-12 15:21:18 +
> > @@ -1,7 +1,5 @@
> >  /* OpenLayers map */
> >  var MAP;
> > -/* Center point of the country */
> > -var BASECOORDINATE = {};
> >  /* Geojson, shapefile or database */
> >  var MAPSOURCE;
> >  /* Fixed periods or from-to dates */
> >
> > === modified file
> 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
> > ---
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>   2010-10-12 13:25:01 +
> > +++
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>   2010-10-12 15:21:18 +
> > @@ -1474,6 +1474,10 @@
> > MAP.zoomToExtent(this.layer.getDataExtent());
> > }
> >
> > +this.mapData = {
> > +nameColumn: 'name'
> > +};
> > +
> > if (this.mapView) {
> > if (this.mapView.longitude && this.mapView.latitude &&
> this.mapView.zoom) {
> > MAP.setCenter(new
> OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude),
> this.mapView.zoom);
> >
> > === modified file
> 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
> > ---
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>   2010-10-12 13:25:01 +
> > +++
> dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>   2010-10-12 15:24:42 +
> > @@ -1411,6 +1411,10 @@
> > MAP.zoomToExtent(this.layer.getDataExtent());
> > }
> >
> > +this.mapData = {
> > +nameColumn: 'name'
> > +};
> > +
> > if (this.mapView) {
> > if (this.mapView.longitude && this.mapView.latitude &&
> this.mapView.zoom) {
> > MAP.setCenter(new
> OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude),
> this.mapView.zoom);
> >
> >
> > ___
> > 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
> >
> >
>
>
>
> --
> Cheers,
> Knut Staring
>
> ___
> 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
>
___
Mailing list: https://launchpad.net/~

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2355: DhisConvenienceTest updated.

[noreply]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 2355 [merge]
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Tue 2010-10-12 17:51:42 +0200
message:
  DhisConvenienceTest updated.
modified:
  
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java


--
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-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2010-10-11 10:04:49 +
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2010-10-12 15:50:13 +
@@ -797,9 +797,6 @@
 map.setOrganisationUnitLevel( level );
 map.setMapLayerPath( "MapLayerPath" + uniqueCharacter );
 map.setNameColumn( "NameColumn" + uniqueCharacter );
-map.setLongitude( "Longitude" + uniqueCharacter );
-map.setLatitude( "Latitude" + uniqueCharacter );
-map.setZoom( 1 );
 map.setStaticMapLayerPaths( new HashSet() );
 
 return map;

___
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

[Dhis2-devs] Hudson build is back to normal : Dhis2 S ervice Trunk » DHIS Test Support #1314

[support]

See 




___
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

[Dhis2-devs] Hudson build is back to normal : Dhis2 Service Trunk #1314

[support]

See 



___
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

Re: [Dhis2-devs] Latest GIS commit causes build failure

[Knut Staring]

Thanks!

BTW, I see the PDF and Excel export buttons have been removed some time back?

Knut

On Tue, Oct 12, 2010 at 5:52 PM, Jan Henrik Øverland
 wrote:
> Fixed.
>
> On Tue, Oct 12, 2010 at 17:45, Knut Staring  wrote:
>>
>> [ERROR] BUILD FAILURE
>> [INFO]
>> 
>> [INFO] Compilation failure
>>
>>
>> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[800,11]
>> cannot find symbol
>> symbol  : method setLongitude(java.lang.String)
>> location: class org.hisp.dhis.mapping.Map
>>
>>
>> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[801,11]
>> cannot find symbol
>> symbol  : method setLatitude(java.lang.String)
>> location: class org.hisp.dhis.mapping.Map
>>
>>
>> /root/src/dhis2/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java:[802,11]
>> cannot find symbol
>> symbol  : method setZoom(int)
>> location: class org.hisp.dhis.mapping.Map
>>
>>
>>
>> On Tue, Oct 12, 2010 at 5:29 PM,   wrote:
>> > Merge authors:
>> >  Jan Henrik Øverland (janhenrik-overland)
>> > 
>> > revno: 2354 [merge]
>> > committer: Jan Henrik Overland 
>> > branch nick: trunk
>> > timestamp: Tue 2010-10-12 17:26:07 +0200
>> > message:
>> >  (GIS) Minor bug fixed.
>> > modified:
>> >
>> >  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>> >
>> >  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>> >
>> >  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>> >
>> >
>> > --
>> > 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-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
>> > ---
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>> >   2010-10-12 15:00:41 +
>> > +++
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>> >   2010-10-12 15:21:18 +
>> > @@ -1,7 +1,5 @@
>> >  /* OpenLayers map */
>> >  var MAP;
>> > -/* Center point of the country */
>> > -var BASECOORDINATE = {};
>> >  /* Geojson, shapefile or database */
>> >  var MAPSOURCE;
>> >  /* Fixed periods or from-to dates */
>> >
>> > === modified file
>> > 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
>> > ---
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>> >   2010-10-12 13:25:01 +
>> > +++
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
>> >   2010-10-12 15:21:18 +
>> > @@ -1474,6 +1474,10 @@
>> >                 MAP.zoomToExtent(this.layer.getDataExtent());
>> >             }
>> >
>> > +            this.mapData = {
>> > +                nameColumn: 'name'
>> > +            };
>> > +
>> >             if (this.mapView) {
>> >                 if (this.mapView.longitude && this.mapView.latitude &&
>> > this.mapView.zoom) {
>> >                     MAP.setCenter(new
>> > OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude),
>> > this.mapView.zoom);
>> >
>> > === modified file
>> > 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
>> > ---
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>> >       2010-10-12 13:25:01 +
>> > +++
>> > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
>> >       2010-10-12 15:24:42 +
>> > @@ -1411,6 +1411,10 @@
>> >                 MAP.zoomToExtent(this.layer.getDataExtent());
>> >             }
>> >
>> > +            this.mapData = {
>> > +                nameColumn: 'name'
>> > +            };
>> > +
>> >             if (this.mapView) {
>> >                 if (this.mapView.longitude && this.mapView.latitude &&
>> > this.mapView.zoom) {
>> >                     MAP.setCenter(new
>> > OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude),
>> > this.mapView.zoom);
>> >
>> >
>> > ___
>> > 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
>> >
>> >
>>
>>
>>
>> --
>> Cheers,
>> Knut Staring
>>
>> 

Re: [Dhis2-devs] [Bug 585751] Re: PDF export of indicators should contain more details

[Hieu Duy Dang]

Thank you. Will have a look at it.

On Tue, Oct 12, 2010 at 5:54 PM, Hynek Kruzik  wrote:

> Just few more details should be corrected:
>
> 1. Information about indicator annualization is missing in the report as
> well as date of last update.
> 2. New labels in the report (numerator_formula and denominator_formula)
> should be generated with Capital first letter and without undercores.
>
> --
> PDF export of indicators should contain more details
> https://bugs.launchpad.net/bugs/585751
> You received this bug notification because you are a bug assignee.
>
> Status in DHIS 2 - District Health Information Software: Fix Committed
>
> Bug description:
> PDF export of indicators should contain more details, especially definition
> of numerator and denominator. At this moment report includes only comments
> attached to them instead the report should contain all formulas.
>
>
>


-- 
God Helse !

-- 
PDF export of indicators should contain more details
https://bugs.launchpad.net/bugs/585751
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
PDF export of indicators should contain more details, especially definition of 
numerator and denominator. At this moment report includes only comments 
attached to them instead the report should contain all formulas.



___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2357: fixed save data entry form in data set module

[noreply]

revno: 2357
committer: Tri Tran Thanh 
branch nick: trunk
timestamp: Wed 2010-10-13 11:45:23 +0700
message:
  fixed save data entry form in data set module
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml


--
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-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java	2010-10-12 07:36:49 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java	2010-10-13 04:45:23 +
@@ -137,8 +137,7 @@
 public List getOperands()
 {
 return operands;
-}   
-
+}
 
 // -
 // Execute
@@ -150,12 +149,16 @@
 
 dataSet = dataSetService.getDataSet( dataSetId );
 
-dataEntryForm = dataSet.getDataEntryForm();
+dataEntryForm = dataSet.getDataEntryForm();
 
 if ( dataEntryForm != null )
 {
 editorManager.setValue( prepareDataEntryFormCode( dataEntryForm.getHtmlCode() ) );
 }
+else
+{
+editorManager.setValue( "" );
+}
 
 autoSave = (Boolean) userSettingService.getUserSetting( UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM, false );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-10-12 07:36:49 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-10-13 04:45:23 +
@@ -111,7 +111,7 @@
   
   
 
-			$editorManager.create( "fckeditor", "100%", "400" )
+			$editorManager.create( "designTextarea", "100%", "400" )
 		
   
   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2010-08-31 14:34:31 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2010-10-13 04:45:23 +
@@ -35,6 +35,7 @@
 
 import org.hisp.dhis.dataentryform.DataEntryForm;
 import org.hisp.dhis.dataentryform.DataEntryFormService;
+import org.hisp.dhis.editor.EditorManager;
 import org.hisp.dhis.patient.screen.DataEntryManager;
 import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageService;
@@ -44,6 +45,7 @@
 /**
  * @author Bharath Kumar
  * @modify Viet Nguyen 3-11-2009
+ * @modify Tran Thanh Tri 13 Oct 2010
  * @version $Id$
  */
 public class ViewDataEntryFormAction
@@ -52,7 +54,7 @@
 // -
 // Dependencies
 // -
-
+
 private DataEntryFormService dataEntryFormService;
 
 public void setDataEntryFormService( DataEntryFormService dataEntryFormService )
@@ -61,24 +63,39 @@
 }
 
 private ProgramStageService programStageService;
-
-public void setProgramStageService(ProgramStageService programStageService) {
-		this.programStageService = programStageService;
+
+public void setProgramStageService( ProgramStageService programStageService )
+{
+this.programStageService = programStageService;
 }

[Dhis2-devs] [Bug 659672] [NEW] GIS - can't load features/columns of a json file

[Kim Anh Vo]

Public bug reported:

Version:
2.0.6-SNAPSHOT
Build revision:
2356 
Build date:
2010-10-13 09:37

Description: When trying to fill the form of "Register maps", the list of (name 
of columns) columns of the js files are not listed... Error messages "syntax 
error"? How to specify the right syntax?
Is this the same as geoserver? (the downloaded shapefile with its 
features/columns are viewed in OpenLayers/Geoserver)
Mesages/Error: http://pastebin.com/LtxYvzRp (3 errors with FeatureCollection 
and 1 error with Syntax)

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
GIS - can't load features/columns of a json file
https://bugs.launchpad.net/bugs/659672
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Version:
2.0.6-SNAPSHOT
Build revision:
2356 
Build date:
2010-10-13 09:37

Description: When trying to fill the form of "Register maps", the list of (name 
of columns) columns of the js files are not listed... Error messages "syntax 
error"? How to specify the right syntax?
Is this the same as geoserver? (the downloaded shapefile with its 
features/columns are viewed in OpenLayers/Geoserver)
Mesages/Error: http://pastebin.com/LtxYvzRp (3 errors with FeatureCollection 
and 1 error with Syntax)



___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2358: Fixed bug <659094> Indicator management info panel does'nt show annualizaition attribute properly

[noreply]

revno: 2358
committer: Hieu 
branch nick: trunk
timestamp: Wed 2010-10-13 12:20:57 +0700
message:
  Fixed bug <659094> Indicator management info panel does'nt show 
annualizaition attribute properly
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.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/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-11-03 13:11:45 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm	2010-10-13 05:20:57 +
@@ -6,7 +6,7 @@
 	$!encoder.xmlEncode( $indicator.alternativeName )
 	$!encoder.xmlEncode( $indicator.code )
 	$!encoder.xmlEncode( $indicator.description )
-	$!encoder.xmlEncode( $indicator.annualized )
+	$indicator.annualized
 	$encoder.xmlEncode( $indicatorTypeName )
 	$encoder.xmlEncode( $indicator.numeratorDescription )
 	$encoder.xmlEncode( $indicator.denominatorDescription )

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 2359: Minor fix bug in data set

[noreply]

revno: 2359
committer: Tri Tran Thanh 
branch nick: trunk
timestamp: Wed 2010-10-13 12:33:11 +0700
message:
  Minor fix bug in data set
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml


--
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-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-10-13 04:45:23 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-10-13 05:33:11 +
@@ -198,7 +198,7 @@
 
 function insertDataElement()
 {
-	var oEditor = FCKeditorAPI.GetInstance('fckeditor') ;
+	var oEditor = FCKeditorAPI.GetInstance('designTextarea') ;
 	var viewByValue = getFieldValue( 'viewBySelector' );
 	
 	var json = JSON.parse( jQuery("#json_" + selected ).val() );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2010-10-13 04:45:23 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2010-10-13 05:33:11 +
@@ -33,11 +33,15 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.dataentryform.DataEntryForm;
 import org.hisp.dhis.dataentryform.DataEntryFormService;
 import org.hisp.dhis.editor.EditorManager;
 import org.hisp.dhis.patient.screen.DataEntryManager;
 import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageDataElementService;
 import org.hisp.dhis.program.ProgramStageService;
 
 import com.opensymphony.xwork2.Action;
@@ -88,6 +92,20 @@
 this.editorManager = editorManager;
 }
 
+private ProgramStageDataElementService programStageDataElementService;
+
+public void setProgramStageDataElementService( ProgramStageDataElementService programStageDataElementService )
+{
+this.programStageDataElementService = programStageDataElementService;
+}
+
+private DataElementCategoryService dataElementCategoryService;
+
+public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
+{
+this.dataElementCategoryService = dataElementCategoryService;
+}
+
 // -
 // Getters & Setters
 // -
@@ -127,6 +145,13 @@
 return listDataEntryForm;
 }
 
+public List operands;
+
+public List getOperands()
+{
+return operands;
+}
+
 // -
 // Execute
 // -
@@ -146,7 +171,7 @@
 }
 
 Set listProgramStage = programStage.getProgram().getProgramStages();
-System.out.println( "listProgramStages: " + listProgramStage );
+
 List listAssociationIds = new ArrayList();
 
 Iterator itr = listProgramStage.iterator();
@@ -160,18 +185,21 @@
 if ( dataEntryForm == null )
 {
 status = "ADD";
+editorManager.setValue( "" );
 }
 else
 {
 status = "EDIT";
 listDataEntryForm.remove( dataEntryForm );
 
-String htmlCode = dataEntryManager.prepareDataEntryFormCode( dataEntryForm.getHtmlCode() );
-
-dataEntryForm.setHtmlCode( htmlCode );
-editorManager.setValue( htmlCode );
+editorManager.setValue( dataEntryManager.prepareDataEntryFormCode( dataEntryForm.getHtmlCode() ) );
 }
 
+List dataElements = new ArrayList( programStageDataElementService
+.getListDataElement( association ) );
+
+operand

[Dhis2-devs] [Bug 659094] Re: Indicator management info panel does'nt show annualizaition attribute properly

[Hieu Duy Dang]

Sorry Hynek, about additional numerator and denominator formula then i
think they should not be showed. Because their formula will be displayed
in the text formula. This performance will make indicator details to be
quite messy (unclear)

** Changed in: dhis2
   Status: New => Fix Committed

** Changed in: dhis2
 Assignee: (unassigned) => Hieu Duy Dang (hieu-hispvietnam)

-- 
Indicator management info panel does'nt show annualizaition attribute properly
https://bugs.launchpad.net/bugs/659094
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Information panel in indicator management screen (populated after pressing the 
Show info button) shows annualization attribute status as "No" even if it is 
set to "Yes".



___
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

Re: [Dhis2-devs] [Bug 585751] Re: PDF export of indicators should contain more details

[Hynek Kruzik]

Maybe one more suggestion: After pressing PDF report button a dialog
might appear to allow user to choose between reporting all indicators,
or indicators in filtered range (if filter is applied). What do you
think?

Best 
Hynek

-Original Message-
From: boun...@canonical.com [mailto:boun...@canonical.com] On Behalf Of Hieu 
Duy Dang
Sent: Wednesday, October 13, 2010 9:13 AM
To: kru...@gnomon.cz
Subject: Re: [Bug 585751] Re: PDF export of indicators should contain more 
details

Thank you. Will have a look at it.

On Tue, Oct 12, 2010 at 5:54 PM, Hynek Kruzik  wrote:

> Just few more details should be corrected:
>
> 1. Information about indicator annualization is missing in the report as
> well as date of last update.
> 2. New labels in the report (numerator_formula and denominator_formula)
> should be generated with Capital first letter and without undercores.
>
> --
> PDF export of indicators should contain more details
> https://bugs.launchpad.net/bugs/585751
> You received this bug notification because you are a bug assignee.
>
> Status in DHIS 2 - District Health Information Software: Fix Committed
>
> Bug description:
> PDF export of indicators should contain more details, especially definition
> of numerator and denominator. At this moment report includes only comments
> attached to them instead the report should contain all formulas.
>
>
>


-- 
God Helse !

-- 
PDF export of indicators should contain more details
https://bugs.launchpad.net/bugs/585751
You received this bug notification because you are a direct subscriber
of the bug.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
PDF export of indicators should contain more details, especially definition of 
numerator and denominator. At this moment report includes only comments 
attached to them instead the report should contain all formulas.

To unsubscribe from this bug, go to:
https://bugs.launchpad.net/dhis2/+bug/585751/+subscribe
 

__ Informace od ESET NOD32 Antivirus, verze databaze 5525
(20101012) __

Tuto zpravu proveril ESET NOD32 Antivirus.

http://www.eset.cz

-- 
PDF export of indicators should contain more details
https://bugs.launchpad.net/bugs/585751
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
PDF export of indicators should contain more details, especially definition of 
numerator and denominator. At this moment report includes only comments 
attached to them instead the report should contain all formulas.



___
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

Re: [Dhis2-devs] [Bug 659094] Re: Indicator management info panel does'nt show annualizaition attribute properly

[Hynek Kruzik]

The problem is, that numerator and denominator description don't include
formula in all cases - they are user's who decide what to put there. But
I was also not sure about adding formulas into the information preview
box as it might be not transparent (messy).

Hynek

-Original Message-
From: boun...@canonical.com [mailto:boun...@canonical.com] On Behalf Of Hieu 
Duy Dang
Sent: Wednesday, October 13, 2010 11:44 AM
To: kru...@gnomon.cz
Subject: [Bug 659094] Re: Indicator management info panel does'nt show 
annualizaition attribute properly

Sorry Hynek, about additional numerator and denominator formula then i
think they should not be showed. Because their formula will be displayed
in the text formula. This performance will make indicator details to be
quite messy (unclear)

** Changed in: dhis2
   Status: New => Fix Committed

** Changed in: dhis2
 Assignee: (unassigned) => Hieu Duy Dang (hieu-hispvietnam)

-- 
Indicator management info panel does'nt show annualizaition attribute properly
https://bugs.launchpad.net/bugs/659094
You received this bug notification because you are a direct subscriber
of the bug.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Information panel in indicator management screen (populated after pressing the 
Show info button) shows annualization attribute status as "No" even if it is 
set to "Yes".

To unsubscribe from this bug, go to:
https://bugs.launchpad.net/dhis2/+bug/659094/+subscribe
 

__ Informace od ESET NOD32 Antivirus, verze databaze 5525
(20101012) __

Tuto zpravu proveril ESET NOD32 Antivirus.

http://www.eset.cz

-- 
Indicator management info panel does'nt show annualizaition attribute properly
https://bugs.launchpad.net/bugs/659094
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Information panel in indicator management screen (populated after pressing the 
Show info button) shows annualization attribute status as "No" even if it is 
set to "Yes".



___
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