[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17493: minor fix, make gzip the default for event export
revno: 17493 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 15:05:22 +0700 message: minor fix, make gzip the default for event export modified: dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.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-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2014-11-17 07:54:34 + +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2014-11-17 08:05:22 + @@ -167,8 +167,8 @@ td$i18n.getString( compression )/td td select id=compression style=width: 300px; +option value=.gz$i18n.getString( compression_gzip )/option option value=$i18n.getString( uncompressed )/option -option value=.gz$i18n.getString( compression_gzip )/option /select /td /tr ___ 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 17494: Category option, removed shortname override
revno: 17494
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 10:02:15 +0100
message:
Category option, removed shortname override
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.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-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2014-11-10 11:43:54 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2014-11-17 09:02:15 +
@@ -175,13 +175,6 @@
return name != null name.equals( DEFAULT_NAME );
}
-@Override
-@JsonIgnore
-public String getShortName()
-{
-return name;
-}
-
@JsonProperty
@JsonView( {DetailedView.class } )
public Date getStartDate()
___
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 17495: change to a-z ordering of already set UGAs
revno: 17495
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 16:27:53 +0700
message:
change to a-z ordering of already set UGAs
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.sharing.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.sharing.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.sharing.js 2014-10-06 13:02:52 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.sharing.js 2014-11-17 09:27:53 +
@@ -85,6 +85,8 @@
clearUserGroupAccesses();
if( userGroupAccesses ) {
+userGroupAccesses.reverse();
+
$.each(userGroupAccesses, function( idx, item ) {
var tmpl_html = renderUserGroupAccessTemplate({
label: item.name,
___
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 17496: (Translations) Minor adjustment to translation script to avoid problems with duplicate keys in te...
revno: 17496
committer: Jason Pickering jason.p.picker...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 05:53:35 -0500
message:
(Translations) Minor adjustment to translation script to avoid problems with
duplicate keys in template files.
modified:
resources/util/clean_translations.R
--
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 'resources/util/clean_translations.R'
--- resources/util/clean_translations.R 2014-08-22 08:43:25 +
+++ resources/util/clean_translations.R 2014-11-17 10:53:35 +
@@ -62,6 +62,8 @@
template$template_order-row.names(template)
#Remove the periods formats. They will never be translated
template-template[!grepl(^format\\.,template$key),]
+#Remove any duplicate keys as this causes big problems
+template-template[!duplicated(template$key),]
#Loop through each file, cleaning out needless translations
for (j in 1:length(this.files)) {
___
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 17497: (Translation) Minor update to Arabic translations.
revno: 17497 committer: Jason Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 06:10:56 -0500 message: (Translation) Minor update to Arabic translations. modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_ar.properties dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_ar.properties -- 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-services/dhis-service-core/src/main/resources/i18n_global_ar.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties 2014-07-23 09:39:34 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties 2014-11-17 11:10:56 + @@ -1,3 +1,1 @@ -user_account=User account -please_letters_numbers_spaces_or_some_special_chars_only=Only letters, numbers, spaces and the characters -expression_not_well_formed=Expression is not well formed +please_letters_numbers_spaces_or_some_special_chars_only=Only letters, numbers, spaces and the characters === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ar.properties' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ar.properties 2014-07-23 09:39:34 + +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ar.properties 2014-11-17 11:10:56 + @@ -1,31 +1,36 @@ dashboard=\u0644\u0648\u062d\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629 map_view=\u062e\u0631\u0627\u0626\u0637 +confirm_delete=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0647\u0630\u0647\u061f +edit_user_group=\u062a\u0639\u062f\u064a\u0644 \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 +user_group_details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 +available_users=\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u0648\u0646 \u0627\u0644\u0645\u062a\u0648\u0641\u0631\u0648\u0646 +group_members=\u0623\u0639\u0636\u0627\u0621 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 add_user_group=\u0625\u0636\u0627\u0641\u0629 \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 no_of_Users=\u0639\u062f\u062f \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 user_group=\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 groups=\u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0627\u062a search=\u0628\u062d\u062b +map=\u062e\u0631\u0627\u0626\u0637 rename_current_dashboard=\u0625\u0639\u0627\u062f\u0629 \u062a\u0633\u0645\u064a\u0629 \u0644\u0648\u062d\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629 \u0627\u0644\u062d\u0627\u0644\u064a\u0629 delete_current_dashboard=\u062d\u0630\u0641 \u0644\u0648\u062d\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629 \u0627\u0644\u062d\u0627\u0644\u064a\u0629 add_new=\u0625\u0636\u0627\u0641\u0629 \u062c\u062f\u064a\u062f manage=\u0625\u062f\u0627\u0631\u0629 sharing=\u0645\u0634\u0627\u0631\u0643\u0629 -map=\u062e\u0631\u0627\u0626\u0637 click_add_new_to_get_started=\u0627\u0646\u0642\u0631 \u0641\u0648\u0642 \u0625\u0636\u0627\u0641\u0629 \u062c\u062f\u064a\u062f \u0644\u0644\u0628\u062f\u0621 add_stuff_by_searching=\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0627\u0634\u064a\u0627\u0621 \u0645\u0646 \u062e\u0644\u0627\u0644 \u0627\u0644\u0628\u062d\u062b \u0641\u064a \u062d\u0642\u0644 \u0627\u0644\u0628\u062d\u062b \u0623\u0639\u0644\u0627\u0647 arrange_dashboard_by_dragging_and_dropping=\u062a\u0631\u062a\u064a\u0628
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17498: (Translations) Arabic light translations.
revno: 17498 committer: Jason Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 06:25:22 -0500 message: (Translations) Arabic light translations. modified: dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties -- 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-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties' --- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties 2014-11-17 11:10:56 + +++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties 2014-11-17 11:25:22 + @@ -1,5 +1,133 @@ -menu=\u0627\u0644\u0642\u0627\u0626\u0645\u0629 -home=\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629 -navigate_to=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 -reports=\u0627\u0644\u062a\u0642\u0631\u064a\u0631\u0627\u062a -documents=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u064a\u0629 +menu=\u0627\u0644\u0642\u0627\u0626\u0645\u0629\n +home=\u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 +navigate_to=\u0627\u0644\u0627\u0646\u062A\u0642\u0627\u0644 \u0625\u0644\u0649 +reports=\u0627\u0644\u062A\u0642\u0631\u064A\u0631\u0627\u062A +charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064A\u0627\u0646\u064A\u0629 +documents=\u0627\u0644\u0648\u062B\u0627\u0626\u0642 +dashboard=\u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +dashboard_reports=\u062A\u0642\u0631\u064A\u0631\u0627\u062A \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +dashboard_charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064A\u0627\u0646\u064A\u0629 \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +dashboard_documents=\u0648\u062B\u0627\u0626\u0642 \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +data_entry=\u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +namebased_data_entry=\u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0628\u062D\u0633\u0628 \u0627\u0644\u0627\u0633\u0645 +data_entry_overview=\u0644\u0645\u062D\u0629 \u0639\u0627\u0645\u0629 \u0639\u0646 \u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +logout=\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C +desktop_version=\u0625\u0635\u062F\u0627\u0631 \u0633\u0637\u062D \u0627\u0644\u0645\u0643\u062A\u0628 +report_table_parameters=\u0645\u062A\u063A\u064A\u0631\u0627\u062A \u0627\u0644\u062A\u0642\u0631\u064A\u0631 +get_report=\u0627\u062D\u0635\u0644 \u0639\u0644\u0649 \u062A\u0642\u0631\u064A\u0631 +reporting_period=\u0641\u062A\u0631\u0629 \u0627\u0644\u062A\u0642\u0631\u064A\u0631 +select_organisation_unit=\u0627\u0644\u0631\u062C\u0627\u0621 \u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0646\u0638\u0645\u0629 +available_datasets=\u0641\u0626\u0627\u062A \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +available_organisation_units=\u0648\u062D\u062F\u0627\u062A \u0627\u0644\u0645\u0646\u0638\u0645\u0629 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +available_periods=\u0627\u0644\u0641\u062A\u0631\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +settings=\u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A +language=\u0644\u063A\u0629 \u0627\u0644\u0648\u0627\u062C\u0647\u0629 +is_invalid_boolean=\u0644\u064A\u0633 \u062A\u0639\u0628\u064A\u0631\u0627\u064B \u0645\u0646\u0637\u0642\u064A\u0627\u062A \u0635\u062D\u064A\u062D\u0627\u064B +is_invalid_date=\u0644\u064A\u0633 \u062A\u0627\u0631\u064A\u062E\u0627\u064B \u0635\u062D\u064A\u062D\u0627\u064B (\u064A\u0648\u0645 - \u0634\u0647\u0631 - \u0633\u0646\u0629) +is_invalid_number=\u0644\u064A\u0633 \u0639\u062F\u062F\u0627\u064B \u0635\u062D\u064A\u062D\u0627\u064B +is_invalid_integer=\u0644\u064A\u0633 \u0631\u0642\u0645\u0627\u064B \u0635\u062D\u064A\u062D\u0627\u064B +is_invalid_positive_integer=\u0644\u064A\u0633 \u0631\u0642\u0645\u0627\u064B \u0625\u064A\u062C\u0627\u0628\u064A\u0627\u064B \u0635\u062D\u064A\u062D\u0627\u064B +is_invalid_zero_or_positive_integer=\u0644\u064A\u0633 \u0631\u0642\u0645\u0627\u064B \u0635\u0641\u0631\u064A\u0627\u064B \u0623\u0648 \u0625\u064A\u062C\u0627\u0628\u064A\u0627\u064B \u0635\u062D\u064A\u062D\u0627\u064B +is_invalid_negative_integer=\u0644\u064A\u0633 \u0631\u0642\u0645\u0627\u064B \u0633\u0644\u0628\u064A\u0627\u064B
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17499: (Translations) Arabic data entry translations.
revno: 17499 committer: Jason Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 06:29:14 -0500 message: (Translations) Arabic data entry translations. modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ar.properties -- 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_ar.properties' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ar.properties 2014-11-17 11:10:56 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ar.properties 2014-11-17 11:29:14 + @@ -1,113 +1,108 @@ -dataelement_comment=\u062a\u0639\u0644\u064a\u0642 -see_details=\u0627\u0646\u0638\u0631 \u0644\u062a\u0641\u0627\u0635\u064a\u0644 -username=\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 -user_roles=\u0627\u062f\u0648\u0627\u0631 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 -register_complete_failed_dataset_is_locked=\u0641\u0634\u0644 \u0627\u0644\u062a\u0633\u062c\u064a\u0644,\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0642\u0641\u0644\u0629\u060c \u064a\u0631\u062c\u0649 \u0627\u0644\u0627\u062a\u0635\u0627\u0644 \u0628\u0627\u0644\u0627\u062f\u0627\u0631\u0629 -unregister_complete_failed_dataset_is_locked=\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0642\u0641\u0644\u0629\u060c \u062e\u0637\u0621 \u0641\u064a \u0627\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u060c \u064a\u0631\u062c\u0649 \u0627\u0644\u0627\u062a\u0635\u0627\u0644 \u0628\u0627\u0644\u0625\u062f\u0627\u0631\u0629 -dataelement_with_id=\u0639\u0646\u0635\u0631 \u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0639 \u0645\u0639\u0631\u0641 -category_option_combo_with_id=\u0645\u0639\u0631\u0641 \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0641\u0626\u0629 -does_not_exist=\u063a\u064a\u0631 \u0645\u0648\u062c\u0648\u062f -insert_input_fields_into_the_form=\u0627\u0636\u0641 \u062d\u0642\u0648\u0644 \u0627\u0644\u0625\u062f\u062e\u0627\u0644 \u0641\u064a \u0627\u0644\u0623\u0633\u062a\u0645\u0627\u0631\u0629 -select_data_element=\u0627\u062e\u062a\u0627\u0631 \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a -all_values_for_data_element_must_be_filled=\u0641\u064a \u0647\u0630\u0647 \u0627\u0644\u0633\u062a\u0645\u0627\u0631\u0629 \u064a\u062c\u0628 \u0627\u0646 \u062a\u0645\u0644\u0627\u0621 \u062c\u0645\u064a\u0639 \u062d\u0642\u0648\u0644 \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u060c\u064a\u0631\u062c\u0649 \u062a\u0635\u062d\u064a\u062d \u0647\u0630\u0627 \u0642\u0628\u0644 \u0627\u0644\u0645\u062a\u0627\u0628\u0639\u0629. -childrens_forms=\u0648\u062d\u062f\u0627\u062a \u0627\u0644\u0645\u0624\u0633\u0633\u0629 \u0627\u0644\u0641\u0631\u0639\u064a\u0629 -left_side=\u0627\u0644\u062c\u0627\u0646\u0628 \u0627\u0644\u0627\u064a\u0633\u0631 -right_side=\u0627\u0644\u062c\u0627\u0646\u0628 \u0627\u0644\u0623\u064a\u0645\u0646 -no_periods_click_prev_year_button=\u0627\u0644\u0641\u062a\u0631\u0627\u062a \u0644\u0627\u062a\u0648\u062c\u062f \u0627\u0636\u063a\u0637 \u0641\u0648\u0642 \u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0633\u0646\u0629 \u0627\u0644\u0645\u0627\u0636\u064a\u0629 -print=\u0637\u0628\u0627\u0639\u0629 -view_comment=\u0627\u0639\u0631\u0636 \u0627\u0644\u062a\u0639\u0644\u064a\u0642 -no_orgunits=\u0644\u0627 \u062a\u0648\u062c\u062f \u0627\u064a \u0648\u062d\u062f\u0629 \u0645\u0624\u0633\u0633\u0629 \u0645\u0631\u062a\u0628\u0637\u0629 \u0628\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u062d\u0627\u0644\u064a\u060c \u0627\u062f\u062e\u0627\u0644 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u063a\u064a\u0631 \u0645\u0645\u0643\u0646 -validation_rules_are_being_processed_please_wait=\u0644\u0627 \u062a\u0648\u062c\u062f \u0627\u064a \u0648\u062d\u062f\u0629 \u0645\u0624\u0633\u0633\u0629 \u0645\u062a\u0635\u0644 \u0645\u0639 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0645\u0639\u0646\u064a \u060c\u0627\u062f\u062e\u0627\u0644 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u063a\u064a\u0631 \u0645\u0645\u0643\u0646 -section=\u0642\u0633\u0645 -print_form=\u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0623\u0633\u062a\u0645\u0627\u0631\u0629 -print_blank_form=\u0637\u0628\u0627\u0639\u0629 \u0627\u0633\u062a\u0645\u0627\u0631\u0629 \u0641\u0627\u0631\u063a\u0629 -instruction=\u062a\u0639\u0644\u064a\u0645\u0627\u062a -no_value=\u0644\u0627
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17500: (Translations) Arabic data administration.
revno: 17500 committer: Jason Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 06:34:16 -0500 message: (Translations) Arabic data administration. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties -- 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-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties 2014-11-17 11:10:56 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties 2014-11-17 11:34:16 + @@ -1,6 +1,322 @@ -data_element_does_not_exist=Data element does not exist -category_option_combo_does_not_exist=Category option combo does not exist -not_choose_organisation=Please select an organsisation unit -confirm_delete_sqlview=Do you want to delete this sql view object ? -loading=Loading -add_option=Add Option +remove_all=\u0627\u0644\u063A\u0627\u0621 \u062C\u0645\u064A\u0639 \u0627\u0644\u0627\u0642\u0641\u0627\u0644 +done=\u062A\u0645 +loading=\u062C\u0627\u0631\u064A \u0627\u0644\u062A\u062D\u0645\u064A\u0644\u060C \u0628\u0631\u062C\u0627\u0621 \u0627\u0644\u0627\u0646\u062A\u0638\u0627\u0631 +data_administration=\u0625\u062F\u0627\u0631\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +period_type=\u0646\u0648\u0639 \u0627\u0644\u0641\u062A\u0631\u0629 +select_options=\u0628\u0631\u062C\u0627\u0621 \u0625\u062C\u0631\u0627\u0621 \u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u0627\u062D\u062F \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644 +performing_maintenance=\u062C\u0627\u0631\u064A \u0627\u0644\u0635\u064A\u0627\u0646\u0629 +maintenance_performed=\u062A\u0645 \u0627\u0644\u0627\u0646\u062A\u0647\u0627\u0621 \u0645\u0646 \u0627\u0644\u0635\u064A\u0627\u0646\u0629 +generating_resource_tables=\u0625\u0646\u0634\u0627\u0621 \u062C\u062F\u0627\u0648\u0644 \u0644\u0644\u0645\u0648\u0627\u0631\u062F +resource_tables_generated=\u062A\u0645 \u0625\u0646\u0634\u0627\u0621 \u062C\u062F\u0627\u0648\u0644 \u0644\u0644\u0645\u0648\u0627\u0631\u062F +clear_analytics_tables=\u0645\u0633\u062D \u062C\u062F\u0648\u0644 \u0627\u0644\u062A\u062D\u0644\u064A\u0644 +maintenance=\u0627\u0644\u0635\u064A\u0627\u0646\u0629 +resource_table=\u062C\u062F\u0648\u0644 \u0627\u0644\u0645\u0648\u0627\u0631\u062F +clear_dataset_completeness=\u0645\u0633\u062D \u0627\u0643\u062A\u0645\u0627\u0644 \u0641\u0626\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +clear_zero_values=\u0645\u0633\u062D \u0627\u0644\u0642\u064A\u0645 \u0627\u0644\u0635\u0641\u0631\u064A\u0629 +group_set_structure=\u062A\u0637\u0628\u064A\u0639 \u0641\u0626\u0629 \u0647\u064A\u0643\u0644 \u0645\u062C\u0645\u0648\u0639\u0629 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0646\u0638\u0645\u0629 +organisation_unit_structure=\u0647\u064A\u0643\u0644 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0646\u0638\u0645\u0629 +data_element_category_option_combo_name=\u0627\u0633\u0645 \u0642\u0627\u0626\u0645\u0629 \u0641\u0626\u0629 \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +generate_resource_tables=\u0625\u0646\u0634\u0627\u0621 \u0627\u0644\u062C\u062F\u0627\u0648\u0644 +perform_maintenance=\u0625\u062C\u0631\u0627\u0621 \u0627\u0644\u0635\u064A\u0627\u0646\u0629 +prune_periods=\u0641\u062A\u0631\u0627\u062A \u0627\u0644\u062A\u0642\u0644\u064A\u0645 +cache_statistics=\u0627\u0644\u0625\u062D\u0635\u0627\u0621\u0627\u062A \u0627\u0644\u0645\u062E\u0632\u0646\u0629 +second_level_cache_statistics=\u0627\u0644\u0645\u0633\u062A\u0648\u0649 \u0627\u0644\u062B\u0627\u0646\u064A \u0645\u0646 \u0627\u0644\u0625\u062D\u0635\u0627\u0621\u0627\u062A \u0627\u0644\u0645\u062E\u0632\u0646\u0629 +region_name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0637\u0642\u0629 +mem_size=\u062D\u062C\u0645 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 +total_second_level_cache=\u0625\u062C\u0645\u0627\u0644\u064A \u0627\u0644\u0645\u0633\u062A\u0648\u0649 \u0627\u0644\u062B\u0627\u0646\u064A \u0627\u0644\u0645\u062E\u0632\u0646 +total_query_cache=\u0625\u062C\u0645\u0627\u0644\u064A \u0627\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u0627\u0644\u0645\u062E\u0632\u0646 +query_cache_statistics=\u0625\u062D\u0635\u0627\u0621\u0627\u062A \u0627\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u0627\u0644\u0645\u062E\u0632\u0646 +query_name=\u0627\u0633\u0645 \u0627\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17502: (Translations) Missing file. Last commit should have been to thank EMRO (WHO's Regional Office) f...
revno: 17502 committer: Jason Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Mon 2014-11-17 08:41:31 -0500 message: (Translations) Missing file. Last commit should have been to thank EMRO (WHO's Regional Office) for the Arabic contributions. modified: dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ar.properties -- 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-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ar.properties' --- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ar.properties 2014-07-23 09:39:34 + +++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ar.properties 2014-11-17 13:41:31 + @@ -1,1 +1,121 @@ -full_name=Full name +DHIS_2=DHIS2 +menu=\u0627\u0644\u0642\u0627\u0626\u0645\u0629 +home=\u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 +navigate_to=\u0627\u0644\u0627\u0646\u062A\u0642\u0627\u0644 \u0625\u0644\u0649 +reports=\u0627\u0644\u062A\u0642\u0627\u0631\u064A\u0631 +charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064A\u0627\u0646\u064A\u0629 +documents=\u0627\u0644\u0648\u062B\u0627\u0626\u0642 +dashboard=\u0644\u0648\u062D\u0629 \u0623\u062C\u0647\u0632\u0629 \u0627\u0644\u0642\u064A\u0627\u0633 +dashboard_reports=\u062A\u0642\u0627\u0631\u064A\u0631 \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +dashboard_charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064A\u0627\u0646\u064A\u0629 \u0644\u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +dashboard_documents=\u0648\u062B\u0627\u0626\u0642 \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A +data_entry=\u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +namebased_data_entry=\u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0639\u0644\u0649 \u0623\u0633\u0627\u0633 \u0627\u0644\u0627\u0633\u0645 +data_entry_overview=\u0644\u0645\u062D\u0629 \u0639\u0627\u0645\u0629 \u0639\u0646 \u0625\u062F\u062E\u0627\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A +logout=\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C +desktop_version=\u0646\u0645\u0648\u0630\u062C \u0633\u0637\u062D \u0627\u0644\u0645\u0643\u062A\u0628 +report_table_parameters=\u0645\u0639\u0644\u0645\u0627\u062A \u0627\u0644\u062A\u0642\u0631\u064A\u0631 +get_report=\u0627\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u062A\u0642\u0631\u064A\u0631 +reporting_period=\u0641\u062A\u0631\u0629 \u0627\u0644\u062A\u0642\u0631\u064A\u0631 +select_organisation_unit=\u0627\u0644\u0631\u062C\u0627\u0621 \u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0646\u0638\u0645\u0629 +available_datasets=\u0641\u0626\u0627\u062A \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +available_organisation_units=\u0648\u062D\u062F\u0627\u062A \u0627\u0644\u0645\u0646\u0638\u0645\u0629 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +available_periods=\u0627\u0644\u0641\u062A\u0631\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 +settings=\u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A +language=\u0644\u063A\u0629 \u0627\u0644\u0648\u0627\u062C\u0647\u0629 +is_invalid_boolean=\u0644\u064A\u0633\u062A \u0642\u0633\u0645\u0629 \u0645\u0646\u0637\u0642\u0629 \u0635\u0627\u0644\u062D\u0629 +is_invalid_date=\u062A\u0627\u0631\u064A\u062E \u063A\u064A\u0631 \u0635\u0627\u0644\u062D (\u0633 \u0633 \u0633 \u0633 - \u0634 \u0634 - \u064A \u064A) +is_invalid_number=\u0631\u0642\u0645 \u063A\u064A\u0631 \u0635\u0627\u0644\u062D +is_invalid_integer=\u0631\u0642\u0645 \u0635\u062D\u064A\u062D \u063A\u064A\u0631 \u0635\u0627\u0644\u062D +is_invalid_positive_integer=\u0631\u0642\u0645 \u0635\u062D\u064A\u062D \u0625\u064A\u062C\u0627\u0628\u064A \u063A\u064A\u0631 \u0635\u0627\u0644\u062D +is_invalid_negative_integer=\u0631\u0642\u0645 \u0635\u062D\u064A\u062D \u0633\u0644\u0628\u064A \u063A\u064A\u0631 \u0635\u0627\u0644\u062D +warnings_and_errors=\u0627\u0644\u062A\u062D\u0630\u064A\u0631\u0627\u062A \u0648\u0627\u0644\u0623\u062E\u0637\u0627\u0621 +validation_rule_violation_warnings=\u062A\u062D\u0630\u064A\u0631 \u0644\u0627\u0646\u062A\u0647\u0627\u0643 \u0642\u0627\u0639\u062F\u0629 \u0627\u0644\u062A\u062D\u0642\u0642 \u0645\u0646 \u0627\u0644\u0635\u062D\u0629 +minmax_violation_warnings=\u062A\u062D\u0630\u064A\u0631\u0627\u062A \u0627\u0646\u062A\u0647\u0627\u0643 \u0627\u0644\u062D\u062F \u0627\u0644\u0623\u0639\u0644\u0649 / \u0648\u0627\u0644\u062D\u062F
[Dhis2-devs] Upload Image on Data entry form
Hi All, I have a instance of DHIS 2.16 tracker data entry form, where the client needs to upload an image included as part of data entry form. eg: a photo of a tracked entity or patient etc. Is this possible, I couldn't find such tool in data entry design form. Thank you -- Pamod ___ 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 17503: add hooks for pre/post delete in AbstractCrudController, use hooks for updating version in OrgUni...
revno: 17503
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 21:35:17 +0700
message:
add hooks for pre/post delete in AbstractCrudController, use hooks for
updating version in OrgUnitController
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2014-11-11 04:10:15 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2014-11-17 14:35:17 +
@@ -486,7 +486,10 @@
}
response.setStatus( HttpServletResponse.SC_NO_CONTENT );
+
+preDeleteEntity( objects.get( 0 ) );
manager.delete( objects.get( 0 ) );
+postDeleteEntity();
}
//--
@@ -715,6 +718,14 @@
{
}
+protected void preDeleteEntity( T entity )
+{
+}
+
+protected void postDeleteEntity()
+{
+}
+
//--
// Helpers
//--
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-10-21 09:19:07 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-11-17 14:35:17 +
@@ -38,6 +38,7 @@
import org.hisp.dhis.schema.descriptors.OrganisationUnitSchemaDescriptor;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
+import org.hisp.dhis.version.VersionService;
import org.hisp.dhis.webapi.controller.AbstractCrudController;
import org.hisp.dhis.webapi.webdomain.WebMetaData;
import org.hisp.dhis.webapi.webdomain.WebOptions;
@@ -69,6 +70,9 @@
private OrganisationUnitService organisationUnitService;
@Autowired
+private VersionService versionService;
+
+@Autowired
private CurrentUserService currentUserService;
@Override
@@ -313,4 +317,22 @@
generator.writeEndObject();
}
+
+@Override
+protected void postCreateEntity( OrganisationUnit entity )
+{
+versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION );
+}
+
+@Override
+protected void postUpdateEntity( OrganisationUnit entity )
+{
+versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION );
+}
+
+@Override
+protected void postDeleteEntity()
+{
+versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION );
+}
}
=== 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 2014-11-12 09:21:19 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 14:35:17 +
@@ -134,7 +134,7 @@
}
return dhis2.de.currentOrganisationUnitId;
-}
+};
DAO.store = new dhis2.storage.Store( {
name: 'dhis2',
___
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 17504: add discard button to data-entry, discards locally stored datavalues
revno: 17504
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 22:01:37 +0700
message:
add discard button to data-entry, discards locally stored datavalues
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
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/select.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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-08 23:03:17 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-17 15:01:37 +
@@ -124,6 +124,7 @@
need_to_sync_notification=There is data stored locally, please upload to server
uploading_data_notification=Uploading locally stored data to the server
sync_now=Upload
+discard=Discard
sync_success=Upload to server was successful
sync_failed=Upload to server failed, please try again later
year=Year
=== 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 2014-11-17 14:35:17 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 15:01:37 +
@@ -182,11 +182,13 @@
if ( dhis2.de.storageManager.hasLocalData() )
{
var message = i18n_need_to_sync_notification
- + ' button id=sync_button type=button' + i18n_sync_now + '/button';
+ + ' button id=sync_button type=button' + i18n_sync_now + '/button'
+ + ' button id=discard_button type=button' + i18n_discard + '/button';
setHeaderMessage( message );
$( '#sync_button' ).bind( 'click', dhis2.de.uploadLocalData );
+ $( '#discard_button' ).bind( 'click', dhis2.de.discardLocalData );
}
else
{
@@ -285,7 +287,12 @@
updateForms();
}
} );
-}
+};
+
+dhis2.de.discardLocalData = function() {
+dhis2.de.storageManager.clearAllDataValues();
+hideHeaderMessage();
+};
dhis2.de.uploadLocalData = function()
{
@@ -2544,7 +2551,12 @@
{
return localStorage[KEY_DATAVALUES] != null ? JSON.parse( localStorage[KEY_DATAVALUES] ) : null;
};
-
+
+this.clearAllDataValues = function()
+{
+localStorage[KEY_DATAVALUES] = ;
+};
+
/**
* Returns all data value objects in an array. Returns an empty array if no
* data values exist. Items in array are guaranteed not to be undefined.
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-10-28 14:29:47 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-11-17 15:01:37 +
@@ -32,6 +32,7 @@
var i18n_offline_notification = '$encoder.jsEscape( $i18n.getString( offline_notification ) , ')';
var i18n_need_to_sync_notification = '$encoder.jsEscape( $i18n.getString( need_to_sync_notification ) , ')';
var i18n_sync_now = '$encoder.jsEscape( $i18n.getString( sync_now ) , ')';
+var i18n_discard = '$encoder.jsEscape( $i18n.getString( discard ) , ')';
var i18n_sync_success = '$encoder.jsEscape( $i18n.getString( sync_success ) , ')';
var i18n_sync_failed = '$encoder.jsEscape( $i18n.getString( sync_failed ) , ')';
var i18n_uploading_data_notification = '$encoder.jsEscape( $i18n.getString( uploading_data_notification ) , ')';
___
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 17505: confirmation dialog for dicarding local data
revno: 17505
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 22:08:22 +0700
message:
confirmation dialog for dicarding local data
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
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/select.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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-17 15:01:37 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-17 15:08:22 +
@@ -125,6 +125,7 @@
uploading_data_notification=Uploading locally stored data to the server
sync_now=Upload
discard=Discard
+remove_local_data=Are you sure you want to remove the locally stored data?
sync_success=Upload to server was successful
sync_failed=Upload to server failed, please try again later
year=Year
=== 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 2014-11-17 15:01:37 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 15:08:22 +
@@ -290,8 +290,10 @@
};
dhis2.de.discardLocalData = function() {
-dhis2.de.storageManager.clearAllDataValues();
-hideHeaderMessage();
+if( confirm( i18n_remove_local_data ) ) {
+dhis2.de.storageManager.clearAllDataValues();
+hideHeaderMessage();
+}
};
dhis2.de.uploadLocalData = function()
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-11-17 15:01:37 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-11-17 15:08:22 +
@@ -33,6 +33,7 @@
var i18n_need_to_sync_notification = '$encoder.jsEscape( $i18n.getString( need_to_sync_notification ) , ')';
var i18n_sync_now = '$encoder.jsEscape( $i18n.getString( sync_now ) , ')';
var i18n_discard = '$encoder.jsEscape( $i18n.getString( discard ) , ')';
+var i18n_remove_local_data = '$encoder.jsEscape( $i18n.getString( remove_local_data ) , ')';
var i18n_sync_success = '$encoder.jsEscape( $i18n.getString( sync_success ) , ')';
var i18n_sync_failed = '$encoder.jsEscape( $i18n.getString( sync_failed ) , ')';
var i18n_uploading_data_notification = '$encoder.jsEscape( $i18n.getString( uploading_data_notification ) , ')';
___
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 17506: move discard button to only show when upload fails
revno: 17506
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 22:29:14 +0700
message:
move discard button to only show when upload fails
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 15:08:22 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 15:29:14 +
@@ -182,13 +182,11 @@
if ( dhis2.de.storageManager.hasLocalData() )
{
var message = i18n_need_to_sync_notification
- + ' button id=sync_button type=button' + i18n_sync_now + '/button'
- + ' button id=discard_button type=button' + i18n_discard + '/button';
+ + ' button id=sync_button type=button' + i18n_sync_now + '/button';
setHeaderMessage( message );
$( '#sync_button' ).bind( 'click', dhis2.de.uploadLocalData );
- $( '#discard_button' ).bind( 'click', dhis2.de.discardLocalData );
}
else
{
@@ -349,10 +347,13 @@
else // Connection lost during upload
{
var message = i18n_sync_failed
-+ ' button id=sync_button type=button' + i18n_sync_now + '/button';
++ ' button id=sync_button type=button' + i18n_sync_now + '/button'
++ ' button id=discard_button type=button' + i18n_discard + '/button';
setHeaderMessage( message );
+
$( '#sync_button' ).bind( 'click', dhis2.de.uploadLocalData );
+$( '#discard_button' ).bind( 'click', dhis2.de.discardLocalData );
}
}
} );
@@ -410,10 +411,13 @@
else // Connection lost during upload
{
var message = i18n_sync_failed
- + ' button id=sync_button type=button' + i18n_sync_now + '/button';
-
++ ' button id=sync_button type=button' + i18n_sync_now + '/button'
++ ' button id=discard_button type=button' + i18n_discard + '/button';
+
setHeaderMessage( message );
+
$( '#sync_button' ).bind( 'click', dhis2.de.uploadLocalData );
+ $( '#discard_button' ).bind( 'click', dhis2.de.discardLocalData );
}
}
} );
___
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 17507: PT DV GIS ER EV clear button.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17507 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 16:48:57 +0100
message:
PT DV GIS ER EV clear button.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.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-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2014-11-06 14:00:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2014-11-17 15:42:17 +
@@ -173,3 +173,4 @@
last_6_months=Last 6 months
initializing=Initializing
created_by=Created by
+clear_event_report=Clear event report
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-11-13 10:43:12 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-11-17 15:42:17 +
@@ -7023,11 +7023,37 @@
iconCls: 'ns-button-icon-table',
toggleGroup: 'module',
pressed: true,
- handler: function() {
-if (!this.pressed) {
- this.toggle();
-}
- }
+menu: {},
+handler: function(b) {
+b.menu = Ext.create('Ext.menu.Menu', {
+closeAction: 'destroy',
+shadow: false,
+showSeparator: false,
+items: [
+{
+text: NS.i18n.clear_event_report + 'nbsp;nbsp;', //i18n
+cls: 'ns-menu-item-noicon',
+handler: function() {
+window.location.href = ns.core.init.contextPath + '/dhis-web-event-reports';
+}
+}
+],
+listeners: {
+show: function() {
+ns.core.web.window.setAnchorPosition(b.menu, b);
+},
+hide: function() {
+b.menu.destroy();
+defaultButton.toggle();
+},
+destroy: function(m) {
+b.menu = null;
+}
+}
+});
+
+b.menu.show();
+}
});
centerRegion = Ext.create('Ext.panel.Panel', {
@@ -7082,7 +7108,7 @@
text: NS.i18n.go_to_event_charts + 'nbsp;nbsp;', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer';
}
},
'-',
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2014-11-06 14:00:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2014-11-17 15:42:17 +
@@ -197,3 +197,4 @@
last_6_months=Last 6 months
initializing=Initializing
created_by=Created by
+clear_event_chart=Clear event chart
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-11-13 10:43:12 +
+++
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17508: Data entry, reducing category option payload
revno: 17508
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 17:35:57 +0100
message:
Data entry, reducing category option payload
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java
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/responseMetaData.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2014-11-17 09:02:15 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2014-11-17 16:35:57 +
@@ -37,17 +37,16 @@
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.annotation.Scanned;
import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.period.Period;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.period.Period;
/**
* @author Abyot Asalefew
=== 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 2014-11-17 15:29:14 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 16:35:57 +
@@ -1348,8 +1348,8 @@
*/
dhis2.de.optionValidWithinPeriod = function( option, period )
{
-return ( !option.startDate || option.startDate = dhis2.de.periodChoices[ period ].endDate )
- ( !option.endDate || option.endDate = dhis2.de.periodChoices[ period ].startDate )
+return ( !option.start || option.start = dhis2.de.periodChoices[ period ].end )
+ ( !option.end || option.end = dhis2.de.periodChoices[ period ].start )
}
/**
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm 2014-10-10 11:39:17 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm 2014-11-17 16:35:57 +
@@ -78,8 +78,8 @@
#set( $categoryOptions = $categoryOptionMap.get( $category.uid ) )
#set( $size2 = $categoryOptions.size() )
#foreach( $option in $categoryOptions )
-{id:${option.uid},name:$encoder.jsonEncode( ${option.displayName} )#if( ${option.startDate} ),startDate:${option.startDate}#end
-#if( ${option.endDate} ),endDate:${option.endDate}#end}#if( $velocityCount $size2 ),#end
+{id:${option.uid},name:$encoder.jsonEncode( ${option.displayName} )#if( ${option.startDate} ),start:${option.startDate}#end
+#if( ${option.endDate} ),end:${option.endDate}#end}#if( $velocityCount $size2 ),#end
#end ] }#if( $velocityCount $size1 ),#end
#end }
} }
___
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 17509: Data entry. Splitting out data set associations from meta-data response. Should allow for paralle...
revno: 17509
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 18:24:22 +0100
message:
Data entry. Splitting out data set associations from meta-data response.
Should allow for parallell download of content and less chance of time-out.
added:
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSetAssociations.vm
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
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/javascript/form.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.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
=== added file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-17 17:24:22 +
@@ -0,0 +1,61 @@
+package org.hisp.dhis.de.action;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hisp.dhis.configuration.ConfigurationService;
+import org.hisp.dhis.organisationunit.OrganisationUnitDataSetAssociationSet;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetDataSetAssociationsAction
+implements Action
+{
+@Autowired
+private OrganisationUnitService organisationUnitService;
+
+@Autowired
+private ConfigurationService configurationService;
+
+private ListSetString dataSetAssociationSets;
+
+// -
+// Output
+// -
+
+public ListSetString getDataSetAssociationSets()
+{
+return dataSetAssociationSets;
+}
+
+private MapString, Integer organisationUnitAssociationSetMap;
+
+public MapString, Integer getOrganisationUnitAssociationSetMap()
+{
+return organisationUnitAssociationSetMap;
+}
+
+// -
+// Action implementation
+// -
+
+@Override
+public String execute()
+{
+OrganisationUnitLevel offlineOrgUnitLevel = configurationService.getConfiguration().getOfflineOrganisationUnitLevel();
+
+Integer level = offlineOrgUnitLevel != null ? offlineOrgUnitLevel.getLevel() : null;
+
+OrganisationUnitDataSetAssociationSet organisationUnitSet = organisationUnitService.getOrganisationUnitDataSetAssociationSet( level );
+
+dataSetAssociationSets = organisationUnitSet.getDataSetAssociationSets();
+
+organisationUnitAssociationSetMap = organisationUnitSet.getOrganisationUnitAssociationSetMap();
+
+return SUCCESS;
+}
+}
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-10-18 07:31:50 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-11-17 17:24:22 +
@@ -50,9 +50,6 @@
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.organisationunit.OrganisationUnitDataSetAssociationSet;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,13 +94,6 @@
this.dataSetService = dataSetService;
}
-private OrganisationUnitService organisationUnitService;
-
-public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-{
-this.organisationUnitService = organisationUnitService;
-}
-
private
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17510: License
revno: 17510
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 18:37:09 +0100
message:
License
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.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-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-17 17:24:22 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-17 17:37:09 +
@@ -1,5 +1,33 @@
package org.hisp.dhis.de.action;
+/*
+ * Copyright (c) 2004-2014, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -12,6 +40,9 @@
import com.opensymphony.xwork2.Action;
+/**
+ * @author Lars Helge Overland
+ */
public class GetDataSetAssociationsAction
implements Action
{
___
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 17513: Added method to id manager for getting last updated object per class
revno: 17513
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 20:21:36 +0100
message:
Added method to id manager for getting last updated object per class
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.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-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java 2014-09-11 06:39:30 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java 2014-11-17 19:21:36 +
@@ -246,6 +246,13 @@
* @return All objects equal or newer than given date.
*/
ListT getAllGeLastUpdatedOrderedName( Date lastUpdated );
+
+/**
+ * Returns the date of the last updated object.
+ *
+ * @return a Date / time stamp.
+ */
+Date getLastUpdated();
/**
* Returns the number of objects that are equal to or newer than given last updated date.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2014-10-23 05:40:21 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2014-11-17 19:21:36 +
@@ -92,6 +92,8 @@
T extends IdentifiableObject CollectionT getByLastUpdatedSorted( ClassT clazz, Date lastUpdated );
T extends IdentifiableObject CollectionT getByCreatedSorted( ClassT clazz, Date created );
+
+T extends IdentifiableObject Date getLastUpdated( ClassT clazz );
void delete( IdentifiableObject object );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2014-10-23 05:40:21 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2014-11-17 19:21:36 +
@@ -532,6 +532,19 @@
}
@Override
+public T extends IdentifiableObject Date getLastUpdated( ClassT clazz )
+{
+GenericIdentifiableObjectStoreIdentifiableObject store = getIdentifiableObjectStore( clazz );
+
+if ( store == null )
+{
+return null;
+}
+
+return store.getLastUpdated();
+}
+
+@Override
public T extends IdentifiableObject SetInteger convertToId( ClassT clazz, CollectionString uids )
{
GenericIdentifiableObjectStoreIdentifiableObject store = getIdentifiableObjectStore( clazz );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java 2014-09-24 10:54:15 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java 2014-11-17 19:21:36 +
@@ -28,6 +28,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Query;
@@ -41,11 +46,6 @@
import org.hisp.dhis.hibernate.HibernateGenericStore;
import org.hisp.dhis.hibernate.exception.ReadAccessDeniedException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
/**
* @author bobj
*/
@@ -394,6 +394,15 @@
}
@Override
+public Date getLastUpdated()
+{
+return (Date) getClazzCriteria().setProjection( Projections.property( lastUpdated ) )
+.addOrder( Order.desc( lastUpdated ) )
+.setMaxResults( 1 )
+.setCacheable( true ).uniqueResult();
+}
+
+@Override
@SuppressWarnings(unchecked)
public ListT getByDataDimension( boolean dataDimension )
{
=== modified
Re: [Dhis2-devs] /multiple api for acceptance
Yes, that's fine. Note that the approvals feature doesn't require data to be present. Approving a combination of data set / period / org unit with no data means that you are approving the case that no data is present for that combination. Cheers, Jim On Mon, Nov 17, 2014 at 8:16 AM, Mahendra Kariya mahendra.kar...@thoughtworks.com wrote: Ahh Ok! I hope it wouldn't be an issue if we generate tables with only the metadata (without any data values) in DHIS. On Mon, Nov 17, 2014 at 6:02 PM, Jim Grace jimgr...@gmail.com wrote: Ah, you need to build the resource tables first. Apps - Data Administration - Resource Table - Generate Tables. Or it also happens as part of building the analytics tables. The key statement in the error log is nested exception is org.postgresql.util.PSQLException: ERROR: relation _orgunitstructure does not exist Cheers, Jim On Sun, Nov 16, 2014 at 10:58 PM, Mahendra Kariya mahendra.kar...@thoughtworks.com wrote: Hi Jim, DHIS2 is throwing an exception (stack trace below) when we are trying to GET the following URL. We are on rev 17487. http://localhost:8080/api/dataApprovals/status?children=trueds=a00b93a8e1ads=a0264329d97ds=a170b8cd5e5ds=a1869d7c13ads=a1a3292f7ceds=a2d8612eae4ds=a3a7972730bds=a3e7dd2a626ds=a3ff8b407cbds=a6f379ec1b2ds=a717250c552ds=a798ad4eca5ds=a80a255363ads=a9982fbd7a5ds=aa73eadc073ds=ab4a6b62fb9ds=ab6203b3306ds=ad7fe0ff2afds=aed7f5a4bc5ds=af2c2344212ds=afcb8adfba5endDate=2014-11-17ou=3d760c3a11aou=e3e286c6ca8startDate=2014-09-22 HTTP ERROR 500 Problem accessing /api/dataApprovals/status. Reason: Server Error Caused by: org.springframework.web.util.NestedServletException: Request processing failed; nested exception is org.springframework.jdbc.BadSqlGrammarException: StatementCallback; bad SQL grammar [select a.categoryoptioncomboid, a.organisationunitid, (select min(coalesce(dal.level, 0)) from period p join dataset ds on ds.datasetid in (7073) and ds.categorycomboid = a.categorycomboid left join dataapproval da on da.datasetid = ds.datasetid and da.periodid = p.periodid and da.attributeoptioncomboid = a.categoryoptioncomboid and da.organisationunitid = a.organisationunitid left join dataapprovallevel dal on dal.dataapprovallevelid = da.dataapprovallevelid where p.periodid in (9197) ) as highest_approved_level, (select substring(min(concat(10 + coalesce(dal.level, 0), coalesce(da.accepted, FALSE))) from 7) from period p join dataset ds on ds.datasetid in (7073) and ds.categorycomboid = a.categorycomboid left join dataapproval da on da.datasetid = ds.datasetid and da.periodid = p.periodid and da.attributeoptioncomboid = a.categoryoptioncomboid and da.organisationunitid = a.organisationunitid left join dataapprovallevel dal on dal.dataapprovallevelid = da.dataapprovallevelid where p.periodid in (9197) ) as accepted_at_highest_level, not exists (select 1 from _orgunitstructure ous left join dataapproval da on da.organisationunitid = ous.organisationunitid and da.dataapprovallevelid = 1 and da.periodid in (9197) and da.datasetid in (7073) and da.attributeoptioncomboid = a.categoryoptioncomboid where ous.idlevel5 = a.organisationunitid and ous.level = 6 and ( da.dataapprovalid is null ) ) as ready_below, false as approved_above from ( select distinct cocco.categoryoptioncomboid, ccoc.categorycomboid, o.organisationunitid from categoryoptioncombos_categoryoptions cocco join categorycombos_optioncombos ccoc on ccoc.categoryoptioncomboid = cocco.categoryoptioncomboid and ccoc.categorycomboid in (14) join dataelementcategoryoption co on co.categoryoptionid = cocco.categoryoptionid and (co.startdate is null or co.startdate = '2014-11-16') and (co.enddate is null or co.enddate = '2014-11-10') join _orgunitstructure o on o.organisationunitid = 9171 left join categoryoption_organisationunits coo on coo.categoryoptionid = co.categoryoptionid left join _orgunitstructure ous on ous.idlevel5= o.organisationunitid and ous.organisationunitid = coo.organisationunitid left join _orgunitstructure o1 on o1.idlevel5 = o.organisationunitid and o1.idlevel1 = coo.organisationunitid left join _orgunitstructure o2 on o2.idlevel5 = o.organisationunitid and o2.idlevel2 = coo.organisationunitid left join _orgunitstructure o3 on o3.idlevel5 = o.organisationunitid and o3.idlevel3 = coo.organisationunitid left join _orgunitstructure o4 on o4.idlevel5 = o.organisationunitid and o4.idlevel4 = coo.organisationunitid left join dataelementcategoryoptionusergroupaccesses couga on couga.categoryoptionid = cocco.categoryoptionid left join usergroupaccess uga on uga.usergroupaccessid = couga.usergroupaccessid left join usergroupmembers ugm on ugm.usergroupid = uga.usergroupid where ( coo.categoryoptionid is null or ous.organisationunitid is not null or o1.organisationunitid is not null or o2.organisationunitid is not null or o3.organisationunitid is not null or
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17514: Ouwt. Fixes problem with unnecessary trigger causing the loaded event to be triggered too early, ...
revno: 17514
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 21:47:30 +0100
message:
Ouwt. Fixes problem with unnecessary trigger causing the loaded event to be
triggered too early, causing havoc in data entry. Allows to remove
workaround/fix.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.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-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2014-11-16 11:32:57 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2014-11-17 20:47:30 +
@@ -369,17 +369,14 @@
selection.clearOrganisationUnits().always(function() {
selection.setOrganisationUnits( data.organisationUnits ).done(function() {
sync_and_reload();
- $( #orgUnitTree ).trigger( ouwtLoaded );
});
});
} ).fail( function() {
sync_and_reload();
-$( #orgUnitTree ).trigger( ouwtLoaded );
} );
}
else {
sync_and_reload();
-$( #orgUnitTree ).trigger( ouwtLoaded );
}
} );
};
@@ -459,11 +456,7 @@
selection.busy( true );
- if( selection.getSelected() selection.getSelected().length === 0 ) {
- setTimeout(doSync, 1000);
- } else {
- doSync();
- }
+ doSync();
}
};
___
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 17516: Data entry. Implemented validation/etag caching for the dataset associations response.
revno: 17516
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-11-17 23:18:59 +0100
message:
Data entry. Implemented validation/etag caching for the dataset associations
response.
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-10-28 10:29:40 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-11-17 22:18:59 +
@@ -354,7 +354,7 @@
* the If-None-Match header value, generates an ETag based on the given
* collection of IdentifiableObjects and compares them for equality. If this
* evaluates to true, it will set status code 304 Not Modified on the response
- * and remove all elements from the given list. It will also set the ETag header
+ * and remove all elements from the given list. It will set the ETag header
* on the response in any case.
*
* @param request the HttpServletRequest.
@@ -380,4 +380,34 @@
return false;
}
+
+/**
+ * This method looks up the ETag sent in the request from the If-None-Match
+ * header value and compares it to the given tag. If they match, it will set
+ * status code 304 Not Modified on the response. It will set the ETag header
+ * on the response in any case. It will wrap the given tag in quotes.
+ *
+ * @param request the HttpServletRequest.
+ * @param response the HttpServletResponse.
+ * @param tag the tag to compare.
+ * @return true if the given tag match the request tag and the response is
+ * considered not modified, false if not.
+ */
+public static boolean isNotModified( HttpServletRequest request, HttpServletResponse response, String tag )
+{
+tag = tag != null ? ( QUOTE + tag + QUOTE ) : null;
+
+String inputTag = request.getHeader( HEADER_IF_NONE_MATCH );
+
+response.setHeader( HEADER_ETAG, tag );
+
+if ( inputTag != null inputTag.equals( tag ) )
+{
+response.setStatus( HttpServletResponse.SC_NOT_MODIFIED );
+
+return true;
+}
+
+return false;
+}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-17 17:38:08 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-17 22:18:59 +
@@ -28,14 +28,23 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.struts2.ServletActionContext;
+import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.configuration.ConfigurationService;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitDataSetAssociationSet;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.system.util.DateUtils;
+import org.hisp.dhis.webapi.utils.ContextUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -51,19 +60,22 @@
@Autowired
private ConfigurationService configurationService;
+
+@Autowired
+private IdentifiableObjectManager identifiableObjectManager;
// -
// Output
// -
-private ListSetString dataSetAssociationSets;
+private ListSetString dataSetAssociationSets = new ArrayList();
public ListSetString getDataSetAssociationSets()
{
return dataSetAssociationSets;
}
-private MapString, Integer organisationUnitAssociationSetMap;
+private MapString, Integer
[Dhis2-devs] Creating the analytics tables using the Web API
Hi devs, Is that possible? So we can start the process somehow with a call to the API. Thanks Jose ___ 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 17517: bugfix for :persisted filter, also adds :owner filter which will only give the properties that th...
revno: 17517
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-18 12:20:53 +0700
message:
bugfix for :persisted filter, also adds :owner filter which will only give
the properties that the instance owns (i.e. that can be changed through web-api
crud)
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java 2014-10-01 11:50:02 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java 2014-11-18 05:20:53 +
@@ -67,13 +67,13 @@
@Autowired
private SchemaService schemaService;
-@Autowired(required = false)
+@Autowired( required = false )
private SetPresetProvider presetProviders = Sets.newHashSet();
-@Autowired(required = false)
+@Autowired( required = false )
private SetNodePropertyConverter nodePropertyConverters = Sets.newHashSet();
-@Autowired(required = false)
+@Autowired( required = false )
private SetNodeTransformer nodeTransformers = Sets.newHashSet();
private ImmutableMapString, PresetProvider presets = ImmutableMap.of();
@@ -333,7 +333,21 @@
for ( Property property : properties )
{
-if ( property.isPersisted() )
+if ( !fieldMap.containsKey( property.key() ) property.isPersisted() )
+{
+fieldMap.put( property.key(), new FieldMap() );
+}
+}
+
+cleanupFields.add( fieldKey );
+}
+else if ( :owner.equals( fieldKey ) )
+{
+ListProperty properties = schema.getProperties();
+
+for ( Property property : properties )
+{
+if ( !fieldMap.containsKey( property.key() ) property.isPersisted() property.isOwner() )
{
fieldMap.put( property.key(), new FieldMap() );
}
___
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
