dhis2-devs team mailing list archive

Thread
Date
Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 169: Disable input text when data set has been registed completion, and only user have role undo_compl...

To: Lars Helge Øverland <larshelge@xxxxxxxxx>
From: Saptarshi Purkayastha <sunbiz@xxxxxxxxx>
Date: Tue, 14 Apr 2009 14:44:21 +0530
Cc: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
In-reply-to: <4c28a4a80904140203p15783b13i861ac3cfc36a5b10@mail.gmail.com>
I think for changes to the core that affects all implementations, a ticket
has to be created and the patch attached. The patch will be discussed by the
core developers and if there is no comment (for a week) or issue with other
core developers, then the patch should be applied to trunk.

This would mean that we have a community accepted change to the core. It
will only help the process of software quality.

---
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


2009/4/14 Lars Helge Øverland <larshelge@xxxxxxxxx>

>
>
> On Tue, Apr 14, 2009 at 10:21 AM, <noreply@xxxxxxxxxxxxx> wrote:
>
>> ------------------------------------------------------------
>> revno: 169
>> committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
>> branch nick: trunk
>> timestamp: Tue 2009-04-14 15:16:50 +0700
>> message:
>>  Disable input text when data set has been registed completion, and only
>> user have role undo_completed_data set can Undo it - Use for customize data
>> entry form
>> modified:
>
>
>
> Tri,
>
> a few comments:
>
> - Please discuss things like this BEFORE committing. This affects all DHIS
> 2 installations that maybe don't want this behaviour. No offense but we have
> talked about this a hundred times...
> - It is a little weird that this only affects the customized data entry.
> Why shouldn't this logic apply for the other input variants?
> - This functionality is kind of a duplicate. We already have data locking
> for a data set, meaning the person that entered the data could simply lock
> it to prevent modification.
>
>
> Lars
>
>
>
>
>>
>>
>>  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/resources/xwork.xml
>>
>>  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/completeRegistration.vm
>>
>>  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/javascript/form.js
>>
>>  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
>>
>>  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
>>
>> === 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
>>       2009-03-10 10:19:13 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
>>       2009-04-14 08:16:50 +0000
>> @@ -96,3 +96,4 @@
>>  greater_than_or_equal_to                       = >=
>>  less_than                                                      = <
>>  less_than_or_equal_to                          = <=
>> +access_denied                                          = Access Denied
>>
>> === 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
>> 2009-03-03 16:46:36 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties
>> 2009-04-14 08:16:50 +0000
>> @@ -1,84 +1,95 @@
>>  #Resource generated by I18n Resource Editor
>>  #Fri Jul 13 23:34:28 GMT+07:00 2007
>> -validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
>> -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
>> -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
>> -successful_validation=Gi\u00E1 tr\u1ECB h\u1EE3p l\u1EC7
>> -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
>> -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
>> -validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p
>> l\u1EC7
>> -down=Xu\u1ED1ng
>> -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
>> -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
>> -code=M\u00E3 ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
>> -value=Gi\u00E1 tr\u1ECB
>> -specify_maximum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1
>> tr\u1ECB l\u1EDBn nh\u1EA5t
>> -operator=To\u00E1n t\u1EED
>> -no_dataelement_selected=Kh\u00F4ng th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u
>> n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
>> -min_max_values=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
>> -data_element=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
>> -data_element_order=Th\u1EE9 t\u1EF1 th\u00E0nh ph\u1EA7n d\u1EEF
>> li\u1EC7u
>> -up=L\u00EAn
>> -minimum_value_must_integer=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i
>> l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
>> -yes_no=Kh\u00F4ng/c\u00F3
>> -close=\u0110\u00F3ng
>> -save_calculated=L\u01B0u c\u00E1c gi\u00E1 tr\u1ECB \u0111\u00E3
>> \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
>> -generate_values=Ph\u00E1t sinh gi\u00E1 tr\u1ECB
>> -type=Ki\u1EC3u d\u1EEF li\u1EC7u
>> -no_organisationunit_selected=Kh\u00F4ng \u0111\u01A1n v\u1ECB n\u00E0o
>> \u0111\u01B0\u1EE3c ch\u1ECDn
>> -nr=S\u1ED1
>> -no=Kh\u00F4ng
>> -edit_min_max_for=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
>> / l\u1EDBn nh\u1EA5t cho
>> -min_limit=Gi\u1EDBi h\u1EA1n th\u1EA5p nh\u1EA5t
>> -custom_comment=Ch\u00FA th\u00EDch ng\u1EABu nhi\u00EAn
>> -period=Th\u1EDDi \u0111i\u1EC3m
>> -calculated_data_elements=C\u00E1c th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u
>> \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
>> -order_by_code=Th\u1EE9 t\u1EF1 theo m\u00E3
>> -name=T\u00EAn
>> -generate_missing_values=Ph\u00E1t sinh nh\u1EEFng gi\u00E1 tr\u1ECB
>> ch\u01B0a c\u00F3
>> -timestamp=Th\u1EDDi \u0111i\u1EC3m
>> -change=Thay \u0111\u1ED5i
>> -move=Chuy\u1EC3n
>> -right_description=M\u00F4 t\u1EA3 v\u1EBF ph\u1EA3i
>> -move_up=Di chuy\u1EC3n l\u00EAn tr\u00EAn
>> -reset_order_inherit=Thi\u1EBFt l\u1EADp th\u1EE9 t\u1EF1/th\u1EEBa
>> k\u1EBF t\u1EEB cha
>> -generate_missing_value=Ph\u00E1t sinh gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
>> -no_value=Kh\u00F4ng c\u00F3 gi\u00E1 tr\u1ECB
>> -expression=Bi\u1EC3u th\u1EE9c
>> -not_set=Ch\u01B0a thi\u1EBFt l\u1EADp
>> -average=Trung b\u00ECnh
>> -validation_rule=Quy lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
>> -text=Chu\u1ED7i
>> -edit_min_max=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t /
>> l\u1EDBn nh\u1EA5t
>> -maximum_value_must_integer=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t ph\u1EA3i
>> l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
>> -no_comment=Kh\u00F4ng c\u00F3 ch\u00FA th\u00EDch
>> -maximum=L\u1EDBn nh\u1EA5t
>> -value_must_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1
>> nguy\u00EAn
>> -order_by_name=Th\u1EE9 t\u1EF1 theo t\u00EAn
>> -select=Ch\u1ECDn
>> -number=S\u1ED1
>> -move_down=Di chuy\u1EC3n xu\u1ED1ng d\u01B0\u1EDBi
>> -minimum=Nh\u1ECF nh\u1EA5t
>> -min=Nh\u1ECF nh\u1EA5t
>> -cancel=H\u1EE7y b\u1ECF
>> -no_period_selected=Kh\u00F4ng th\u1EDDi \u0111i\u1EC3m n\u00E0o
>> \u0111\u01B0\u1EE3c ch\u1ECDn
>> -use_section_form=Ki&#7875;u d&#249;ng section
>> -use_standard_form=Ki&#7875;u th&#244;ng th&#432;&#7901;ng
>> +validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
>> +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
>> +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
>> +successful_validation=Gi\u00e1 tr\u1ecb h\u1ee3p l\u1ec7
>> +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
>> +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
>> +validation_result=K\u1ebft qu\u1ea3 ki\u1ec3m tra t\u00ednh h\u1ee3p
>> l\u1ec7
>> +down=Xu\u1ed1ng
>> +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
>> +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
>> +code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
>> +value=Gi\u00e1 tr\u1ecb
>> +specify_maximum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1
>> tr\u1ecb l\u1edbn nh\u1ea5t
>> +operator=To\u00e1n t\u1eed
>> +no_dataelement_selected=Kh\u00f4ng th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u
>> n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
>> +min_max_values=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
>> +data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
>> +data_element_order=Th\u1ee9 t\u1ef1 th\u00e0nh ph\u1ea7n d\u1eef
>> li\u1ec7u
>> +up=L\u00ean
>> +minimum_value_must_integer=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i
>> l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
>> +yes_no=Kh\u00f4ng/c\u00f3
>> +close=\u0110\u00f3ng
>> +save_calculated=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb \u0111\u00e3
>> \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
>> +generate_values=Ph\u00e1t sinh gi\u00e1 tr\u1ecb
>> +type=Ki\u1ec3u d\u1eef li\u1ec7u
>> +no_organisationunit_selected=Kh\u00f4ng \u0111\u01a1n v\u1ecb n\u00e0o
>> \u0111\u01b0\u1ee3c ch\u1ecdn
>> +nr=S\u1ed1
>> +no=Kh\u00f4ng
>> +edit_min_max_for=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t
>> / l\u1edbn nh\u1ea5t cho
>> +min_limit=Gi\u1edbi h\u1ea1n th\u1ea5p nh\u1ea5t
>> +custom_comment=Ch\u00fa th\u00edch ng\u1eabu nhi\u00ean
>> +period=Th\u1eddi \u0111i\u1ec3m
>> +calculated_data_elements=C\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u
>> \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
>> +order_by_code=Th\u1ee9 t\u1ef1 theo m\u00e3
>> +name=T\u00ean
>> +generate_missing_values=Ph\u00e1t sinh nh\u1eefng gi\u00e1 tr\u1ecb
>> ch\u01b0a c\u00f3
>> +timestamp=Th\u1eddi \u0111i\u1ec3m
>> +change=Thay \u0111\u1ed5i
>> +move=Chuy\u1ec3n
>> +right_description=M\u00f4 t\u1ea3 v\u1ebf ph\u1ea3i
>> +move_up=Di chuy\u1ec3n l\u00ean tr\u00ean
>> +reset_order_inherit=Thi\u1ebft l\u1eadp th\u1ee9 t\u1ef1/th\u1eeba
>> k\u1ebf t\u1eeb cha
>> +generate_missing_value=Ph\u00e1t sinh gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
>> +no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
>> +expression=Bi\u1ec3u th\u1ee9c
>> +not_set=Ch\u01b0a thi\u1ebft l\u1eadp
>> +average=Trung b\u00ecnh
>> +validation_rule=Quy lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
>> +text=Chu\u1ed7i
>> +edit_min_max=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t /
>> l\u1edbn nh\u1ea5t
>> +maximum_value_must_integer=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t ph\u1ea3i
>> l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
>> +no_comment=Kh\u00f4ng c\u00f3 ch\u00fa th\u00edch
>> +maximum=L\u1edbn nh\u1ea5t
>> +value_must_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1
>> nguy\u00ean
>> +order_by_name=Th\u1ee9 t\u1ef1 theo t\u00ean
>> +select=Ch\u1ecdn
>> +number=S\u1ed1
>> +move_down=Di chuy\u1ec3n xu\u1ed1ng d\u01b0\u1edbi
>> +minimum=Nh\u1ecf nh\u1ea5t
>> +min=Nh\u1ecf nh\u1ea5t
>> +cancel=H\u1ee7y b\u1ecf
>> +no_period_selected=Kh\u00f4ng th\u1eddi \u0111i\u1ec3m n\u00e0o
>> \u0111\u01b0\u1ee3c ch\u1ecdn
>> +use_section_form=Nh\u1eadp theo t\u1eebng ch\u01b0\u01a1ng
>> +use_standard_form=Nh\u1eadp theo b\u1ea3n chu\u1ea9n
>> +equal_to                                                       = ==
>> +not_equal_to                                           = !=
>> +greater_than                                           = >
>> +greater_than_or_equal_to                       = >=
>> +less_than                                                      = <
>> +less_than_or_equal_to                          = <=
>> +run_validation = 1. KI\u1ec2M TRA D\u1eee LI\u1ec6U
>> +complete               = 2. N\u1ed8P B\u00c1O C\u00c1O
>> +undo                   = S\u1eecA L\u1ea0I B\u00c1O C\u00c1O
>> +access_denied  = B\u1ea1n kh\u00f4ng quy\u1ec1n th\u1ef1c hi\u1ec7n
>> ch\u1ee9c n\u0103ng n\u00e0y.
>> +
>>
>> === modified file
>> 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml'
>> --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
>> 2009-03-31 09:55:04 +0000
>> +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
>> 2009-04-14 08:16:50 +0000
>> @@ -198,19 +198,19 @@
>>     </action>
>>
>>     <action name="undoCompleteDataSet"
>> class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
>> -      <result name="success"
>> type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
>> +      <result name="success"
>> type="velocity">/dhis-web-dataentry/responseSuccess.vm</result>
>> +      <param name="requiredAuthorities">F_UNDO_COMPLETED_DATASET</param>
>>     </action>
>>
>>     <action name="validate"
>> class="org.hisp.dhis.de.action.ValidationAction">
>> +      <interceptor-ref name="transactionStack"/>
>>       <result name="success" type="velocity">/popup.vm</result>
>> -      <result name="none" type="velocity">/popup.vm</result>
>>       <param name="page">/dhis-web-dataentry/validationResult.vm</param>
>> -      <interceptor-ref name="transactionStack"/>
>>     </action>
>>
>>     <action name="getValidationViolations"
>> class="org.hisp.dhis.de.action.ValidationAction">
>> +      <result name="none"
>> type="velocity-xml">/dhis-web-dataentry/responseNone.vm</result>
>>       <result name="success"
>> type="velocity-xml">/dhis-web-dataentry/responseSuccess.vm</result>
>> -      <result name="none"
>> type="velocity-xml">/dhis-web-dataentry/responseNone.vm</result>
>>     </action>
>>
>>   </package>
>>
>> === modified file
>> 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/completeRegistration.vm'
>> ---
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/completeRegistration.vm
>>       2009-03-03 16:46:36 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/completeRegistration.vm
>>       2009-04-14 08:16:50 +0000
>> @@ -26,4 +26,8 @@
>>  <script type="text/javascript">
>>     var i18n_confirm_complete = '$encoder.jsEscape( $i18n.getString(
>> "confirm_complete" ) , "'")';
>>     var i18n_confirm_undo = '$encoder.jsEscape( $i18n.getString(
>> "confirm_undo" ) , "'")';
>> +       var i18n_access_denied = '$encoder.jsEscape( $i18n.getString(
>> "access_denied" ) , "'")';
>> +       #if($registration)
>> +               disableEntry();
>> +       #end
>>  </script>
>>
>> === 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
>>       2009-03-12 11:40:58 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
>>       2009-04-14 08:16:50 +0000
>> @@ -16,8 +16,9 @@
>>                        </td>
>>
>>                #end
>> -
>> +       <div id="entryForm">
>>        $customDataEntryFormCode
>> +       </div>
>>
>>  #else
>>
>>
>> === modified file
>> 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
>> ---
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
>>    2009-03-12 11:40:58 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
>>    2009-04-14 08:16:50 +0000
>> @@ -262,6 +262,21 @@
>>  // Data completeness
>>  //
>> -----------------------------------------------------------------------------
>>
>> +function disableEntry()
>> +{
>> +       var list = byId('entryForm').getElementsByTagName('input');
>> +       for(var i=0;i<list.length;i++){
>> +               list.item(i).disabled = true;
>> +       }
>> +}
>> +
>> +function enableEntry(){
>> +       var list = byId('entryForm').getElementsByTagName('input');
>> +       for(var i=0;i<list.length;i++){
>> +               list.item(i).disabled = false;
>> +       }
>> +}
>> +
>>  function validateCompleteDataSet()
>>  {
>>        var confirmed = confirm( i18n_confirm_complete );
>> @@ -303,6 +318,7 @@
>>        document.getElementById( "undoButton" ).disabled = false;
>>     document.getElementById( "dateField" ).disabled = true;
>>     document.getElementById( "dateDiv" ).style.display = "none";
>> +       disableEntry();
>>  }
>>
>>  function undoCompleteDataSet()
>> @@ -321,8 +337,16 @@
>>
>>  function undoReceived( messageElement )
>>  {
>> -    document.getElementById( "completeButton" ).disabled = false;
>> -    document.getElementById( "undoButton" ).disabled = true;
>> -    document.getElementById( "dateField" ).disabled = false;
>> -    document.getElementById( "dateDiv" ).style.display = "inline";
>> +       try{
>> +               messageElement.getAttribute('type');
>> +               document.getElementById( "completeButton" ).disabled =
>> false;
>> +               document.getElementById( "undoButton" ).disabled = true;
>> +               document.getElementById( "dateField" ).disabled = false;
>> +               document.getElementById( "dateDiv" ).style.display =
>> "inline";
>> +               enableEntry();
>> +       }catch(e){
>> +               alert(i18n_access_denied);
>> +       }
>> +
>> +
>>  }
>>
>> === modified file
>> 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
>> ---
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
>> 2009-03-24 14:27:01 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
>> 2009-04-14 08:16:50 +0000
>> @@ -19,6 +19,7 @@
>>  M_dhis-web-dataentry-national = See Linelisting DataEntry module
>>  M_dhis-web-reports = See NRHM Reports module
>>  M_dhis-web-validationrule-local-in = See Validation Analysis module
>> +M-dhis-web-vn-report   = Excel Report
>>
>>  #-- User action privilegies
>> ---------------------------------------------------#
>>
>> @@ -87,6 +88,7 @@
>>  F_DOCUMENT_ADD = Add Document
>>  F_DOCUMENT_DELETE = Delete Document
>>  F_DASHBOARD_DOWNLOAD_BACKUP = Create and download backup
>> +F_UNDO_COMPLETED_DATASET = Undo Completed Data Set
>>
>>  #-- User module
>> ---------------------------------------------------------------#
>>
>>
>> === modified file
>> 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
>> ---
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
>>   2009-03-03 16:46:36 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
>>   2009-04-14 08:16:50 +0000
>> @@ -116,4 +116,7 @@
>>  F_REPORTTABLE_DELETE = X\u00f3a report table
>>  F_REPORT_VIEW  = Xem/In b\u00e1o c\u00e1o
>>  M_dhis-web-reporting = Xem module b\u00e1o c\u00e1o
>> -M_dhis-web-openhealth-integration = Xem module open health
>> \ No newline at end of file
>> +M_dhis-web-openhealth-integration = Xem module open health
>> +M-dhis-web-vn-report   =  B\u00e1o c\u00e1o
>> +F_UNDO_COMPLETED_DATASET = M\u1edf kh\u00f3a t\u1eadp h\u1ee3p d\u1eef
>> li\u1ec7u
>> +
>>
>>
>>
>> --
>> Trunk
>> https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk<https://code.launchpad.net/%7Edhis2-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<https://code.launchpad.net/%7Edhis2-devs-core/dhis2/trunk/+edit-subscription>
>> .
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
>> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
>> More help   : https://help.launchpad.net/ListHelp
>>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
> More help   : https://help.launchpad.net/ListHelp
>
>
Follow ups

Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 169: Disable input text when data set has been registed completion, and only user have role undo_compl...
From: Lars Helge Øverland, 2009-04-14
References

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 169: Disable input text when data set has been registed completion, and only user have role undo_compl...
From: noreply, 2009-04-14
Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 169: Disable input text when data set has been registed completion, and only user have role undo_compl...
From: Lars Helge Øverland, 2009-04-14