[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16633: minor bugfix, don't serialize boolean as idobject
revno: 16633
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Fri 2014-09-05 15:11:30 +0700
message:
minor bugfix, don't serialize boolean as idobject
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.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/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2014-08-13 06:21:17 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2014-09-05 08:11:30 +
@@ -147,7 +147,6 @@
}
@JsonProperty
-@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean getAllowFutureDate()
___
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 16634: more export fixes, trackedEntityAttribute, don't serialize boolean as idObject
revno: 16634
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Fri 2014-09-05 15:35:33 +0700
message:
more export fixes, trackedEntityAttribute, don't serialize boolean as idObject
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.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/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-08-08 13:10:50 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-09-05 08:35:33 +
@@ -315,7 +315,6 @@
}
@JsonProperty
-@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean getConfidential()
@@ -354,6 +353,7 @@
unique = trackedEntityAttribute.isUnique();
orgunitScope = trackedEntityAttribute.getOrgunitScope();
programScope = trackedEntityAttribute.getProgramScope();
+confidential = trackedEntityAttribute.getConfidential();
}
}
___
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] Help: dhis2 dataentry form shows only year 2013 periods
Hi all, After upgrading to 2.16, our data entry form shows only year 2013 periods When clicking next year button, there is no period in the list. How do we fix this? [image: Inline image 1] ___ 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 16635: tracker capture - scheduling and messaging, WIP
revno: 16635
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2014-09-05 11:21:39 +0200
message:
tracker capture - scheduling and messaging, WIP
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/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-tracker-capture/components/profile/profile-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-07-23 12:21:33 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-09-05 09:21:39 +
@@ -30,7 +30,8 @@
//display only those attributes that belong the selected program
//if no program, display attributesInNoProgram
TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){
-$scope.selectedTei = tei;
+$scope.selectedTei = tei;
+console.log('The tei is: ', $scope.selectedTei);
});
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js 2014-09-01 15:32:05 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js 2014-09-05 09:21:39 +
@@ -4,9 +4,8 @@
DateUtils,
EventUtils,
DHIS2EventFactory,
-EnrollmentService,
+TEIService,
CurrentSelection,
-orderByFilter,
TranslationService) {
TranslationService.translate();
@@ -18,65 +17,106 @@
}
var today = DateUtils.format(moment());
+$scope.showSchedulingDiv = false;
+$scope.schedulingPossible = false;
+$scope.showMessagingDiv = false;
+$scope.messagingPossible = false;
+$scope.showEventSchedulingDiv = false;
$scope.$on('dashboardWidgets', function(event, args) {
var selections = CurrentSelection.get();
-$scope.selectedOrgUnit = storage.get('SELECTED_OU');
-$scope.selectedEntity = selections.tei;
+$scope.selectedOrgUnit = storage.get('SELECTED_OU');
+$scope.selectedTei = angular.copy(selections.tei);
$scope.selectedProgram = selections.pr;
$scope.selectedEnrollment = selections.enrollment;
$scope.selectedProgramWithStage = [];
+$scope.dhis2Events = [];
if($scope.selectedOrgUnit &&
$scope.selectedProgram &&
-$scope.selectedEntity &&
-$scope.selectedEnrollment){
+$scope.selectedTei &&
+$scope.selectedEnrollment){
+//check if the selected TEI has any of the contact attributes
+//that can be used for communication
+TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){
+$scope.selectedTei = tei;
+var continueLoop = true;
+for(var i=0; i<$scope.selectedTei.attributes.length && continueLoop; i++){
+if( ($scope.selectedTei.attributes[i].type === 'phoneNumber' && $scope.selectedTei.attributes[i].show) ||
+($scope.selectedTei.attributes[i].type === 'email' && $scope.selectedTei.attributes[i].show) ){
+$scope.messagingPossible = true;
+continueLoop = false;
+}
+}
+});
+
angular.forEach($scope.selectedProgram.programStages, function(stage){
$scope.selectedProgramWithStage[stage.id] = stage;
Re: [Dhis2-devs] Help: dhis2 dataentry form shows only year 2013 periods
Dear anh, You need to allow for future period Regards, On Fri, Sep 5, 2014 at 4:18 PM, Ngoc Thanh Nguyen < thanh.hispviet...@gmail.com> wrote: > Hi all, > > After upgrading to 2.16, our data entry form shows only year 2013 periods > When clicking next year button, there is no period in the list. > > How do we fix this? > > [image: Inline image 1] > > ___ > 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 > > -- THAI Chuong YM/Skype : thaichuong159 Phone: (+84) 918776134 / (+856) 2091708927 ___ 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] [Dhis2-users] Convert SHP to GML in Windows 7
Thank's i will try it ! = Guy Le Jeudi 4 septembre 2014 12h05, henri claude moungui a écrit : Guy, I think you should convert using the latest version of QGIS (QGIS 8). you can donwload it from www.QGIS.org website. Sincerelly. Henri MOUNGUI Le Jeudi 4 septembre 2014 0h29, Guy Ekani a écrit : Thank you sir, I converted the file with Qgis 1.0.2, but I get an error when importing. Can you tell me what is the error in the file below? Sincerely, = Guy http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://ogr.maptools.org/ Country.xsd" xmlns:ogr="http://ogr.maptools.org/"; xmlns:gml="http://www.opengis.net/gml";> 8.498749000321.65254800138 16.192115001213.078065 9 8 Le Mardi 2 septembre 2014 17h34, Bram Piot a écrit : There are multiple ways to do this, the easiest of which is to install QGIS (www.qgis.org), open the shapefile and then save as gml. QGIS also allows you to easily transform projections, in case your shapefile is projected. More info on handling boundary files in the documentation, though I'm not sure it's all up to date. bram On 2 September 2014 17:26, Guy Ekani wrote: Hi to all, > > >Please How can I Convert SHP File to GML in Windows 7? > > >Sincerely, > > >= >Guy > > > > > > > > >___ >Mailing list: https://launchpad.net/~dhis2-users >Post to : dhis2-us...@lists.launchpad.net >Unsubscribe : https://launchpad.net/~dhis2-users >More help : https://help.launchpad.net/ListHelp > > ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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] Help: dhis2 dataentry form shows only year 2013 periods
Hi Chuong, Seems strange to me you would need to enable future periods for daily periods in this year (2014). Are you sure this is necessary? Regards, Jason -- Sent from my mobile On Sep 5, 2014 12:33 PM, "Thái Chương" wrote: > Dear anh, > You need to allow for future period > > Regards, > > > On Fri, Sep 5, 2014 at 4:18 PM, Ngoc Thanh Nguyen < > thanh.hispviet...@gmail.com> wrote: > >> Hi all, >> >> After upgrading to 2.16, our data entry form shows only year 2013 periods >> When clicking next year button, there is no period in the list. >> >> How do we fix this? >> >> [image: Inline image 1] >> >> ___ >> 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 >> >> > > > -- > THAI Chuong > YM/Skype : thaichuong159 > Phone: (+84) 918776134 / (+856) 2091708927 > > ___ > 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] Help: dhis2 dataentry form shows only year 2013 periods
Ya Jason, It sounds strange to me too. I'm not sure how this work in 2.16, but I've checked and it's really It solved Mr. Thanh issue. Best Regards, On Fri, Sep 5, 2014 at 5:50 PM, Jason Pickering wrote: > Hi Chuong, > > Seems strange to me you would need to enable future periods for daily > periods in this year (2014). Are you sure this is necessary? > > Regards, > Jason > > -- > Sent from my mobile > On Sep 5, 2014 12:33 PM, "Thái Chương" wrote: > >> Dear anh, >> You need to allow for future period >> >> Regards, >> >> >> On Fri, Sep 5, 2014 at 4:18 PM, Ngoc Thanh Nguyen < >> thanh.hispviet...@gmail.com> wrote: >> >>> Hi all, >>> >>> After upgrading to 2.16, our data entry form shows only year 2013 periods >>> When clicking next year button, there is no period in the list. >>> >>> How do we fix this? >>> >>> [image: Inline image 1] >>> >>> ___ >>> 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 >>> >>> >> >> >> -- >> THAI Chuong >> YM/Skype : thaichuong159 >> Phone: (+84) 918776134 / (+856) 2091708927 >> >> ___ >> 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 >> >> -- THAI Chuong YM/Skype : thaichuong159 Phone: (+84) 918776134 / (+856) 2091708927 ___ 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] Help: dhis2 dataentry form shows only year 2013 periods
I will have a look at it. -- Morten On Fri, Sep 5, 2014 at 5:58 PM, Thái Chương wrote: > Ya Jason, > It sounds strange to me too. > I'm not sure how this work in 2.16, but I've checked and it's really > > It solved Mr. Thanh issue. > > Best Regards, > > > On Fri, Sep 5, 2014 at 5:50 PM, Jason Pickering < > jason.p.picker...@gmail.com> wrote: > >> Hi Chuong, >> >> Seems strange to me you would need to enable future periods for daily >> periods in this year (2014). Are you sure this is necessary? >> >> Regards, >> Jason >> >> -- >> Sent from my mobile >> On Sep 5, 2014 12:33 PM, "Thái Chương" wrote: >> >>> Dear anh, >>> You need to allow for future period >>> >>> Regards, >>> >>> >>> On Fri, Sep 5, 2014 at 4:18 PM, Ngoc Thanh Nguyen < >>> thanh.hispviet...@gmail.com> wrote: >>> Hi all, After upgrading to 2.16, our data entry form shows only year 2013 periods When clicking next year button, there is no period in the list. How do we fix this? [image: Inline image 1] ___ 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 >>> >>> >>> -- >>> THAI Chuong >>> YM/Skype : thaichuong159 >>> Phone: (+84) 918776134 / (+856) 2091708927 >>> >>> ___ >>> 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 >>> >>> > > > -- > THAI Chuong > YM/Skype : thaichuong159 > Phone: (+84) 918776134 / (+856) 2091708927 > > ___ > 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] Help: dhis2 dataentry form shows only year 2013 periods
Hi, I’ve seen a similar problem in previous versions of DHIS, which was caused by the date on the computer used to access DHIS2 was not set correctly - worth checking perhaps. Olav 5. sep. 2014 kl. 13:06 skrev Morten Olav Hansen : > I will have a look at it. > > -- > Morten > > > On Fri, Sep 5, 2014 at 5:58 PM, Thái Chương wrote: > Ya Jason, > It sounds strange to me too. > I'm not sure how this work in 2.16, but I've checked and it's really > > It solved Mr. Thanh issue. > > Best Regards, > > > On Fri, Sep 5, 2014 at 5:50 PM, Jason Pickering > wrote: > Hi Chuong, > > Seems strange to me you would need to enable future periods for daily periods > in this year (2014). Are you sure this is necessary? > > Regards, > Jason > > -- > Sent from my mobile > > On Sep 5, 2014 12:33 PM, "Thái Chương" wrote: > Dear anh, > You need to allow for future period > > Regards, > > > On Fri, Sep 5, 2014 at 4:18 PM, Ngoc Thanh Nguyen > wrote: > Hi all, > > After upgrading to 2.16, our data entry form shows only year 2013 periods > When clicking next year button, there is no period in the list. > > How do we fix this? > > > > ___ > 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 > > > > > -- > THAI Chuong > YM/Skype : thaichuong159 > Phone: (+84) 918776134 / (+856) 2091708927 > > ___ > 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 > > > > > -- > THAI Chuong > YM/Skype : thaichuong159 > Phone: (+84) 918776134 / (+856) 2091708927 > > ___ > Mailing list: https://launchpad.net/~dhis2-devs > Post to : dhis2-devs@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp > > > ___ > Mailing list: https://launchpad.net/~dhis2-devs > Post to : dhis2-devs@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16636: tracker capture - scheduling intergrated with data entry; applied some coloring to widgets
revno: 16636
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2014-09-05 14:52:43 +0200
message:
tracker capture - scheduling intergrated with data entry; applied some
coloring to widgets
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
--
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-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2014-09-01 15:32:05 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2014-09-05 12:52:43 +
@@ -18,6 +18,7 @@
$scope.dataEntryOuterForm = {};
$scope.displayCustomForm = false;
$scope.currentElement = {};
+$scope.schedulingEnabled = false;
var loginDetails = storage.get('LOGIN_DETAILS');
var storedBy = '';
@@ -142,6 +143,10 @@
$scope.showEventCreationDiv = !$scope.showEventCreationDiv;
};
+$scope.enableRescheduling = function(){
+$scope.schedulingEnabled = !$scope.schedulingEnabled;
+};
+
$scope.showDummyEventCreation = function(dummyEvent){
if(dummyEvent){
@@ -455,15 +460,14 @@
$scope.dhis2Events[i].statusColor = statusColor;
continueLoop = false;
}
-}
+}
+$scope.schedulingEnabled = !$scope.schedulingEnabled;
});
}
};
$scope.addNote = function(){
-
if(!angular.isUndefined($scope.note) && $scope.note != ""){
-
var newNote = {value: $scope.note};
if(angular.isUndefined( $scope.currentEvent.notes) ){
@@ -487,6 +491,10 @@
}
};
+$scope.clearNote = function(){
+ $scope.note = '';
+};
+
$scope.getInputNotifcationClass = function(id, custom){
if($scope.currentElement.id){
if($scope.currentElement.saved && ($scope.currentElement.id === id)){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-09-01 15:32:05 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-09-05 12:52:43 +
@@ -1,4 +1,4 @@
-
+
{{dataentryWidget.title| translate}}
@@ -18,7 +18,7 @@
-
+
{{dhis2Event.orgUnitName}}
-{{'no_event_is_yet_created'| translate}}
+{{'no_event_is_yet_created'| translate}}
{{'event_creation'| translate}}
-{{'not_yet_enrolled_data_entry'| translate}}
+{{'not_yet_enrolled_data_entry'| translate}}
-
+
{{dhis2Event.orgUnitNam
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16637: Removed method TrackedEntityAttributeValueStore.getTrackedEntityInstance. We want to use the exis...
revno: 16637
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Fri 2014-09-05 11:57:19 -0400
message:
Removed method TrackedEntityAttributeValueStore.getTrackedEntityInstance. We
want to use the existing getTrackedEntityInstances(
TrackedEntityInstanceQueryParams ) method for this as we only want to have one
place to secure.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStore.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.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/trackedentityattributevalue/TrackedEntityAttributeValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java 2014-05-16 15:26:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java 2014-09-05 15:57:19 +
@@ -119,15 +119,4 @@
* @param destination Destination instance
*/
void copyTrackedEntityAttributeValues( TrackedEntityInstance source, TrackedEntityInstance destination );
-
-/**
- * Retrieve instances who have the same value on an attribute
- *
- * @param attribute TrackedEntityAttribute
- * @param value An attribute value for searching
- *
- * @return TrackedEntityAttributeValue list
- */
-Collection getTrackedEntityInstance( TrackedEntityAttribute attribute, String value );
-
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStore.java 2014-05-16 15:26:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStore.java 2014-09-05 15:57:19 +
@@ -112,16 +112,6 @@
Collection searchByValue( TrackedEntityAttribute attribute, String searchText );
/**
- * Retrieve instances who have the same value on an attribute
- *
- * @param attribute TrackedEntityAttribute
- * @param value An attribute value for searching
- *
- * @return TrackedEntityInstance list
- */
-Collection getTrackedEntityInstances( TrackedEntityAttribute attribute, String value );
-
-/**
* Retrieve attribute values of an instance by a program
*
* @param instance TrackedEntityInstance
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-09-05 15:57:19 +
@@ -1524,8 +1524,10 @@
for ( TrackedEntityAttribute displayAttribute : attributes )
{
-Collection resultPatients = attValueService.getTrackedEntityInstance(
-displayAttribute, keyword );
+Collection resultPatients = null; // attValueService.getTrackedEntityInstance( displayAttribute, keyword );
+
+//TODO re-implement using DefaultTrackedEntityInstanceService.getTrackedEntityInstances( TrackedEntityInstanceQueryParams )
+
// Search in specific OrgUnit
if ( orgUnitId != 0 )
{
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java 2014-05-16 15:26:10 +
+++ dhis-2/dhis-services/dhis-service-tracker/src
Re: [Dhis2-devs] DHIS2 - Averaging over orgunits
Hi Robin, I get your point. This has actually been raised before and we plan to support individual aggregation operators for the org unit and time dimensions. Blueprint here: https://blueprints.launchpad.net/dhis2/+spec/orgunit-hierarchy-aggregation-operator regards, Lars On Thu, Sep 4, 2014 at 12:49 PM, Robin Martens wrote: > Hi there, > > > > As per the manual, the "average" option when defining data elements > aggregates by average over periods but sum over orgunits. This limits > severely the reporting possibilities, for instance when calculating the > average person age over multiple districts but I can think of many other > examples (prices, age, education grades,...). Is there any way to configure > DHIS2 to average over orgunits? > > > > Thank you, > > > > Robin > ___ 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] DHIS2 - Averaging over orgunits
Hi Lars, Thank you. I thought so but couldn't find the reference. In the blueprint it is assigned to release 2.17, is this still being maintained? Regards, Robin From: Lars Helge Øverland [mailto:larshe...@gmail.com] Sent: 05 September 2014 18:24 To: Robin Martens Cc: dhis2-users; dhis2-devs@lists.launchpad.net Subject: Re: DHIS2 - Averaging over orgunits Hi Robin, I get your point. This has actually been raised before and we plan to support individual aggregation operators for the org unit and time dimensions. Blueprint here: https://blueprints.launchpad.net/dhis2/+spec/orgunit-hierarchy-aggregation-operator regards, Lars On Thu, Sep 4, 2014 at 12:49 PM, Robin Martens mailto:mart...@sher.be>> wrote: Hi there, As per the manual, the "average" option when defining data elements aggregates by average over periods but sum over orgunits. This limits severely the reporting possibilities, for instance when calculating the average person age over multiple districts but I can think of many other examples (prices, age, education grades,...). Is there any way to configure DHIS2 to average over orgunits? Thank you, Robin ___ 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] Start up issues
Hi Amina, this time its the user settings. You might want to do this: delete form usersetting where name = 'keyUiLocale'; Note that this will clear the user interface locale for all users. regards, Lars On Wed, Sep 3, 2014 at 5:35 AM, Amina Abba Gana wrote: > Thank you Lars. > > We cleared the systemsetting table and the application started but soon as > we log in it gives an exception on the interface. The log is attached. > > > On 2 September 2014 19:59, Lars Helge Øverland > wrote: > >> Hi Amina, >> >> This seems to be an issue with serialization of system settings. Try >> running these SQL statements and restart. Then you need to set the >> scheduled tasks from data administration again. >> >> delete from systemsetting where name = 'keySchedTasks'; >> delete from systemsetting where name = 'keyScheduledTasks'; >> >> best regards, >> >> Lars >> >> >> >> >> On Tue, Sep 2, 2014 at 2:52 PM, Amina Abba Gana >> wrote: >> >>> Hello Everyone, >>> >>> I am trying to restore a database backup on dhis 2.4. The application >>> runs fine on an empty database but I get the error in the attached log soon >>> as i try to start up after restoring my backup. Please help if you have >>> come across this before. >>> >>> Below are the version details: >>> >>> Version: >>> >>> 2.4 >>> >>> Build revision: >>> >>> 4507 >>> >>> Build date: >>> >>> 2011-09-22 08:42 >>> >>> Thank you! >>> >>> ___ >>> 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 16638: Upgraded spring security to 3.2.5
revno: 16638 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2014-09-05 12:55:39 -0400 message: Upgraded spring security to 3.2.5 modified: 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 === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2014-08-24 13:57:12 + +++ dhis-2/pom.xml 2014-09-05 16:55:39 + @@ -1019,7 +1019,7 @@ UTF-8 4.0.6.RELEASE -3.2.4.RELEASE +3.2.5.RELEASE 4.2.0.Final 4.3.1.Final 2.4.1 ___ 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 16639: Upgraded struts2 version to 2.3.16.3
revno: 16639
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Fri 2014-09-05 13:18:16 -0400
message:
Upgraded struts2 version to 2.3.16.3
modified:
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
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-09-05 16:55:39 +
+++ dhis-2/pom.xml 2014-09-05 17:18:16 +
@@ -506,7 +506,7 @@
org.apache.struts
struts2-core
-2.3.16.1
+${struts.version}
javassist
@@ -517,7 +517,7 @@
org.apache.struts
struts2-spring-plugin
-2.3.16.1
+${struts.version}
org.apache.velocity
@@ -1020,6 +1020,7 @@
UTF-8
4.0.6.RELEASE
3.2.5.RELEASE
+2.3.16.3
4.2.0.Final
4.3.1.Final
2.4.1
___
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
