Re: [Dhis2-devs] Data Values not getting saved
Hi Mahendra, we did some changes to data entry on monday. However it works well on apps.dhis2.org/dev and on other databases I have tested on. Could it be a cache issue? Did you really clear cache https://www.dhis2.org/tutorials/how-to-really-clear-browser-cache? Could you point me to a place or a database I can test with? regards, Lars On Wed, Nov 19, 2014 at 5:32 AM, Mahendra Kariya mahendra.kar...@thoughtworks.com wrote: Hi Lars, On rev 17525, we are not able to get the data values that we entered on the data entry screen. After entering the data values, when we reopen the data entry form, its blank! Also the complete data set registration from data entry screen is broken. ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Short Name for Category Options
Hi Mahendra, there is nothing you must do, as the field is nullable. There isn't really a scripted upgrade path, since the field is unique and max 50 char. However you can try this SQL: update dataelementcategoryoption set name = substring(name,0,50); In 2.17 we have a new option for display either name or short name in analysis apps, and hence it could be good to set this. regards, Lars On Wed, Nov 19, 2014 at 5:10 AM, Mahendra Kariya mahendra.kar...@thoughtworks.com wrote: Hi Lars, We just noticed that a new mandatory field 'shortName' has been added to category options. We were just wondering about the migration strategy for the data which is already in prod without the short name. Do we need to do something about it or DHIS will take care of this scenario internally? Thanks, Mahendra ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Data Values not getting saved
Okay thanks. Is this plain trunk or with modifications? If it does not work still then send me the db and I will look closer. Lars ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Event Capture Screen is broken.
Hi Mansi This tutorial might help: https://www.dhis2.org/tutorials/how-to-really-clear-browser-cache Regards Bob On 19 November 2014 06:22, Mansi Singhal msing...@thoughtworks.com wrote: Hello Lars, Event Capture Screen looks fine on incognito window. Its only the regular window where nothing is coming up. Might be because of caching. We are not seeing similar issue when we go to dhis demo app on the regular window. Can you tell us, Is there anyway to ensure that we don't face caching issues during normal usage ? On Wed, Nov 19, 2014 at 11:41 AM, Mansi Singhal msing...@thoughtworks.com wrote: Hey Lars, We just realized that nothing is coming up on event capture screen. It seems to be broken. Can you have a look into the issue? -- Thanks, Mansi Singhal -- Regards, Mansi Singhal ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17527: Event capture, added version comment in appcache
revno: 17527 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Wed 2014-11-19 09:16:51 +0100 message: Event capture, added version comment in appcache renamed: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache = dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture.appcache modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture.appcache -- 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-capture/event-capture.appcache' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-11-12 16:49:17 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-11-19 08:16:51 + @@ -1,4 +1,5 @@ CACHE MANIFEST +# 2.17-SNAPSHOT CACHE: === renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache' = 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture.appcache' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache 2014-05-06 12:52:00 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture.appcache 2014-11-19 08:16:51 + @@ -1,4 +1,5 @@ CACHE MANIFEST +# 2.17-SNAPSHOT CACHE: ../dhis-web-commons/javascripts/jQuery/jquery.min.js ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Event Capture Screen is broken.
Hi Mansi, I can see that we have not put in versioning in the cache manifest (appcache) file. Also, I guess you run trunk. As a result the browser will not update the static files which are cached in local storage. We have put in a small fix in trunk now. Please try again. Also try to really clear cache https://www.dhis2.org/tutorials/how-to-really-clear-browser-cache - you need to do this to clear the content from localstorage, which is not cleared when clearing the cache in the normal way. regards, Lars On Wed, Nov 19, 2014 at 7:22 AM, Mansi Singhal msing...@thoughtworks.com wrote: Hello Lars, Event Capture Screen looks fine on incognito window. Its only the regular window where nothing is coming up. Might be because of caching. We are not seeing similar issue when we go to dhis demo app on the regular window. Can you tell us, Is there anyway to ensure that we don't face caching issues during normal usage ? On Wed, Nov 19, 2014 at 11:41 AM, Mansi Singhal msing...@thoughtworks.com wrote: Hey Lars, We just realized that nothing is coming up on event capture screen. It seems to be broken. Can you have a look into the issue? -- Thanks, Mansi Singhal -- Regards, Mansi Singhal ___ 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 17528: event capture - avoid page reload when going offline
revno: 17528
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 10:03:43 +0100
message:
event capture - avoid page reload when going offline
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.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-capture/scripts/event-capture.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2014-11-12 16:49:17 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2014-11-19 09:03:43 +
@@ -135,7 +135,6 @@
}
else {
setHeaderMessage(i18n_offline_notification);
-selection.responseReceived(); //notify angular
}
});
___
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 17529: event capture form validation notification with value type
revno: 17529
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 10:29:44 +0100
message:
event capture form validation notification with value type
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
--
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-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-11-16 10:31:19 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-11-19 09:29:44 +
@@ -27,8 +27,12 @@
discard: Discard,
back: Back,
go_back: Go back,
+form_invalid: Form is invalid. Please check for required fields.,
required: Required,
-number_required: Number required,
+number_required: Value must be number,
+text_required: Value must be text,
+date_required: Value must be date,
+option_required: Value must be selected from drop-down,
ok: Ok,
done: Done,
remove: Remove,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-11-03 10:34:14 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-11-19 09:29:44 +
@@ -412,7 +412,7 @@
//check for form validity
$scope.outerForm.submitted = true;
-if( $scope.outerForm.$invalid ){
+if( $scope.outerForm.$invalid ){
angular.forEach($scope.selectedProgramStage.programStageSections, function(section){
section.open = true;
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-11-03 10:34:14 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-11-19 09:29:44 +
@@ -862,7 +862,7 @@
clear: both
}
-.horizonal-spacing{
+.horizontal-spacing{
margin-right: 20px;
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-11-04 02:32:10 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-11-19 09:29:44 +
@@ -32,7 +32,7 @@
ng-disabled=editingEventInFull
ng-required=true
name=eventDate/
-span ng-show=outerForm.submitted outerForm.eventDate.$invalid class=required{{'required'| translate}}/span
+span ng-show=outerForm.submitted outerForm.eventDate.$invalid class=required{{'date_required'| translate}}/span
/td
/tr
tr ng-if=selectedProgramStage.captureCoordinates
@@ -79,7 +79,8 @@
ng-model=currentEvent[eventGridColumn.id]
ng-required={{eventGridColumn.compulsory}}
name=foo
- style=width:99%;/
+ style=width:99%;/
+span ng-show=outerForm.submitted innerForm.foo.$invalid class=required{{'number_required'| translate}}/span
/div
div ng-switch-when=string
div class=container-fluid ng-if=prStDes[eventGridColumn.id].dataElement.optionSet
@@ -93,6 +94,7 @@
name=foo
style=width:99%;/
/span
+span ng-show=outerForm.submitted innerForm.foo.$invalid class=required{{'option_required'| translate}}/span
span ng-if=selectedProgram.dataEntryMethod
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17530: event capture - validation labels in custom/section forms
revno: 17530
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 10:55:11 +0100
message:
event capture - validation labels in custom/section forms
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/customForm.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
--
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-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-11-19 09:29:44 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-11-19 09:55:11 +
@@ -29,10 +29,11 @@
go_back: Go back,
form_invalid: Form is invalid. Please check for required fields.,
required: Required,
-number_required: Value must be number,
-text_required: Value must be text,
-date_required: Value must be date,
+int_required: Value must be a number,
+string_required: Value must be a text,
+date_required: Value must be a date,
option_required: Value must be selected from drop-down,
+bool_required: Value must be a boolean,
ok: Ok,
done: Done,
remove: Remove,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-11-03 10:34:14 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-11-19 09:55:11 +
@@ -378,7 +378,8 @@
newInputField = 'input type=number ' +
this.getAttributesAsString(attributes) +
' ng-model=currentEvent.' + deId + '' +
-' ng-required=prStDes.' + deId + '.compulsory';
+' ng-required=prStDes.' + deId + '.compulsory ' +
+'span ng-show=outerForm.submitted outerForm.'+ deId +'.$invalid class=required{{\'int_required\'| translate}}/span';
}
if(programStageDataElements[deId].dataElement.type == string){
if(programStageDataElements[deId].dataElement.optionSet){
@@ -390,14 +391,16 @@
' ng-required=prStDes.' + deId + '.compulsory' +
' typeahead=option.name as option.name for option in optionSets.'+optionSetId+'.options | filter:$viewValue | limitTo:20' +
' typeahead-editable=false ' +
-' typeahead-open-on-focus ng-required=prStDes.'+deId+'.compulsory';
+' typeahead-open-on-focus ng-required=prStDes.'+deId+'.compulsory ' +
+'span ng-show=outerForm.submitted outerForm.'+ deId +'.$invalid class=required{{\'option_required\'| translate}}/span';
}
else{
newInputField = 'input type=text ' +
this.getAttributesAsString(attributes) +
' ng-model=currentEvent.' + deId + ' ' +
' ng-disabled=currentEvent[uid] == \'uid\' ' +
-' ng-required=prStDes.' + deId + '.compulsory';
+' ng-required=prStDes.' + deId + '.compulsory ' +
+'span ng-show=outerForm.submitted outerForm.'+ deId +'.$invalid class=required{{\'text_required\'| translate}}/span';
}
}
if(programStageDataElements[deId].dataElement.type == bool){
@@ -408,7 +411,8 @@
'option value={{\'please_select\'| translate}}/option' +
'option value=false{{\'no\'| translate}}/option' +
'option value=true{{\'yes\'| translate}}/option' +
-'/select';
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17531: Minor
revno: 17531
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 12:16:04 +0100
message:
Minor
modified:
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/GetMetaDataAction.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 22:18:59 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java 2014-11-19 11:16:04 +
@@ -89,7 +89,8 @@
@Override
public String execute()
{
-Date lastUpdated = DateUtils.max( identifiableObjectManager.getLastUpdated( DataSet.class ),
+Date lastUpdated = DateUtils.max(
+identifiableObjectManager.getLastUpdated( DataSet.class ),
identifiableObjectManager.getLastUpdated( OrganisationUnit.class ) );
String tag = lastUpdated != null ? DateUtils.LONG_DATE_FORMAT.format( lastUpdated ) : null;
=== 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-11-17 17:24:22 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-11-19 11:16:04 +
@@ -150,20 +150,6 @@
return dataSets;
}
-private ListSetString dataSetAssociationSets;
-
-public ListSetString getDataSetAssociationSets()
-{
-return dataSetAssociationSets;
-}
-
-private MapString, Integer organisationUnitAssociationSetMap;
-
-public MapString, Integer getOrganisationUnitAssociationSetMap()
-{
-return organisationUnitAssociationSetMap;
-}
-
private boolean emptyOrganisationUnits;
public boolean isEmptyOrganisationUnits()
@@ -206,6 +192,8 @@
@Override
public String execute()
{
+//TODO 403
+
User user = currentUserService.getCurrentUser();
if ( user != null user.getOrganisationUnits().isEmpty() )
___
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 17532: Date util method
revno: 17532
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 12:34:01 +0100
message:
Date util method
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2014-11-18 08:48:59 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2014-11-19 11:34:01 +
@@ -135,6 +135,24 @@
}
/**
+ * Returns the latest of the given dates.
+ *
+ * @param date the dates.
+ * @return the latest of the given dates.
+ */
+public static Date max( Date... date )
+{
+Date latest = null;
+
+for ( Date d : date )
+{
+latest = max( d, latest );
+}
+
+return latest;
+}
+
+/**
* Formats a Date to the format -MM-DD.
*
* @param date the Date to parse.
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java 2014-11-18 08:48:59 +
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java 2014-11-19 11:34:01 +
@@ -84,4 +84,25 @@
assertNull( DateUtils.max( date3, date4 ) );
}
+
+@Test
+public void testMaxArray()
+{
+Date date1 = new DateTime( 2014, 5, 15, 3, 3 ).toDate();
+Date date2 = new DateTime( 2014, 5, 18, 1, 1 ).toDate();
+Date date3 = new DateTime( 2014, 6, 10, 1, 1 ).toDate();
+Date date4 = null;
+Date date5 = null;
+Date date6 = null;
+
+assertEquals( date2, DateUtils.max( date1, date2, date4 ) );
+assertEquals( date2, DateUtils.max( date2, date1, date4 ) );
+assertEquals( date3, DateUtils.max( date1, date2, date3 ) );
+assertEquals( date3, DateUtils.max( date1, date2, date3 ) );
+assertEquals( date3, DateUtils.max( date3, date4, date5 ) );
+assertEquals( date4, DateUtils.max( date4, date5, date6 ) );
+assertEquals( date1, DateUtils.max( date1, date5, date4 ) );
+
+assertNull( DateUtils.max( date4, date5, date6 ) );
+}
}
___
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 17534: Data entry, introduced validation caching on meta data response
revno: 17534
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 13:17:41 +0100
message:
Data entry, introduced validation caching on meta data response
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/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/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-11-19 11:16:04 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-11-19 12:17:41 +
@@ -31,12 +31,15 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
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.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.configuration.ConfigurationService;
import org.hisp.dhis.dataelement.DataElement;
@@ -50,8 +53,11 @@
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
+import org.hisp.dhis.option.OptionSet;
+import org.hisp.dhis.system.util.DateUtils;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
+import org.hisp.dhis.webapi.utils.ContextUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -111,6 +117,9 @@
@Autowired
private ConfigurationService configurationService;
+@Autowired
+private IdentifiableObjectManager identifiableObjectManager;
+
// -
// Output
// -
@@ -192,8 +201,21 @@
@Override
public String execute()
{
-//TODO 403
+Date lastUpdated = DateUtils.max(
+identifiableObjectManager.getLastUpdated( DataElement.class ),
+identifiableObjectManager.getLastUpdated( OptionSet.class ),
+identifiableObjectManager.getLastUpdated( Indicator.class ),
+identifiableObjectManager.getLastUpdated( DataSet.class ),
+identifiableObjectManager.getLastUpdated( DataElementCategoryCombo.class ),
+identifiableObjectManager.getLastUpdated( DataElementCategory.class ),
+identifiableObjectManager.getLastUpdated( DataElementCategoryOption.class ));
+String tag = lastUpdated != null ? DateUtils.LONG_DATE_FORMAT.format( lastUpdated ) : null;
+if ( ContextUtils.isNotModified( ServletActionContext.getRequest(), ServletActionContext.getResponse(), tag ) )
+{
+return SUCCESS;
+}
+
User user = currentUserService.getCurrentUser();
if ( user != null user.getOrganisationUnits().isEmpty() )
=== 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-18 14:45:40 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-19 12:17:41 +
@@ -263,6 +263,7 @@
$.ajax( {
url: 'getMetaData.action',
dataType: 'json',
+ cache: true,
success: function( json )
{
sessionStorage[dhis2.de.cst.metaData] = JSON.stringify( json.metaData );
___
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 17535: PT select all behavior, work in progress.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17535 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 13:37:29 +0100
message:
PT select all behavior, work in progress.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/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-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-17 15:42:17 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-18 15:12:03 +
@@ -2692,8 +2692,9 @@
this.isPending = false;
indicatorSearch.hideFilter();
},
-loadPage: function(uid, filter, append) {
+loadPage: function(uid, filter, append, noPaging, fn) {
var store = this,
+ params = {},
path;
uid = (Ext.isString(uid) || Ext.isNumber(uid)) ? uid : indicatorGroup.getValue();
@@ -2714,27 +2715,32 @@
else if (uid === 0) {
path = '/indicators.json?fields=id,' + ns.core.init.namePropertyUrl + '' + (filter ? 'filter=name:like:' + filter : '');
}
-
+
if (!path) {
console.log('Available indicators: invalid id');
return;
}
+if (noPaging) {
+ params.paging = false;
+}
+else {
+ params.page = store.nextPage;
+ params.pageSize = 50;
+}
+
store.isPending = true;
ns.core.web.mask.show(indicatorAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
-params: {
-page: store.nextPage,
-pageSize: 50
-},
+params: params,
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.indicators || [],
pager = response.pager;
-store.loadStore(data, pager, append);
+store.loadStore(data, pager, append, fn);
},
callback: function() {
store.isPending = false;
@@ -2742,7 +2748,9 @@
}
});
},
-loadStore: function(data, pager, append) {
+loadStore: function(data, pager, append, fn) {
+pager = pager || {};
+
this.loadData(data, append);
this.sortStore();
@@ -2753,7 +2761,13 @@
}
this.isPending = false;
-ns.core.web.multiSelect.filterAvailable({store: indicatorAvailableStore}, {store: indicatorSelectedStore});
+
+if (fn) {
+ fn();
+}
+else {
+ ns.core.web.multiSelect.filterAvailable({store: indicatorAvailableStore}, {store: indicatorSelectedStore});
+}
},
storage: {},
parent: null,
@@ -3292,7 +3306,9 @@
icon: 'images/arrowrightdouble.png',
width: 22,
handler: function() {
- ns.core.web.multiSelect.selectAll(indicatorAvailable, indicatorSelected);
+ indicatorAvailableStore.loadPage(null, null, null, true, function() {
+ ns.core.web.multiSelect.selectAll(indicatorAvailable, indicatorSelected);
+ });
}
}
],
@@ -4821,6 +4837,9 @@
var onSelect,
availableStore,
selectedStore,
+//dataLabel,
+//dataSearch,
+//dataFilter,
available,
selected,
panel,
@@ -4924,6 +4943,75 @@
}
});
+ //dataLabel = Ext.create('Ext.form.Label', {
+//text: NS.i18n.available,
+//cls: 'ns-toolbar-multiselect-left-label',
+//style: 'margin-right:5px'
+ //});
+
+ //dataSearch = Ext.create('Ext.button.Button', {
+//width: 22,
+//height: 22,
+//cls: 'ns-button-icon',
+//style: 'background: url(images/search_14.png) 3px 3px no-repeat',
+//showFilter: function() {
+ //dataLabel.hide();
+ //this.hide();
+ //dataFilter.show();
+ //dataFilter.reset();
+//},
+//hideFilter: function() {
+ //dataLabel.show();
+ //this.show();
+ //dataFilter.hide();
+ //dataFilter.reset();
+//},
+//handler: function() {
+ //this.showFilter();
+//}
+ //});
+
+ //dataFilter = Ext.create('Ext.form.field.Trigger', {
+//cls: 'ns-trigger-filter',
+//emptyText: 'Filter available..',
+//height: 22,
+//hidden: true,
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17536: minor
revno: 17536
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 13:45:44 +0100
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
--
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-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-11-19 12:00:31 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-11-19 12:45:44 +
@@ -392,6 +392,8 @@
' typeahead=option.name as option.name for option in optionSets.'+optionSetId+'.options | filter:$viewValue | limitTo:20' +
' typeahead-editable=false ' +
' d2-typeahead-validation ' +
+' class=typeahead ' +
+' placeholder=#xf0d7;nbsp;nbsp; ' +
' typeahead-open-on-focus ng-required=prStDes.'+deId+'.compulsory ' +
'span ng-show=outerForm.submitted outerForm.'+ deId +'.$invalid class=required{{\'option_required\'| translate}}/span';
}
@@ -576,7 +578,7 @@
this.translate = function(){
var profile = storage.get('USER_PROFILE');
-if( profile ){
+if( profile profile.settings ){
$translate.uses(profile.settings.keyUiLocale);
}
};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-11-19 12:00:31 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-11-19 12:45:44 +
@@ -31,42 +31,44 @@
ng-model=currentEvent.eventDate
ng-disabled=editingEventInFull
ng-required=true
- name=eventDate/
+ name=eventDate
+ style=width:99%;/
span ng-show=outerForm.submitted outerForm.eventDate.$invalid class=required{{'date_required'| translate}}/span
/td
/tr
tr ng-if=selectedProgramStage.captureCoordinates
td
-{{'lat_lng' | translate}}
+{{'latitude'| translate}}
/td
td
-span class=coordinate-container
-input type=number
- ng-model=currentEvent.coordinate.latitude
- placeholder={{'latitude' | translate}}
+input type=number
+ ng-model=currentEvent.coordinate.latitude
name=latitude
min=-90
max=90
ng-required=false
- style=min-width:128px/
-span ng-show=outerForm.submitted outerForm.latitude.$invalid class=required{{'int_required'| translate}} [-90 ... 90]/span
-/span
-span class=coordinate-container
-input type=number
+ style=width:99%;/
+span ng-show=outerForm.submitted outerForm.latitude.$invalid class=required{{'int_required'| translate}} [-90 ... 90]/span
+/td
+/tr
+tr ng-if=selectedProgramStage.captureCoordinates
+td
+{{'longitude'| translate}}
+/td
+td
+input type=number
ng-model=currentEvent.coordinate.longitude
- placeholder={{'longitude' | translate}}
name=longitude
min=-180
max=180
ng-required=false
- style=min-width:128px/
-span ng-show=outerForm.submitted
[Dhis2-devs] Error when running a db locally
I think we should avoid this endless loop in the log: * ERROR 2014-11-19 14:22:49,723 Error! (AServiceThread.java [KeepAlive [Clickate ll]]) java.net.UnknownHostException: api.clickatell.com at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java :184) at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172) at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) at java.net.Socket.connect(Socket.java:589) at sun.net.NetworkClient.doConnect(NetworkClient.java:175) at sun.net.www.http.HttpClient.openServer(HttpClient.java:432) at sun.net.www.http.HttpClient.openServer(HttpClient.java:527) at sun.net.www.http.HttpClient.init(HttpClient.java:211) at sun.net.www.http.HttpClient.New(HttpClient.java:308) at sun.net.www.http.HttpClient.New(HttpClient.java:326) at sun.net.www.protocol.http.HttpURLConnection.getNewHttpClient(HttpURLC onnection.java:1167) at sun.net.www.protocol.http.HttpURLConnection.plainConnect0(HttpURLConn ection.java:1103) at sun.net.www.protocol.http.HttpURLConnection.plainConnect(HttpURLConne ction.java:997) at sun.net.www.protocol.http.HttpURLConnection.connect(HttpURLConnection .java:931) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream0(HttpURLC onnection.java:1281) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream(HttpURLCo nnection.java:1256) at org.smslib.http.HTTPGateway.HttpPost(HTTPGateway.java:60) at org.smslib.http.ClickatellHTTPGateway.ping(ClickatellHTTPGateway.java :258) at org.smslib.http.ClickatellHTTPGateway$KeepAlive.process(ClickatellHTT PGateway.java:434) at org.smslib.threading.AServiceThread.run(AServiceThread.java:105) * ERROR 2014-11-19 14:22:49,726 Error! (AServiceThread.java [KeepAlive [Clickate ll]]) java.net.UnknownHostException: api.clickatell.com at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java :184) at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172) at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) at java.net.Socket.connect(Socket.java:589) at sun.net.NetworkClient.doConnect(NetworkClient.java:175) at sun.net.www.http.HttpClient.openServer(HttpClient.java:432) at sun.net.www.http.HttpClient.openServer(HttpClient.java:527) at sun.net.www.http.HttpClient.init(HttpClient.java:211) at sun.net.www.http.HttpClient.New(HttpClient.java:308) at sun.net.www.http.HttpClient.New(HttpClient.java:326) at sun.net.www.protocol.http.HttpURLConnection.getNewHttpClient(HttpURLC onnection.java:1167) at sun.net.www.protocol.http.HttpURLConnection.plainConnect0(HttpURLConn ection.java:1103) at sun.net.www.protocol.http.HttpURLConnection.plainConnect(HttpURLConne ction.java:997) at sun.net.www.protocol.http.HttpURLConnection.connect(HttpURLConnection .java:931) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream0(HttpURLC onnection.java:1281) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream(HttpURLCo nnection.java:1256) at org.smslib.http.HTTPGateway.HttpPost(HTTPGateway.java:60) at org.smslib.http.ClickatellHTTPGateway.ping(ClickatellHTTPGateway.java :258) at org.smslib.http.ClickatellHTTPGateway$KeepAlive.process(ClickatellHTT PGateway.java:434) at org.smslib.threading.AServiceThread.run(AServiceThread.java:105) * ERROR 2014-11-19 14:22:49,728 Error! (AServiceThread.java [KeepAlive [Clickate ll]]) java.net.UnknownHostException: api.clickatell.com at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java :184) at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172) at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) at java.net.Socket.connect(Socket.java:589) at sun.net.NetworkClient.doConnect(NetworkClient.java:175) at sun.net.www.http.HttpClient.openServer(HttpClient.java:432) at sun.net.www.http.HttpClient.openServer(HttpClient.java:527) at sun.net.www.http.HttpClient.init(HttpClient.java:211) at sun.net.www.http.HttpClient.New(HttpClient.java:308) at sun.net.www.http.HttpClient.New(HttpClient.java:326) at sun.net.www.protocol.http.HttpURLConnection.getNewHttpClient(HttpURLC onnection.java:1167) at sun.net.www.protocol.http.HttpURLConnection.plainConnect0(HttpURLConn ection.java:1103) at sun.net.www.protocol.http.HttpURLConnection.plainConnect(HttpURLConne ction.java:997) at sun.net.www.protocol.http.HttpURLConnection.connect(HttpURLConnection .java:931) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream0(HttpURLC onnection.java:1281) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream(HttpURLCo nnection.java:1256) at
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17538: DV select all.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17538 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 15:57:45 +0100
message:
DV select all.
modified:
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-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-11-17 15:42:17 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-11-19 14:56:59 +
@@ -2725,8 +2725,9 @@
this.isPending = false;
indicatorSearch.hideFilter();
},
-loadPage: function(uid, filter, append) {
+loadPage: function(uid, filter, append, noPaging, fn) {
var store = this,
+ params = {},
path;
uid = (Ext.isString(uid) || Ext.isNumber(uid)) ? uid : indicatorGroup.getValue();
@@ -2747,27 +2748,32 @@
else if (uid === 0) {
path = '/indicators.json?fields=id,' + ns.core.init.namePropertyUrl + '' + (filter ? 'filter=name:like:' + filter : '');
}
-
+
if (!path) {
console.log('Available indicators: invalid id');
return;
}
+if (noPaging) {
+ params.paging = false;
+}
+else {
+ params.page = store.nextPage;
+ params.pageSize = 50;
+}
+
store.isPending = true;
ns.core.web.mask.show(indicatorAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
-params: {
-page: store.nextPage,
-pageSize: 50
-},
+params: params,
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.indicators || [],
pager = response.pager;
-store.loadStore(data, pager, append);
+store.loadStore(data, pager, append, fn);
},
callback: function() {
store.isPending = false;
@@ -2775,7 +2781,9 @@
}
});
},
-loadStore: function(data, pager, append) {
+loadStore: function(data, pager, append, fn) {
+pager = pager || {};
+
this.loadData(data, append);
this.sortStore();
@@ -2786,7 +2794,13 @@
}
this.isPending = false;
-ns.core.web.multiSelect.filterAvailable({store: indicatorAvailableStore}, {store: indicatorSelectedStore});
+
+if (fn) {
+ fn();
+}
+else {
+ ns.core.web.multiSelect.filterAvailable({store: indicatorAvailableStore}, {store: indicatorSelectedStore});
+}
},
storage: {},
parent: null,
@@ -2860,7 +2874,7 @@
this.isPending = false;
dataElementSearch.hideFilter();
},
-loadPage: function(uid, filter, append) {
+loadPage: function(uid, filter, append, noPaging, fn) {
uid = (Ext.isString(uid) || Ext.isNumber(uid)) ? uid : dataElementGroup.getValue();
filter = filter || dataElementFilter.getValue() || null;
@@ -2870,15 +2884,15 @@
}
if (dataElementDetailLevel.getValue() === dimConf.dataElement.objectName) {
-this.loadTotalsPage(uid, filter, append);
+this.loadTotalsPage(uid, filter, append, noPaging, fn);
}
else if (dataElementDetailLevel.getValue() === dimConf.operand.objectName) {
-this.loadDetailsPage(uid, filter, append);
+this.loadDetailsPage(uid, filter, append, noPaging, fn);
}
},
-loadTotalsPage: function(uid, filter, append) {
+loadTotalsPage: function(uid, filter, append, noPaging, fn) {
var store = this,
-filterPath = filter ? '/query/' + filter : '',
+ params = {},
path;
if (store.nextPage === store.lastPage) {
@@ -2897,21 +2911,26 @@
return;
}
+if (noPaging) {
+ params.paging = false;
+}
+else {
+ params.page = store.nextPage;
+ params.pageSize = 50;
+}
+
Re: [Dhis2-devs] Why do the two OU trees in the add user interface so different in loading time?
Thanks, Lars, I should have thought of that. But still don't understand why these trees are/should be different? On Wed, Nov 19, 2014 at 4:24 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi, under settings general offline org unit levels set it to something like 3, and it will speed up by reducing the no of org units stored locally. Lars On Wed, Nov 19, 2014 at 5:18 PM, Knut Staring knu...@gmail.com wrote: Just testing it here, and the right hand tree loads right away whereas the left hand tree takes several painful minutes to load. Can they be the same? Could this be an urgent fix? https://ebola.dhis2.org/dhis-web-maintenance-user/showUpdateUserForm.action?id=60442 Thanks, Knut -- Knut Staring Dept. of Informatics, University of Oslo Liberia: +231 770 496 123 or +231 886 146 381 Norway: +4791880522 Skype: knutstar http://dhis2.org ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo Liberia: +231 770 496 123 or +231 886 146 381 Norway: +4791880522 Skype: knutstar http://dhis2.org ___ 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 17539: PT ER line breaking for textual values.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17539 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 17:32:21 +0100
message:
PT ER line breaking for textual values.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
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-pivot/styles/style.css
--
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/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-11-06 15:44:09 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-11-19 16:30:33 +
@@ -270,8 +270,8 @@
.pivot-value {
background-color: #fff;
- white-space: nowrap;
text-align: right;
+ max-width: 700px;
}
.pivot-value.highlighted {
background-color: #f3f3f3;
=== modified file '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-pivot/scripts/app.js 2014-11-19 14:36:03 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-19 16:30:33 +
@@ -2715,7 +2715,7 @@
else if (uid === 0) {
path = '/indicators.json?fields=id,' + ns.core.init.namePropertyUrl + '' + (filter ? 'filter=name:like:' + filter : '');
}
-
+
if (!path) {
console.log('Available indicators: invalid id');
return;
@@ -2728,7 +2728,7 @@
params.page = store.nextPage;
params.pageSize = 50;
}
-
+
store.isPending = true;
ns.core.web.mask.show(indicatorAvailable.boundList);
@@ -2750,7 +2750,7 @@
},
loadStore: function(data, pager, append, fn) {
pager = pager || {};
-
+
this.loadData(data, append);
this.sortStore();
@@ -2948,7 +2948,7 @@
},
loadStore: function(data, pager, append, fn) {
pager = pager || {};
-
+
this.loadData(data, append);
this.sortStore();
@@ -3068,7 +3068,7 @@
},
loadStore: function(data, pager, append, fn) {
pager = pager || {};
-
+
this.loadData(data, append);
this.sortStore();
@@ -4958,7 +4958,7 @@
},
loadStore: function(data, pager, append, fn) {
pager = pager || {};
-
+
this.loadData(data, append);
this.lastPage = this.nextPage;
@@ -5085,7 +5085,7 @@
xtype: 'button',
icon: 'images/arrowrightdouble.png',
width: 22,
- handler: function() {
+ handler: function() {
availableStore.loadPage(null, null, true, function() {
ns.core.web.multiSelect.selectAll(available, selected);
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2014-11-06 15:44:09 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2014-11-19 16:30:33 +
@@ -57,7 +57,7 @@
.x-window-header-text-default {
font-size: 11px;
font-family: 'Arial','Sans-serif','Roboto','Helvetica','Consolas';
-}
+}
#init {
display: table;
@@ -234,8 +234,8 @@
.pivot-value {
background-color: #fff;
- white-space: nowrap;
text-align: right;
+ max-width: 700px;
}
.pivot-value.highlighted {
background-color: #f3f3f3;
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Why do the two OU trees in the add user interface so different in loading time?
It's because the tree works offline for data entry so we need to cache it in browser. It will only re-download when there is a change in org units. We can try to change it so that it only caches for the data entry screen. On Wed, Nov 19, 2014 at 5:30 PM, Knut Staring knu...@gmail.com wrote: Thanks, Lars, I should have thought of that. But still don't understand why these trees are/should be different? On Wed, Nov 19, 2014 at 4:24 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi, under settings general offline org unit levels set it to something like 3, and it will speed up by reducing the no of org units stored locally. Lars On Wed, Nov 19, 2014 at 5:18 PM, Knut Staring knu...@gmail.com wrote: Just testing it here, and the right hand tree loads right away whereas the left hand tree takes several painful minutes to load. Can they be the same? Could this be an urgent fix? https://ebola.dhis2.org/dhis-web-maintenance-user/showUpdateUserForm.action?id=60442 Thanks, Knut -- Knut Staring Dept. of Informatics, University of Oslo Liberia: +231 770 496 123 or +231 886 146 381 Norway: +4791880522 Skype: knutstar http://dhis2.org ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo Liberia: +231 770 496 123 or +231 886 146 381 Norway: +4791880522 Skype: knutstar http://dhis2.org ___ 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] Completeness and timeliness
Hi, I have a few suggestions on analysis of completeness/timeliness. I think some of it has perhaps been discussed before: - it would be good to have timeliness as well as completeness available in analytics - would also be good if it was possible to get the number of expected/actual reports (including on time). Even if it was not available in PT/DV/GIS but just through the API. (Please correct me if it is possible - I assume actual is not too difficult to get from completedatasetregistrarion, but I've not seen a straightforward way of getting expected). - and I got a new request today, for having the possibility of doing sort of a total completeness, so ALL actual reports over ALL expected for an orgunit. Useful for example to get an overview/comparison of completeness in all districts in a country (what they did now was to run reporting rate summary for every district manually, which is quite a lot of work...). Even better if you could combine arbitrary sets perhaps. Say you have two monthly malaria datasets and would like actual/expected for the two together for example. Olav ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Bug 1394325] [NEW] Data import crashes when import file contains duplicates
Public bug reported: Data import crashes when import file contains internal duplicates. ** Affects: dhis2 Importance: Medium Assignee: Lars Helge Øverland (larshelge) Status: Confirmed ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) ** Changed in: dhis2 Milestone: None = 2.17 ** Changed in: dhis2 Importance: Undecided = Medium ** Changed in: dhis2 Status: New = Confirmed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1394325 Title: Data import crashes when import file contains duplicates Status in DHIS 2: Confirmed Bug description: Data import crashes when import file contains internal duplicates. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1394325/+subscriptions ___ 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 17540: Upgraded to quick 1.9. Fixes issue with duplicates during data import. Added unit tests.
revno: 17540
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-19 20:11:32 +0100
message:
Upgraded to quick 1.9. Fixes issue with duplicates during data import. Added
unit tests.
added:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetE.xml
modified:
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java
dhis-2/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler'
=== added file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java 2014-11-19 19:11:32 +
@@ -0,0 +1,178 @@
+package org.hisp.dhis.jdbc.batchhandler;
+
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import org.amplecode.quick.BatchHandler;
+import org.amplecode.quick.BatchHandlerFactory;
+import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id: DataElementBatchHandlerTest.java 4999 2008-04-23 15:45:08Z larshelg $
+ */
+public class DataElementBatchHandlerTest
+extends DhisTest
+{
+@Autowired
+private BatchHandlerFactory batchHandlerFactory;
+
+@Autowired
+private DataElementService dataElementService;
+
+@Autowired
+private DataElementCategoryService categoryService;
+
+private BatchHandlerDataElement batchHandler;
+
+private DataElementCategoryCombo categoryCombo;
+
+private DataElement dataElementA;
+private DataElement dataElementB;
+private DataElement dataElementC;
+
+// -
+// Fixture
+// -
+
+@Override
+public void setUpTest()
+{
+
[Dhis2-devs] Displaying OU Code and Name
Hi Is there a way we can display OU Code and Name on the OU List. E.g. - 043: Mbeya District 04321: Mbeya Hospital 04322: Mbeya Dispensary Thanks for your help. Lungo___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Why do the two OU trees in the add user interface so different in loading time?
Make sure compression is turned on at the web server (I assume it is). Turn caching on under settings cache strategy. ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Completeness and timeliness
Hi, I also got the same request to have completeness by expected and actual on the dashboard. This would be easy if the options are available in PT/DDV/GIS. Busoye On 19 Nov 2014, at 14:02, Olav Poppe olav.po...@me.com wrote: Hi, I have a few suggestions on analysis of completeness/timeliness. I think some of it has perhaps been discussed before: - it would be good to have timeliness as well as completeness available in analytics - would also be good if it was possible to get the number of expected/actual reports (including on time). Even if it was not available in PT/DV/GIS but just through the API. (Please correct me if it is possible - I assume actual is not too difficult to get from completedatasetregistrarion, but I've not seen a straightforward way of getting expected). - and I got a new request today, for having the possibility of doing sort of a total completeness, so ALL actual reports over ALL expected for an orgunit. Useful for example to get an overview/comparison of completeness in all districts in a country (what they did now was to run reporting rate summary for every district manually, which is quite a lot of work...). Even better if you could combine arbitrary sets perhaps. Say you have two monthly malaria datasets and would like actual/expected for the two together for example. Olav ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Completeness and timeliness
Hi Devs This will definitely come up in SA's future rollouts too! Over the past few years the DOH in SA has placed major emphasis on data quality improvement. What we did to monitor this was generate a Data Quality data mart (along with standardized DQ elements and DQ indicators). DQ metrics were generated at a data set and/or data element level (users preselected data sets and individual data elements for DQ monitoring). The resulting metrics were made available in spread marts and auto reports. Perhaps a specialised set of analytics tables could suffice. Cheers, Greg -- Original message--From: Adebusoye AnifalajeDate: Wed, 19 Nov 2014 23:08To: Olav Poppe;Cc: DHIS 2 developers;Subject:Re: [Dhis2-devs] Completeness and timeliness Hi,I also got the same request to have completeness by expected and actual on the dashboard. This would be easy if the options are available in PT/DDV/GIS.Busoye On 19 Nov 2014, at 14:02, Olav Poppe wrote: Hi, I have a few suggestions on analysis of completeness/timeliness. I think some of it has perhaps been discussed before: - it would be good to have timeliness as well as completeness available in analytics - would also be good if it was possible to get the number of expected/actual reports (including on time). Even if it was not available in PT/DV/GIS but just through the API. (Please correct me if it is possible - I assume actual is not too difficult to get from completedatasetregistrarion, but I've not seen a straightforward way of getting expected). - and I got a new request today, for having the possibility of doing sort of a total completeness, so ALL actual reports over ALL expected for an orgunit. Useful for example to get an overview/comparison of completeness in all districts in a country (what they did now was to run reporting rate summary for every district manually, which is quite a lot of work...). Even better if you could combine arbitrary sets perhaps. Say you have two monthly malaria datasets and would like actual/expected for the two together for example. Olav ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp___Mailing list: https://launchpad.net/~dhis2-devsPost to : dhis2-devs@lists.launchpad.netUnsubscribe : https://launchpad.net/~dhis2-devsMore help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17543: add new parameter to ouwt, setOfflineLevel(x), allows bypassing system setting for offline level
revno: 17543
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-11-20 13:13:09 +0700
message:
add new parameter to ouwt, setOfflineLevel(x), allows bypassing system
setting for offline level
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.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-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-17 21:59:40 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2014-11-20 06:13:09 +
@@ -83,6 +83,7 @@
var autoSelectRoot = true;
var realRoot = true;
var includeChildren = false;
+var offlineLevel;
this.setListenerFunction = function( listenerFunction_, skipInitialCall ) {
listenerFunction = listenerFunction_;
@@ -94,6 +95,10 @@
}
};
+this.setOfflineLevel = function( level ) {
+offlineLevel = level;
+};
+
this.setMultipleSelectionAllowed = function( allowed ) {
multipleSelectionAllowed = allowed;
};
@@ -269,7 +274,8 @@
return $.ajax( {
url: '../dhis-web-commons-ajax-json/getOrganisationUnitTree.action',
data: {
-versionOnly: versionOnly
+versionOnly: versionOnly,
+offlineLevel: offlineLevel
},
type: 'POST',
dataType: format
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2014-11-16 11:32:57 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2014-11-20 06:13:09 +
@@ -155,6 +155,13 @@
return realRoot;
}
+private Integer offlineLevel;
+
+public void setOfflineLevel( Integer offlineLevel )
+{
+this.offlineLevel = offlineLevel;
+}
+
// -
// Action implementation
// -
@@ -239,7 +246,8 @@
if ( !versionOnly !rootOrganisationUnits.isEmpty() )
{
-OrganisationUnitLevel offlineOrgUnitLevel = configurationService.getConfiguration().getOfflineOrganisationUnitLevel();
+OrganisationUnitLevel offlineOrgUnitLevel = offlineLevel != null ? new OrganisationUnitLevel( offlineLevel, no-name )
+: configurationService.getConfiguration().getOfflineOrganisationUnitLevel();
ListOrganisationUnitLevel orgUnitLevels = organisationUnitService.getOrganisationUnitLevels();
___
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 17544: force offline level=1 in orgunit maint module
revno: 17544
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-11-20 13:23:25 +0700
message:
force offline level=1 in orgunit maint module
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.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-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2014-06-13 08:01:34 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2014-11-20 06:23:25 +
@@ -3,6 +3,7 @@
// -
$( document ).ready( function() {
+ selection.setOfflineLevel(1);
selection.setAutoSelectRoot( false );
selection.setRootUnselectAllowed( true );
selection.setListenerFunction( organisationUnitSelected, true );
___
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 17545: loca/in Add Partner Management in Maintenance RBF
revno: 17545 committer: Mithilesh Kumar Thakur mithilesh.h...@gmail.com branch nick: dhis2 timestamp: Thu 2014-11-20 06:34:00 + message: loca/in Add Partner Management in Maintenance RBF added: local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/GetPartnerDateListAction.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/RemovePartnerAction.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/UpdatePartnerFormAction.java local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerDateList.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement_old.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/updatePartnerForm.vm modified: local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernatePartnerStore.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerDataListAction.java local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/SavePartnerDetailsResultAction.java local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/utilizationRule.js local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement.vm local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.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 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java' --- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java 2014-11-15 11:24:03 + +++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java 2014-11-20 06:34:00 + @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.Date; import java.util.Map; +import java.util.Set; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataset.DataSet; @@ -31,4 +32,8 @@ MapString, Integer getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate ); +MapString, Integer getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId ); + +SetOrganisationUnit getPartnerOrganisationUnits( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate ); + } === modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java' --- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java 2014-11-15 11:24:03 + +++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java 2014-11-20 06:34:00 + @@ -3,10 +3,10 @@ import java.util.Collection; import java.util.Date; import java.util.Map; +import java.util.Set; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataset.DataSet; -import org.hisp.dhis.option.Option; import org.hisp.dhis.organisationunit.OrganisationUnit; /** @@ -32,4 +32,8 @@ MapString, Integer getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate ); +MapString, Integer getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId ); + +SetOrganisationUnit getPartnerOrganisationUnits( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate ); + } === modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java' ---
